Changeset 4288 for zzuf/trunk/srcTweet

Timestamp:

Jan 21, 2010, 2:17:15 AM (11 years ago)

Author:

Sam Hocevar

Message:

Fix a buffer overflow in zzcat.

File:

• zzuf/trunk/src/zzcat.c (modified) (2 diffs)

zzuf/trunk/src/zzcat.c

@@ -269 +269 @@
     } while(0)
 
-#define ROUNDUP(size) (((size) + 0xfff) & ~0xfff)
+#define ROUNDUP(size) (((size) + 0x1000) & ~0xfff)
 
 #define MERGE(address, cnt, off) \
@@ -277 +277 @@
         { \
             retlen = retoff + _cnt; \
-            if (ROUNDUP(retlen) != ROUNDUP(retlen - _cnt)) \
+            if (!retbuf || ROUNDUP(retlen) != ROUNDUP(retlen - _cnt)) \
                 retbuf = realloc(retbuf, ROUNDUP(retlen)); \
         } \