|
 |
c2e870 |
From 614514f577bbe676f736afcd8065892df8391315 Mon Sep 17 00:00:00 2001
|
|
|
c2e870 |
From: Marek Kasik <mkasik@redhat.com>
|
|
|
c2e870 |
Date: Fri, 20 Apr 2018 11:38:13 +0200
|
|
|
c2e870 |
Subject: [PATCH] Fix crash on missing embedded file
|
|
|
c2e870 |
|
|
|
c2e870 |
Check whether an embedded file is actually present in the PDF
|
|
|
c2e870 |
and show warning in that case.
|
|
|
c2e870 |
|
|
|
c2e870 |
https://bugs.freedesktop.org/show_bug.cgi?id=106137
|
|
|
c2e870 |
https://gitlab.freedesktop.org/poppler/poppler/issues/236
|
|
|
c2e870 |
---
|
|
|
c2e870 |
glib/poppler-attachment.cc | 26 +++++++++++++++++---------
|
|
|
c2e870 |
glib/poppler-document.cc | 3 ++-
|
|
|
c2e870 |
2 files changed, 19 insertions(+), 10 deletions(-)
|
|
|
c2e870 |
|
|
|
c2e870 |
diff --git a/glib/poppler-attachment.cc b/glib/poppler-attachment.cc
|
|
|
c2e870 |
index c6502e9d..11ba5bb5 100644
|
|
|
c2e870 |
--- a/glib/poppler-attachment.cc
|
|
|
c2e870 |
+++ b/glib/poppler-attachment.cc
|
|
|
c2e870 |
@@ -111,20 +111,28 @@ _poppler_attachment_new (FileSpec *emb_file)
|
|
|
c2e870 |
attachment->description = _poppler_goo_string_to_utf8 (emb_file->getDescription ());
|
|
|
c2e870 |
|
|
|
c2e870 |
embFile = emb_file->getEmbeddedFile();
|
|
|
c2e870 |
- attachment->size = embFile->size ();
|
|
|
c2e870 |
+ if (embFile != NULL && embFile->isOk())
|
|
|
c2e870 |
+ {
|
|
|
c2e870 |
+ attachment->size = embFile->size ();
|
|
|
c2e870 |
|
|
|
c2e870 |
- if (embFile->createDate ())
|
|
|
c2e870 |
- _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime);
|
|
|
c2e870 |
- if (embFile->modDate ())
|
|
|
c2e870 |
- _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime);
|
|
|
c2e870 |
+ if (embFile->createDate ())
|
|
|
c2e870 |
+ _poppler_convert_pdf_date_to_gtime (embFile->createDate (), (time_t *)&attachment->ctime);
|
|
|
c2e870 |
+ if (embFile->modDate ())
|
|
|
c2e870 |
+ _poppler_convert_pdf_date_to_gtime (embFile->modDate (), (time_t *)&attachment->mtime);
|
|
|
c2e870 |
|
|
|
c2e870 |
- if (embFile->checksum () && embFile->checksum ()->getLength () > 0)
|
|
|
c2e870 |
- attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (),
|
|
|
c2e870 |
- embFile->checksum ()->getLength ());
|
|
|
c2e870 |
- priv->obj_stream = new Object();
|
|
|
c2e870 |
- priv->obj_stream->initStream(embFile->stream());
|
|
|
c2e870 |
- // Copy the stream
|
|
|
c2e870 |
- embFile->stream()->incRef();
|
|
|
c2e870 |
+ if (embFile->checksum () && embFile->checksum ()->getLength () > 0)
|
|
|
c2e870 |
+ attachment->checksum = g_string_new_len (embFile->checksum ()->getCString (),
|
|
|
c2e870 |
+ embFile->checksum ()->getLength ());
|
|
|
c2e870 |
+ priv->obj_stream = new Object();
|
|
|
c2e870 |
+ priv->obj_stream->initStream(embFile->stream());
|
|
|
c2e870 |
+ // Copy the stream
|
|
|
c2e870 |
+ embFile->stream()->incRef();
|
|
|
c2e870 |
+ }
|
|
|
c2e870 |
+ else
|
|
|
c2e870 |
+ {
|
|
|
c2e870 |
+ g_warning ("Missing stream object for embedded file");
|
|
|
c2e870 |
+ g_clear_object (&attachment);
|
|
|
c2e870 |
+ }
|
|
|
c2e870 |
|
|
|
c2e870 |
return attachment;
|
|
|
c2e870 |
}
|
|
|
c2e870 |
diff --git a/glib/poppler-document.cc b/glib/poppler-document.cc
|
|
|
c2e870 |
index b343eb90..df0aa47f 100644
|
|
|
c2e870 |
--- a/glib/poppler-document.cc
|
|
|
c2e870 |
+++ b/glib/poppler-document.cc
|
|
|
c2e870 |
@@ -666,7 +666,8 @@ poppler_document_get_attachments (PopplerDocument *document)
|
|
|
c2e870 |
attachment = _poppler_attachment_new (emb_file);
|
|
|
c2e870 |
delete emb_file;
|
|
|
c2e870 |
|
|
|
c2e870 |
- retval = g_list_prepend (retval, attachment);
|
|
|
c2e870 |
+ if (attachment != NULL)
|
|
|
c2e870 |
+ retval = g_list_prepend (retval, attachment);
|
|
|
c2e870 |
}
|
|
|
c2e870 |
return g_list_reverse (retval);
|
|
|
c2e870 |
}
|
|
|
c2e870 |
--
|
|
|
c2e870 |
2.17.0
|
|
|
c2e870 |
|