Attachment 138928 Details for Bug 106137 – Patch fixing this issue

[patch] Patch fixing this issue

0001-Fix-crash-on-missing-embedded-file.patch (text/plain), 3.25 KB, created by Marek Kasik on 2018-04-19 15:37:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Kasik

Created: 2018-04-19 15:37:01 UTC

Size: 3.25 KB

patch

obsolete

>From d4ead1c3ed120b7b2bf3707edf827a4e527db58b Mon Sep 17 00:00:00 2001
>From: Marek Kasik <mkasik@redhat.com>
>Date: Thu, 19 Apr 2018 17:36:04 +0200
>Subject: [PATCH] Fix crash on missing embedded file
>
>Check whether an embedded file is actually present in the PDF
>and show warning in that case.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106137
>---
> glib/poppler-attachment.cc | 26 +++++++++++++++++---------
> glib/poppler-document.cc   |  3 ++-
> poppler/FileSpec.cc        |  6 ++++++
> 3 files changed, 25 insertions(+), 10 deletions(-)
>
>diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
>index c6502e9d..da1d7b0e 100644
>--- a/glib/poppler-attachment.cc
>+++ b/glib/poppler-attachment.cc
>@@ -111,17 +111,25 @@ _poppler_attachment_new (FileSpec *emb_file)
>     attachment->description = _poppler_goo_string_to_utf8 (emb_file->getDescription ());
> 
>   embFile = emb_file->getEmbeddedFile();
>-  attachment->size = embFile->size ();
>+  if (embFile != NULL)
>+    {
>+      attachment->size = embFile->size ();
> 
>-  if (embFile->createDate ())
>-    _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime);
>-  if (embFile->modDate ())
>-    _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime);
>+      if (embFile->createDate ())
>+        _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime);
>+      if (embFile->modDate ())
>+        _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime);
> 
>-  if (embFile->checksum () && embFile->checksum ()->getLength () > 0)
>-    attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (),
>-                                             embFile->checksum ()->getLength ());
>-  priv->obj_stream = embFile->streamObject()->copy();
>+      if (embFile->checksum () && embFile->checksum ()->getLength () > 0)
>+        attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (),
>+                                                 embFile->checksum ()->getLength ());
>+      priv->obj_stream = embFile->streamObject()->copy();
>+    }
>+  else
>+    {
>+      g_warning ("Missing stream object for embedded file");
>+      g_clear_object (&attachment);
>+    }
> 
>   return attachment;
> }
>diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
>index b343eb90..df0aa47f 100644
>--- a/glib/poppler-document.cc
>+++ b/glib/poppler-document.cc
>@@ -666,7 +666,8 @@ poppler_document_get_attachments (PopplerDocument *document)
>       attachment = _poppler_attachment_new (emb_file);
>       delete emb_file;
> 
>-      retval = g_list_prepend (retval, attachment);
>+      if (attachment != NULL)
>+        retval = g_list_prepend (retval, attachment);
>     }
>   return g_list_reverse (retval);
> }
>diff --git a/poppler/FileSpec.cc b/poppler/FileSpec.cc
>index 2628c363..f9c0cd9a 100644
>--- a/poppler/FileSpec.cc
>+++ b/poppler/FileSpec.cc
>@@ -155,6 +155,12 @@ EmbFile *FileSpec::getEmbeddedFile()
>   Object obj1;
>   XRef *xref = fileSpec.getDict()->getXRef();
>   obj1 = fileStream.fetch(xref);
>+  if (!obj1.isStream()) {
>+    ok = gFalse;
>+    error(errSyntaxError, -1, "Invalid FileSpec: Embedded file stream is not a stream");
>+    return nullptr;
>+  }
>+
>   embFile = new EmbFile(&obj1);
> 
>   return embFile;
>-- 
>2.17.0
>

Actions: View | Splinter Review

Attachments on bug 106137: 138926 | 138927 | 138928 | 138946

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.