Fixed|libdeng2: Deflating might produce corrupt data

The zlib API was used incorrectly to attempt to deflate a block's data into a fixed-size buffer.
skyjake · Nov 30, 2012 · 73c4baf · 73c4baf
1 parent f16be0d
commit 73c4baf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/doomsday/libdeng2/include/de/data/ziparchive.h b/doomsday/libdeng2/include/de/data/ziparchive.h
@@ -81,7 +81,7 @@ namespace de
     public:
         /**
          * Determines whether a File looks like it could be accessed using
-         * Archive.
+         * ZipArchive.
          *
          * @param file  File to check.
          *

diff --git a/doomsday/libdeng2/src/data/ziparchive.cpp b/doomsday/libdeng2/src/data/ziparchive.cpp
@@ -518,9 +518,8 @@ void ZipArchive::operator >> (Writer &to) const
                 throw DeflateError("ZipArchive::operator >>", "Deflate init failed");
             }
 
-            deflate(&stream, Z_FINISH);
-            int result = deflateEnd(&stream);
-            if(result == Z_OK)
+            int result = deflate(&stream, Z_FINISH);
+            if(result == Z_STREAM_END)
             {
                 // Compression was ok.
                 header.compression = entry.compression = DEFLATED;
@@ -538,6 +537,9 @@ void ZipArchive::operator >> (Writer &to) const
                 entry.offset = writer.offset();
                 writer << FixedByteArray(*entry.data);
             }
+
+            // Clean up.
+            deflateEnd(&stream);
         }
     }