pdf: Fix missed detection (bb #2455).

remotes/push_mirror/vc9-vt-dnd
Török Edvin 15 years ago
parent a91013cde7
commit 4619289aef
  1. 4
      ChangeLog
  2. 4
      libclamav/pdf.c

@ -1,3 +1,7 @@
Thu Jan 20 11:38:33 EET 2011 (edwin)
------------------------------------
* libclamav/pdf.c: fix missed detection (bb #2455).
Thu Jan 20 11:19:50 EET 2011 (edwin) Thu Jan 20 11:19:50 EET 2011 (edwin)
----------------------------------- -----------------------------------
* libclamav/pdf.c: fix another pdf uninit (bb #2404). * libclamav/pdf.c: fix another pdf uninit (bb #2404).

@ -114,7 +114,7 @@ static int find_stream_bounds(const char *start, off_t bytesleft, off_t byteslef
if ((q2 = cli_memstr(start, bytesleft, "stream", 6))) { if ((q2 = cli_memstr(start, bytesleft, "stream", 6))) {
q2 += 6; q2 += 6;
bytesleft -= q2 - start; bytesleft -= q2 - start;
if (bytesleft < 1) if (bytesleft < 0)
return 0; return 0;
if (bytesleft >= 2 && q2[0] == '\xd' && q2[1] == '\xa') if (bytesleft >= 2 && q2[0] == '\xd' && q2[1] == '\xa')
q2 += 2; q2 += 2;
@ -122,7 +122,7 @@ static int find_stream_bounds(const char *start, off_t bytesleft, off_t byteslef
q2++; q2++;
*stream = q2 - start; *stream = q2 - start;
bytesleft2 -= q2 - start; bytesleft2 -= q2 - start;
if (bytesleft2 < 0) if (bytesleft2 <= 0)
return 0; return 0;
q = q2; q = q2;
q2 = cli_memstr(q, bytesleft2, "endstream", 9); q2 = cli_memstr(q, bytesleft2, "endstream", 9);

Loading…
Cancel
Save