glib/poppler-annot.cc | 2 +- poppler/Annot.cc | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit f302864ed354b313ec39433f65ca3b107b55789d Author: Carlos Garcia Campos <[email protected]> Date: Fri Jul 25 11:25:42 2014 +0200 glib: Return NULL in poppler_annot_get_contents also for empty strings diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc index 13bc768..e87bce3 100644 --- a/glib/poppler-annot.cc +++ b/glib/poppler-annot.cc @@ -799,7 +799,7 @@ poppler_annot_get_contents (PopplerAnnot *poppler_annot) contents = poppler_annot->annot->getContents (); - return contents ? _poppler_goo_string_to_utf8 (contents) : NULL; + return contents && contents->getLength() > 0 ? _poppler_goo_string_to_utf8 (contents) : NULL; } /** commit 13a5c5f4b61d05f2d18f94ad15e210a47021a576 Author: Anuj Khare <[email protected]> Date: Thu Jul 24 19:47:22 2014 +0200 annots: Fix a crash when adding annot without contents Having no content in an annotation results in a crash when generating its appearance, since the contents pointer is dereferenced. For consistency, the same has been done in Annot::initialize. diff --git a/poppler/Annot.cc b/poppler/Annot.cc index fa29739..a559836 100644 --- a/poppler/Annot.cc +++ b/poppler/Annot.cc @@ -1265,7 +1265,7 @@ void Annot::initialize(PDFDoc *docA, Dict *dict) { if (dict->lookup("Contents", &obj1)->isString()) { contents = obj1.getString()->copy(); } else { - contents = NULL; + contents = new GooString(); } obj1.free(); @@ -1641,9 +1641,7 @@ Annot::~Annot() { annotObj.free(); delete rect; - - if (contents) - delete contents; + delete contents; if (name) delete name; @@ -3015,6 +3013,8 @@ void AnnotFreeText::generateFreeTextAppearance() fontsize = 10; if (fontcolor == NULL) fontcolor = new AnnotColor(0, 0, 0); // Black + if (!contents) + contents = new GooString (); // Draw box GBool doFill = (color && color->getSpace() != AnnotColor::colorTransparent); _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
