[poppler] Branch 'better_object' - 2 commits - poppler/Rendition.h poppler/XRef.cc

[Albert Astals Cid]

 poppler/Rendition.h |    1 +
 poppler/XRef.cc     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b21c5f7741bb0af47c64c042a8586d922d26b47a
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat May 13 00:13:43 2017 +0200

    Use initNullAfterMalloc since this is after a greallocn

diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 2b50f83e..f32546ea 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1322,7 +1322,7 @@ void XRef::add(int num, int gen, Goffset offs, GBool used) {
     for (int i = size; i < num + 1; ++i) {
       entries[i].offset = -1;
       entries[i].type = xrefEntryFree;
-      entries[i].obj.setToNull();
+      entries[i].obj.initNullAfterMalloc();
       entries[i].flags = 0;
       entries[i].gen = 0;
     }
commit e98ca09fafadbf7d37b838ed2f8953dc6a53a034
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat May 13 00:01:05 2017 +0200

    Forgot to add my (C) here

diff --git a/poppler/Rendition.h b/poppler/Rendition.h
index 3b26cea7..5a937f2c 100644
--- a/poppler/Rendition.h
+++ b/poppler/Rendition.h
@@ -5,6 +5,7 @@
 //---------------------------------------------------------------------------------
 // Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
 // Carlos Garcia Campos <carlosgc at gnome.org> (c) 2010
+// Albert Astals Cid <aacid at kde.org> (C) 2017
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by