Attachment 111069 Details for Bug 84555 – Move array reallocation from visitLine to startLine

[patch] Move array reallocation from visitLine to startLine

Move-array-reallocation-from-visitLine-to-startLine.patch (text/plain), 1.25 KB, created by Jason Crain on 2014-12-20 05:26:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Crain

Created: 2014-12-20 05:26:24 UTC

Size: 1.25 KB

patch

obsolete

>From e2a8d2c149988a96fec0dc0ec38001091cd9061e Mon Sep 17 00:00:00 2001
>From: Jason Crain <jason@aquaticape.us>
>Date: Fri, 19 Dec 2014 01:56:45 -0600
>Subject: [PATCH] Move array reallocation from visitLine to startLine
>
>Fixes potential memory corruption from writing after end of lines
>array.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=84555
>---
> poppler/TextOutputDev.cc | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
>index 4b7ff40..9ed955e 100644
>--- a/poppler/TextOutputDev.cc
>+++ b/poppler/TextOutputDev.cc
>@@ -4072,6 +4072,11 @@ void TextSelectionDumper::startLine()
> 
> void TextSelectionDumper::finishLine()
> {
>+  if (nLines == linesSize) {
>+    linesSize *= 2;
>+    lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
>+  }
>+
>   if (words && words->getLength() > 0)
>     lines[nLines++] = words;
>   else if (words)
>@@ -4088,11 +4093,6 @@ void TextSelectionDumper::visitLine (TextLine *line,
> {
>   TextLineFrag frag;
> 
>-  if (nLines == linesSize) {
>-    linesSize *= 2;
>-    lines = (GooList **)grealloc(lines, linesSize * sizeof(GooList *));
>-  }
>-
>   frag.init(line, edge_begin, edge_end - edge_begin);
> 
>   if (tableId >= 0 && frag.line->blk->tableId < 0) {
>-- 
>2.1.3
>

Actions: View | Splinter Review

Attachments on bug 84555: 107190 | 111069

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.