commit f94ba85a736b4c90c05e7782939f32506472658e
author Carlos Garcia Campos <carlosgc@gnome.org> Fri Sep 12 19:22:20 2014 +0200
committer Carlos Garcia Campos <carlosgc@gnome.org> Sat Sep 13 15:37:24 2014 +0200
tree 74077daabdf527f3c30336329e337c09a38c3674
parent f74a5964078224c01bd5642aabc928d185bb0b69

glib: Fix use of uninitialized members in PopplerInputStream

https://bugs.freedesktop.org/show_bug.cgi?id=82630

glib/poppler-input-stream.cc

diff --git a/glib/poppler-input-stream.cc b/glib/poppler-input-stream.cc
index 041cc2e..e57e344 100644
--- a/glib/poppler-input-stream.cc
+++ b/glib/poppler-input-stream.cc
@@ -31,6 +31,8 @@
   length = lengthA;
   bufPtr = bufEnd = buf;
   bufPos = start;
+  savePos = 0;
+  saved = gFalse;
 }
 
 PopplerInputStream::~PopplerInputStream()
@@ -77,6 +79,7 @@
 
   if (dir >= 0) {
     g_seekable_seek(seekable, pos, G_SEEK_SET, cancellable, NULL);
+    bufPos = pos;
   } else {
     g_seekable_seek(seekable, 0, G_SEEK_END, cancellable, NULL);
     size = (Guint)g_seekable_tell(seekable);
@@ -110,7 +113,7 @@
   if (limited && bufPos + inputStreamBufSize > start + length) {
     n = start + length - bufPos;
   } else {
-    n = inputStreamBufSize;
+    n = inputStreamBufSize - (bufPos % inputStreamBufSize);
   }
 
   n = g_input_stream_read(inputStream, buf, n, cancellable, NULL);