009-cve-2016-9844-zipinfo-buffer-overflow.patch 1.1 KB

12345678910111213141516171819202122232425262728
  1. From: "Steven M. Schweda" <sms@antinode.info>
  2. Subject: Fix CVE-2016-9844, buffer overflow in zipinfo
  3. Bug-Debian: https://bugs.debian.org/847486
  4. Bug-Ubuntu: https://launchpad.net/bugs/1643750
  5. X-Debian-version: 6.0-21
  6. --- a/zipinfo.c
  7. +++ b/zipinfo.c
  8. @@ -1921,7 +1921,18 @@ static int zi_short(__G) /* return PK-
  9. ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
  10. methbuf[3] = dtype[dnum];
  11. } else if (methnum >= NUM_METHODS) { /* unknown */
  12. - sprintf(&methbuf[1], "%03u", G.crec.compression_method);
  13. + /* 2016-12-05 SMS.
  14. + * https://launchpad.net/bugs/1643750
  15. + * Unexpectedly large compression methods overflow
  16. + * &methbuf[]. Use the old, three-digit decimal format
  17. + * for values which fit. Otherwise, sacrifice the "u",
  18. + * and use four-digit hexadecimal.
  19. + */
  20. + if (G.crec.compression_method <= 999) {
  21. + sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
  22. + } else {
  23. + sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
  24. + }
  25. }
  26. for (k = 0; k < 15; ++k)