Attachment 106201 Details for Bug 82630 – Another patch

[patch] Another patch

0001-glib-Fix-use-of-uninitialized-members-in-PopplerInpu.patch (text/plain), 1.41 KB, created by Carlos Garcia Campos on 2014-09-12 17:24:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2014-09-12 17:24:44 UTC

Size: 1.41 KB

patch

obsolete

>From c1110e9efa744d789d21c156225736a91321e54f Mon Sep 17 00:00:00 2001
>From: Carlos Garcia Campos <carlosgc@gnome.org>
>Date: Fri, 12 Sep 2014 19:22:20 +0200
>Subject: [PATCH] glib: Fix use of uninitialized members in PopplerInputStream
>
>https://bugs.freedesktop.org/show_bug.cgi?id=82630
>---
> glib/poppler-input-stream.cc | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>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 @@ PopplerInputStream::PopplerInputStream(GInputStream *inputStreamA, GCancellable
>   length = lengthA;
>   bufPtr = bufEnd = buf;
>   bufPos = start;
>+  savePos = 0;
>+  saved = gFalse;
> }
> 
> PopplerInputStream::~PopplerInputStream()
>@@ -77,6 +79,7 @@ void PopplerInputStream::setPos(Goffset pos, int dir)
> 
>   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 @@ GBool PopplerInputStream::fillBuf()
>   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);
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 82630: 104631 | 104632 | 104633 | 104634 | 104667 | 106201

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.