You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.5 KiB
50 lines
1.5 KiB
--- include/ttyio.h.orig Fri May 25 08:42:50 2001 |
|
+++ include/ttyio.h Fri Jun 8 22:12:12 2001 |
|
@@ -24,7 +24,7 @@ |
|
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ) |
|
void tty_printf (const char *fmt, ... ) __attribute__ ((format (printf,1,2))); |
|
#else |
|
- void tty_printf const char *fmt, ... ); |
|
+ void tty_printf (const char *fmt, ... ); |
|
#endif |
|
void tty_print_string( byte *p, size_t n ); |
|
void tty_print_utf8_string( byte *p, size_t n ); |
|
--- zlib/infblock.c Mon Jun 8 19:06:16 1998 |
|
+++ zlib/infblock.c Mon Mar 11 14:16:01 2002 |
|
@@ -249,10 +249,12 @@ |
|
&s->sub.trees.tb, s->hufts, z); |
|
if (t != Z_OK) |
|
{ |
|
- ZFREE(z, s->sub.trees.blens); |
|
r = t; |
|
if (r == Z_DATA_ERROR) |
|
+ { |
|
+ ZFREE(z, s->sub.trees.blens); |
|
s->mode = BAD; |
|
+ } |
|
LEAVE |
|
} |
|
s->sub.trees.index = 0; |
|
@@ -313,11 +315,13 @@ |
|
t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f), |
|
s->sub.trees.blens, &bl, &bd, &tl, &td, |
|
s->hufts, z); |
|
- ZFREE(z, s->sub.trees.blens); |
|
if (t != Z_OK) |
|
{ |
|
if (t == (uInt)Z_DATA_ERROR) |
|
+ { |
|
+ ZFREE(z, s->sub.trees.blens); |
|
s->mode = BAD; |
|
+ } |
|
r = t; |
|
LEAVE |
|
} |
|
@@ -329,6 +333,7 @@ |
|
} |
|
s->sub.decode.codes = c; |
|
} |
|
+ ZFREE(z, s->sub.trees.blens); |
|
s->mode = CODES; |
|
case CODES: |
|
UPDATE
|
|
|