gnupg-1.0.6.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. --- include/ttyio.h.orig Fri May 25 08:42:50 2001
  2. +++ include/ttyio.h Fri Jun 8 22:12:12 2001
  3. @@ -24,7 +24,7 @@
  4. #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 )
  5. void tty_printf (const char *fmt, ... ) __attribute__ ((format (printf,1,2)));
  6. #else
  7. - void tty_printf const char *fmt, ... );
  8. + void tty_printf (const char *fmt, ... );
  9. #endif
  10. void tty_print_string( byte *p, size_t n );
  11. void tty_print_utf8_string( byte *p, size_t n );
  12. --- zlib/infblock.c Mon Jun 8 19:06:16 1998
  13. +++ zlib/infblock.c Mon Mar 11 14:16:01 2002
  14. @@ -249,10 +249,12 @@
  15. &s->sub.trees.tb, s->hufts, z);
  16. if (t != Z_OK)
  17. {
  18. - ZFREE(z, s->sub.trees.blens);
  19. r = t;
  20. if (r == Z_DATA_ERROR)
  21. + {
  22. + ZFREE(z, s->sub.trees.blens);
  23. s->mode = BAD;
  24. + }
  25. LEAVE
  26. }
  27. s->sub.trees.index = 0;
  28. @@ -313,11 +315,13 @@
  29. t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
  30. s->sub.trees.blens, &bl, &bd, &tl, &td,
  31. s->hufts, z);
  32. - ZFREE(z, s->sub.trees.blens);
  33. if (t != Z_OK)
  34. {
  35. if (t == (uInt)Z_DATA_ERROR)
  36. + {
  37. + ZFREE(z, s->sub.trees.blens);
  38. s->mode = BAD;
  39. + }
  40. r = t;
  41. LEAVE
  42. }
  43. @@ -329,6 +333,7 @@
  44. }
  45. s->sub.decode.codes = c;
  46. }
  47. + ZFREE(z, s->sub.trees.blens);
  48. s->mode = CODES;
  49. case CODES:
  50. UPDATE