[poppler] Branch 'poppler-0.22' - poppler/Stream.cc

[Albert Astals Cid]

 poppler/Stream.cc |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit b1026b5978c385328f2a15a2185c599a563edf91
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed Jan 9 22:17:09 2013 +0100

    Initialize refLine totally
    
    Fixes uninitialized memory read in 1004.pdf.asan.7.3

diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index 414ff3f..d118ddd 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -14,7 +14,7 @@
 // under GPL version 2 or later
 //
 // Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
-// Copyright (C) 2006-2010, 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2010, 2012, 2013 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
 // Copyright (C) 2009 Carlos Garcia Campos <carlosgc at gnome.org>
@@ -1712,8 +1712,9 @@ int CCITTFaxStream::lookChar() {
       for (i = 0; i < columns && codingLine[i] < columns; ++i) {
 	refLine[i] = codingLine[i];
       }
-      refLine[i++] = columns;
-      refLine[i] = columns;
+      for (; i < columns + 2; ++i) {
+	refLine[i] = columns;
+      }
       codingLine[0] = 0;
       a0i = 0;
       b1i = 0;