Marcus Meissner
e108057de1
OBS-URL: https://build.opensuse.org/request/show/756853 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zziplib?expand=0&rev=46
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
Index: zziplib-0.13.69/zzip/memdisk.c
|
|
===================================================================
|
|
--- zziplib-0.13.69.orig/zzip/memdisk.c
|
|
+++ zziplib-0.13.69/zzip/memdisk.c
|
|
@@ -222,6 +222,14 @@ zzip_mem_entry_new(ZZIP_DISK * disk, ZZI
|
|
item->zz_filetype = zzip_disk_entry_get_filetype(entry);
|
|
|
|
/*
|
|
+ * If zz_data+zz_csize exceeds the size of the file, bail out
|
|
+ */
|
|
+ if ((item->zz_data + item->zz_csize) < disk->buffer ||
|
|
+ (item->zz_data + item->zz_csize) >= disk->endbuf)
|
|
+ {
|
|
+ goto error;
|
|
+ }
|
|
+ /*
|
|
* If the file is uncompressed, zz_csize and zz_usize should be the same
|
|
* If they are not, we cannot guarantee that either is correct, so ...
|
|
*/
|
|
@@ -521,7 +529,6 @@ zzip_mem_entry_fopen(ZZIP_MEM_DISK * dir
|
|
file->zlib.avail_in = zzip_mem_entry_csize(entry);
|
|
file->zlib.next_in = zzip_mem_entry_to_data(entry);
|
|
|
|
- debug2("compressed size %i", (int) file->zlib.avail_in);
|
|
if (file->zlib.next_in + file->zlib.avail_in >= file->endbuf)
|
|
goto error;
|
|
if (file->zlib.next_in < file->buffer)
|
|
Index: zziplib-0.13.69/zzip/zip.c
|
|
===================================================================
|
|
--- zziplib-0.13.69.orig/zzip/zip.c
|
|
+++ zziplib-0.13.69/zzip/zip.c
|
|
@@ -408,7 +408,7 @@ __zzip_parse_root_directory(int fd,
|
|
struct _disk_trailer *trailer,
|
|
struct zzip_dir_hdr **hdr_return,
|
|
zzip_plugin_io_t io,
|
|
- zzip_off_t filesize);
|
|
+ zzip_off_t filesize)
|
|
{
|
|
auto struct zzip_disk_entry dirent;
|
|
struct zzip_dir_hdr *hdr;
|