Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2019-07-13 13:33:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Sat Jul 13 13:33:29 2019 rev:113 rq:710542 version:5.37 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2019-06-12 13:02:15.593285430 +0200 +++ /work/SRC/openSUSE:Factory/.file.new.4615/file.changes 2019-07-13 13:33:30.787349922 +0200 @@ -1,0 +2,8 @@ +Tue Jun 11 10:42:01 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Add temporary patch file-upstream.patch + * Detect Android LOKI'd boot bootimgs + * buffer_fill: fix double free of `ebuf` on read error + (https://bugzilla.redhat.com/1685217) + +------------------------------------------------------------------- New: ---- file-upstream.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.cG9DOZ/_old 2019-07-13 13:33:31.683349684 +0200 +++ /var/tmp/diff_new_pack.cG9DOZ/_new 2019-07-13 13:33:31.683349684 +0200 @@ -64,6 +64,7 @@ Patch36: file-5.15-clear-invalid.patch Patch37: file-secure_getenv.patch Patch39: file-5.28-btrfs-image.dif +Patch42: file-upstream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc %global _miscdir %{_datadir}/misc @@ -132,6 +133,7 @@ %patch36 -p1 -b .clear %patch37 -p1 -b .getenv %patch39 -p1 -b .btrfs +%patch42 -p0 -b .tmp %patch -b .0 test -s src/magic.h.in || cp -p src/magic.h src/magic.h.in rm -fv src/magic.h ++++++ file-upstream.patch ++++++ Detect Android LOKI'd boot bootimgs buffer_fill: fix double free of `ebuf` on read error (https://bugzilla.redhat.com/1685217) --- magic/Magdir/android | 4 +++- src/buffer.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) --- magic/Magdir/android +++ magic/Magdir/android 2019-06-11 10:34:41.940646113 +0000 @@ -19,7 +19,9 @@ # From https://android.googlesource.com/\ # platform/system/core/+/master/mkbootimg/bootimg.h 0 string ANDROID! Android bootimg ->1024 string LOKI\01 \b, LOKI'd +>1024 string LOKI \b, LOKI'd +>>1028 lelong 0 \b (boot) +>>1028 lelong 1 \b (recovery) >8 lelong >0 \b, kernel >>12 lelong >0 \b (0x%x) >16 lelong >0 \b, ramdisk --- src/buffer.c +++ src/buffer.c 2019-06-11 10:34:41.940646113 +0000 @@ -77,6 +77,7 @@ buffer_fill(const struct buffer *bb) b->eoff = b->st.st_size - b->elen; if (pread(b->fd, b->ebuf, b->elen, b->eoff) == -1) { free(b->ebuf); + b->ebuf = NULL; goto out; }
