[poppler] 2 commits - poppler/Stream.cc

[Albert Astals Cid]

 poppler/Stream.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 30282d3fdbbb3029d9a0f838b2cd979bb962235c
Merge: 61f6658 56044ef
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 27 00:20:12 2013 +0200

    Merge remote-tracking branch 'origin/poppler-0.22'

commit 56044ef482c26f10a8a1371dace049c144659dc7
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 27 00:18:22 2013 +0200

    Fix infinite loop while feeding wrong data in stdin
    
    Take into account that CachedFile::read might not always return
    the number of elems we asked it to read
    
    Bug #64967

diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index e8f5ec7..ffe2638 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -909,7 +909,7 @@ GBool CachedFileStream::fillBuf()
   } else {
     n = cachedStreamBufSize - (bufPos % cachedStreamBufSize);
   }
-  cc->read(buf, 1, n);
+  n = cc->read(buf, 1, n);
   bufEnd = buf + n;
   if (bufPtr >= bufEnd) {
     return gFalse;