Attachment 66175 Details for Bug 54090 – patch for 100.pdf.asan.38.2

[patch] patch for 100.pdf.asan.38.2

100.pdf.asan.38.2.patch (text/plain), 3.49 KB, created by Thomas Freitag on 2012-08-27 14:30:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Freitag

Created: 2012-08-27 14:30:31 UTC

Size: 3.49 KB

patch

obsolete

>diff --git a/poppler/Stream.cc b/poppler/Stream.cc
>index 4ce6c00..31f2650 100644
>--- a/poppler/Stream.cc
>+++ b/poppler/Stream.cc
>@@ -1723,7 +1723,7 @@ int CCITTFaxStream::lookChar() {
>       //   codingLine[a0i = 0] = refLine[b1i = 0] = 0 is possible
>       // exception at right edge:
>       //   refLine[b1i] = refLine[b1i+1] = columns is possible
>-      while (codingLine[a0i] < columns) {
>+      while (codingLine[a0i] < columns && !err) {
> 	code1 = getTwoDimCode();
> 	switch (code1) {
> 	case twoDimPass:
>@@ -1757,6 +1757,12 @@ int CCITTFaxStream::lookChar() {
> 	  }
> 	  while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	    b1i += 2;
>+            if (b1i > columns + 1) {
>+              error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	      err = gTrue;
>+	      break;
>+            }
> 	  }
> 	  break;
> 	case twoDimVertR3:
>@@ -1766,6 +1772,12 @@ int CCITTFaxStream::lookChar() {
> 	    ++b1i;
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+  	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1776,6 +1788,12 @@ int CCITTFaxStream::lookChar() {
> 	    ++b1i;
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1786,6 +1804,12 @@ int CCITTFaxStream::lookChar() {
> 	    ++b1i;
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1796,6 +1820,12 @@ int CCITTFaxStream::lookChar() {
> 	    ++b1i;
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1810,6 +1840,12 @@ int CCITTFaxStream::lookChar() {
> 	    }
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1824,6 +1860,12 @@ int CCITTFaxStream::lookChar() {
> 	    }
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+	        error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>@@ -1838,6 +1880,12 @@ int CCITTFaxStream::lookChar() {
> 	    }
> 	    while (refLine[b1i] <= codingLine[a0i] && refLine[b1i] < columns) {
> 	      b1i += 2;
>+              if (b1i > columns + 1) {
>+                error(errSyntaxError, getPos(),
>+		  "Bad 2D code {0:04x} in CCITTFax stream", code1);
>+	        err = gTrue;
>+	        break;
>+              }
> 	    }
> 	  }
> 	  break;
>

Actions: View | Splinter Review

Attachments on bug 54090: 66142 | 66175 | 66176 | 66177 | 66178 | 66274 | 66275 | 66433 | 66434 | 66435 | 66436 | 66538 | 66577 | 66582 | 66586 | 66858 | 66859 | 66860 | 66861 | 66862 | 66868 | 66870 | 66871 | 66872

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.