merge in patch used in arch/fedora - fixes a lazy physfs memcpy that was breaking upstream's stricter checking
authornemo
Mon, 10 Apr 2017 09:05:16 -0400
changeset 12212 ea891871f481
parent 12211 00bcaa0e0ef6
child 12213 bb5522e88ab2
merge in patch used in arch/fedora - fixes a lazy physfs memcpy that was breaking upstream's stricter checking
misc/libphysfs/archiver_zip.c
--- a/misc/libphysfs/archiver_zip.c	Mon Apr 10 14:34:32 2017 +0200
+++ b/misc/libphysfs/archiver_zip.c	Mon Apr 10 09:05:16 2017 -0400
@@ -312,7 +312,8 @@
                 return 0;
 
             inflateEnd(&finfo->stream);
-            memcpy(&finfo->stream, &str, sizeof (z_stream));
+            inflateCopy(&finfo->stream, &str);
+            inflateEnd(&str);
             finfo->uncompressed_position = finfo->compressed_position = 0;
         } /* if */