Merge lp:~marcelstimberg/ubuntu/natty/epdfview/fix-for-783109 into lp:ubuntu/natty/epdfview

[Marcel Stimberg]

A branch with backported changes from rev 357 and rev 359, additional the "cosmetic" patch from rev 336 was also necessary in order for the other two patches to apply cleanly. This fixes crashes on many PDF documents, due to API changes in libpoppler.

[Chris Coulson (chrisccoulson)]

Thanks for your work. However, it seems like you included a few unnecessary files in your patch:

- epdview/THANKS.orig
- epdfview/configure.ac.orig
- epdfview/src/IDocument.cxx.orig
- epdfview/src/PDFDocument.cxx.orig

Also, the diff is huge because the branch is normally pushed with the patches applied, whereas your merge proposal has none applied

review: Needs Fixing

[Marcel Stimberg (marcelstimberg)]

Thanks for taking a look at the branch. I removed the unnecessary files and left all patches applied for consistency (although I was under the impression that bzr branches/source packages should not have patches applied...). The diff is now to a reasonable size :-) So please, take a look again.

[Daniel Holbach (dholbach)]

This looks much better. Can you also submit a merge proposal for oneiric, so we can get it in there first (and follow https://wiki.ubuntu.com/SRU)? Thanks a lot in advance.

[Marcel Stimberg (marcelstimberg)]

> This looks much better. Can you also submit a merge proposal for oneiric, so we can get it in there first (and follow https://wiki.ubuntu.com/SRU)?
Thanks. Since I created this branch, Debian packaged a new upstream
version – I'll therefore submit a sync request for Oneiric instead. At
the first sight, there's no need for Ubuntu-specific patches for the
new version anymore, since these were all backported upstream changes.
But I'll check this more thoroughly later tonight.

[Marcel Stimberg (marcelstimberg)]

epdfview 0.8.1 has been synced to Oneiric, so all that remains is the SRU for Natty.

[Stefano Rivera (stefanor)]

Looks good, would you mind using the version number 0.1.7-5ubuntu1.1?

review: Needs Fixing

[lp:~marcelstimberg/ubuntu/natty/epdfview/fix-for-783109]

24. By Marcel Stimberg on 2011-06-19

change version number to ubuntu1.1 instead of ubuntu2

[Marcel Stimberg (marcelstimberg)]

> Looks good, would you mind using the version number 0.1.7-5ubuntu1.1?
No problem, I updated the numbering.

[Stefano Rivera (stefanor)]

Thanks, uploaded to natty-proposed, pending SRU team review

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-02-18 02:59:14 +0000
+++ .pc/applied-patches	2011-06-19 19:53:28 +0000
@@ -4,3 +4,4 @@
 04_fix-slash-search.patch
 05_fix-gtk-assertions.patch
 ubuntu_poppler-0.15.patch
+ubuntu_poppler-0.16.patch

=== modified file 'THANKS'
--- THANKS	2010-08-01 12:23:11 +0000
+++ THANKS	2011-06-19 19:53:28 +0000
@@ -6,6 +6,7 @@
     - Alexander <[e-mail]>, for corrections in the Polish translation.
     - Enrico Tröger <[e-mail]>, for his full screen patch and others.
     - ewtoombs <[e-mail]>, for his patches.
+    - Dennis Sheil <[e-mail]>, for his patch.
     - Daniel Nylander <[e-mail]>, for his Swedish translation.
     - Daniel Pielmeie <[e-mail]>, for his patches.
     - Dragonlord <[e-mail]>, for his Czech translation.
@@ -18,6 +19,7 @@
     - Michael Opitz <[e-mail]>, for his patches.
     - Moritz Heiber <[e-mail]>, for his German translation.
     - Mr_Moustache <[e-mail]>, for his French translation.
+    - Jakob Gruber <[e-mail]>, for his segfault patches.
     - Nuno Miguel <[e-mail]>, for his European Portuguese translation.
     - Nyu <[e-mail]>, for his Japanese translation.
     - Pablo Mazzini <[e-mail]>, for his print patches.

=== modified file 'configure.ac'
--- configure.ac	2011-02-11 22:38:22 +0000
+++ configure.ac	2011-06-19 19:53:28 +0000
@@ -56,6 +56,11 @@
 if test "x$have_poppler_0_15_0" = "xyes"; then
     AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
 fi
+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
+if test "x$have_poppler_0_15_1" = "xyes"; then
+    AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
+fi
+
 
 EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
 AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-18 02:59:14 +0000
+++ debian/changelog	2011-06-19 19:53:28 +0000
@@ -1,3 +1,11 @@
+epdfview (0.1.7-5ubuntu1.1) natty-proposed; urgency=low
+
+  * debian/patches/ubuntu_poppler-0.16.patch: Backport upstream changes (r357 
+    and r359, in addition also r336, needed for the other patches to apply
+    cleanly) to prevent crashes due to API changes in poppler 0.16. LP: #783109
+
+ -- Marcel Stimberg <[e-mail]>  Fri, 19 Jun 2011 21:50:20 +0200
+
 epdfview (0.1.7-5ubuntu1) natty; urgency=low
 
   * Merge from debian unstable.  Remaining changes:

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-18 02:59:14 +0000
+++ debian/patches/series	2011-06-19 19:53:28 +0000
@@ -4,3 +4,4 @@
 04_fix-slash-search.patch
 05_fix-gtk-assertions.patch
 ubuntu_poppler-0.15.patch
+ubuntu_poppler-0.16.patch

=== added file 'debian/patches/ubuntu_poppler-0.16.patch'
--- debian/patches/ubuntu_poppler-0.16.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_poppler-0.16.patch	2011-06-19 19:53:28 +0000
@@ -0,0 +1,276 @@
+## Description: Backport upstream changes to prevent crashes due to API changes in poppler 0.16.
+## Origin/Author: upstream, http://trac.emma-soft.com/epdfview/changeset/336?format=diff&new=336, 
+##                http://trac.emma-soft.com/epdfview/changeset/357?format=diff&new=357,
+##                http://trac.emma-soft.com/epdfview/changeset/359?format=diff&new=359
+## Bug: https://bugs.launchpad.net/ubuntu/+source/epdfview/+bug/783109
+diff -rpu epdfview.orig//configure.ac epdfview/configure.ac
+--- epdfview.orig//configure.ac	2011-06-06 23:38:46.294634015 +0200
++++ epdfview/configure.ac	2011-06-06 23:38:57.754634017 +0200
+@@ -56,6 +56,11 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.15],
+ if test "x$have_poppler_0_15_0" = "xyes"; then
+     AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+ fi
++PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
++if test "x$have_poppler_0_15_1" = "xyes"; then
++    AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
++fi
++
+ 
+ EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
+ AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
+diff -rpu epdfview.orig//src/IDocument.cxx epdfview/src/IDocument.cxx
+--- epdfview.orig//src/IDocument.cxx	2011-06-06 23:38:46.304634015 +0200
++++ epdfview/src/IDocument.cxx	2011-06-06 23:38:57.754634017 +0200
+@@ -135,7 +135,11 @@ IDocument::IDocument ()
+     m_FindPage = 0;
+     m_Format = NULL;
+     m_Keywords = NULL;
++#if defined (HAVE_POPPLER_0_15_1)
++    m_Linearized = FALSE;
++#else
+     m_Linearized = NULL;
++#endif
+     m_ModifiedDate = NULL;
+     m_PageCache = NULL;
+     m_PageCacheAge = 0;
+@@ -164,7 +168,9 @@ IDocument::~IDocument ()
+     g_free (m_FileName);
+     g_free (m_Format);
+     g_free (m_Keywords);
++#if !defined (HAVE_POPPLER_0_15_1)
+     g_free (m_Linearized);
++#endif
+     g_free (m_ModifiedDate);
+     g_free (m_Password);
+     g_free (m_Producer);
+@@ -555,9 +561,8 @@ IDocument::getTitle ()
+ void
+ IDocument::setTitle (gchar *title)
+ {
+-    gchar *oldTitle = m_Title;
++    g_free (m_Title);
+     m_Title = g_strdup (title);
+-    g_free (oldTitle);
+     g_free (title);
+ }
+ 
+@@ -585,9 +590,8 @@ IDocument::getAuthor ()
+ void
+ IDocument::setAuthor (gchar *author)
+ {
+-    gchar *oldAuthor = m_Author;
++    g_free(m_Author);
+     m_Author = g_strdup (author);
+-    g_free (oldAuthor);
+     g_free (author);
+ }
+ 
+@@ -615,10 +619,9 @@ IDocument::getSubject ()
+ void
+ IDocument::setSubject (gchar *subject)
+ {
+-    gchar *oldSubject = m_Subject;
++    g_free (m_Subject);
+     m_Subject = g_strdup (subject);
+-    g_free (oldSubject);
+-    m_Subject = subject;
++    g_free (subject);
+ }
+ 
+ ///
+@@ -646,9 +649,8 @@ IDocument::getKeywords ()
+ void
+ IDocument::setKeywords (gchar *keywords)
+ {
+-    gchar *oldKeywords = m_Keywords;
++    g_free(m_Keywords);
+     m_Keywords = g_strdup (keywords);
+-    g_free (oldKeywords);
+     g_free (keywords);
+ }
+ 
+@@ -677,9 +679,8 @@ IDocument::getCreator ()
+ void
+ IDocument::setCreator (gchar *creator)
+ {
+-    gchar *oldCreator = m_Creator;
++    g_free (m_Creator);
+     m_Creator = g_strdup (creator);
+-    g_free (oldCreator);
+     g_free (creator);
+ }
+ ///
+@@ -707,9 +708,8 @@ IDocument::getProducer ()
+ void
+ IDocument::setProducer (gchar *producer)
+ {
+-    gchar *oldProducer = m_Producer;
++    g_free (m_Producer);
+     m_Producer = g_strdup (producer);
+-    g_free (oldProducer);
+     g_free (producer);
+ }
+ 
+@@ -739,9 +739,8 @@ IDocument::getFormat ()
+ void
+ IDocument::setFormat (gchar *format)
+ {
+-    gchar *oldFormat = m_Format;
++    g_free (m_Format);
+     m_Format = g_strdup (format);
+-    g_free (oldFormat);
+     g_free (format);
+ }
+ 
+@@ -755,11 +754,16 @@ IDocument::setFormat (gchar *format)
+ const gchar *
+ IDocument::getLinearized ()
+ {
++#if defined (HAVE_POPPLER_0_15_1)
++    if ( m_Linearized ) return "Yes";
++    else return "No";
++#else
+     if ( NULL == m_Linearized )
+     {
+         return "No";
+     }
+     return m_Linearized;
++#endif
+ }
+ 
+ ///
+@@ -768,14 +772,21 @@ IDocument::getLinearized ()
+ /// @param linearized Set to "Yes" if the document is linearized. "No"
+ ///                   otherwise. IDocument will free it.
+ ///
++#if defined (HAVE_POPPLER_0_15_1)
++void
++IDocument::setLinearized (gboolean *linearized)
++{
++    m_Linearized = linearized;
++}
++#else
+ void
+-IDocument::setLinearized (gchar *linearized)
++    IDocument::setLinearized (gchar *linearized)
+ {
+-    gchar *oldLinearized = m_Linearized;
++    g_free (m_Linearized);
+     m_Linearized = g_strdup (linearized);
+-    g_free (oldLinearized);
+     g_free (linearized);
+ }
++#endif
+ 
+ ///
+ /// @brief Gets the document's creation date.
+@@ -802,9 +813,8 @@ IDocument::getCreationDate ()
+ void
+ IDocument::setCreationDate (gchar *date)
+ {
+-    gchar *oldCreationDate = m_CreationDate;
++    g_free (m_CreationDate);
+     m_CreationDate = g_strdup (date);
+-    g_free (oldCreationDate);
+     g_free (date);
+ }
+ 
+@@ -833,9 +843,8 @@ IDocument::getModifiedDate ()
+ void
+ IDocument::setModifiedDate (gchar *date)
+ {
+-    gchar *oldModifiedDate = m_ModifiedDate;
++    g_free (m_ModifiedDate);
+     m_ModifiedDate = g_strdup (date);
+-    g_free (oldModifiedDate);
+     g_free (date);
+ }
+ 
+@@ -917,9 +926,8 @@ IDocument::getPassword () const
+ void
+ IDocument::setPassword (const gchar *password)
+ {
+-    gchar *oldPassword = m_Password;
++    g_free (m_Password);
+     m_Password = g_strdup (password);
+-    g_free (oldPassword);
+ }
+ 
+ ///
+@@ -959,14 +967,8 @@ IDocument::setFileName (const gchar *fil
+ {
+     g_assert (NULL != fileName && "Tried to set a NULL file name.");
+ 
+-    // Don't ask me why, but then I set like this:
+-    //      g_free (m_FileName);
+-    //      m_FileName = fileName
+-    // Somehow the g_free also frees the parameter ????????
+-    //      
+-    gchar *oldFileName = m_FileName;
++    g_free(m_FileName);
+     m_FileName = g_strdup (fileName);
+-    g_free (oldFileName);
+ }
+ 
+ ///
+diff -rpu epdfview.orig//src/IDocument.h epdfview/src/IDocument.h
+--- epdfview.orig//src/IDocument.h	2011-06-06 23:38:46.304634015 +0200
++++ epdfview/src/IDocument.h	2011-06-06 23:38:57.754634017 +0200
+@@ -306,7 +306,11 @@ namespace ePDFView
+             const gchar *getFormat (void);
+             void setFormat (gchar *format);
+             const gchar *getLinearized (void);
++#if defined (HAVE_POPPLER_0_15_1)
++            void setLinearized (gboolean *linearized);
++#else
+             void setLinearized (gchar *linearized);
++#endif
+             const gchar *getCreationDate (void);
+             void setCreationDate (gchar *date);
+             const gchar *getModifiedDate (void);
+@@ -382,7 +386,11 @@ namespace ePDFView
+             /// The document's keyword.
+             gchar *m_Keywords;
+             /// Tells if the document is linearized or not.
++#if defined (HAVE_POPPLER_0_15_1)
++            gboolean *m_Linearized;
++#else
+             gchar *m_Linearized;
++#endif
+             /// The document's modification date and time.
+             gchar *m_ModifiedDate;
+             /// @brief The list of classes that will receive notifications
+diff -rpu epdfview.orig//src/PDFDocument.cxx epdfview/src/PDFDocument.cxx
+--- epdfview.orig//src/PDFDocument.cxx	2011-06-06 23:38:46.334634015 +0200
++++ epdfview/src/PDFDocument.cxx	2011-06-06 23:38:57.754634017 +0200
+@@ -299,7 +299,11 @@ PDFDocument::loadMetadata (void)
+     gchar *format = NULL;
+     gchar *keywords = NULL;
+     PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
++#if defined (HAVE_POPPLER_0_15_1)
++    gboolean *linearized = NULL;
++#else
+     gchar *linearized = NULL;
++#endif
+     GTime modDate;
+     PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
+     gchar *producer = NULL;
+diff -rpu epdfview.orig//THANKS epdfview/THANKS
+--- epdfview.orig//THANKS	2011-06-06 23:38:46.224634015 +0200
++++ epdfview/THANKS	2011-06-06 23:38:57.754634017 +0200
+@@ -6,6 +6,7 @@ contributions:
+     - Alexander <[e-mail]>, for corrections in the Polish translation.
+     - Enrico Tröger <[e-mail]>, for his full screen patch and others.
+     - ewtoombs <[e-mail]>, for his patches.
++    - Dennis Sheil <[e-mail]>, for his patch.
+     - Daniel Nylander <[e-mail]>, for his Swedish translation.
+     - Daniel Pielmeie <[e-mail]>, for his patches.
+     - Dragonlord <[e-mail]>, for his Czech translation.
+@@ -18,6 +19,7 @@ contributions:
+     - Michael Opitz <[e-mail]>, for his patches.
+     - Moritz Heiber <[e-mail]>, for his German translation.
+     - Mr_Moustache <[e-mail]>, for his French translation.
++    - Jakob Gruber <[e-mail]>, for his segfault patches.
+     - Nuno Miguel <[e-mail]>, for his European Portuguese translation.
+     - Nyu <[e-mail]>, for his Japanese translation.
+     - Pablo Mazzini <[e-mail]>, for his print patches.

=== modified file 'src/IDocument.cxx'
--- src/IDocument.cxx	2009-03-10 00:06:29 +0000
+++ src/IDocument.cxx	2011-06-19 19:53:28 +0000
@@ -135,7 +135,11 @@
     m_FindPage = 0;
     m_Format = NULL;
     m_Keywords = NULL;
+#if defined (HAVE_POPPLER_0_15_1)
+    m_Linearized = FALSE;
+#else
     m_Linearized = NULL;
+#endif
     m_ModifiedDate = NULL;
     m_PageCache = NULL;
     m_PageCacheAge = 0;
@@ -164,7 +168,9 @@
     g_free (m_FileName);
     g_free (m_Format);
     g_free (m_Keywords);
+#if !defined (HAVE_POPPLER_0_15_1)
     g_free (m_Linearized);
+#endif
     g_free (m_ModifiedDate);
     g_free (m_Password);
     g_free (m_Producer);
@@ -555,9 +561,8 @@
 void
 IDocument::setTitle (gchar *title)
 {
-    gchar *oldTitle = m_Title;
+    g_free (m_Title);
     m_Title = g_strdup (title);
-    g_free (oldTitle);
     g_free (title);
 }
 
@@ -585,9 +590,8 @@
 void
 IDocument::setAuthor (gchar *author)
 {
-    gchar *oldAuthor = m_Author;
+    g_free(m_Author);
     m_Author = g_strdup (author);
-    g_free (oldAuthor);
     g_free (author);
 }
 
@@ -615,10 +619,9 @@
 void
 IDocument::setSubject (gchar *subject)
 {
-    gchar *oldSubject = m_Subject;
+    g_free (m_Subject);
     m_Subject = g_strdup (subject);
-    g_free (oldSubject);
-    m_Subject = subject;
+    g_free (subject);
 }
 
 ///
@@ -646,9 +649,8 @@
 void
 IDocument::setKeywords (gchar *keywords)
 {
-    gchar *oldKeywords = m_Keywords;
+    g_free(m_Keywords);
     m_Keywords = g_strdup (keywords);
-    g_free (oldKeywords);
     g_free (keywords);
 }
 
@@ -677,9 +679,8 @@
 void
 IDocument::setCreator (gchar *creator)
 {
-    gchar *oldCreator = m_Creator;
+    g_free (m_Creator);
     m_Creator = g_strdup (creator);
-    g_free (oldCreator);
     g_free (creator);
 }
 ///
@@ -707,9 +708,8 @@
 void
 IDocument::setProducer (gchar *producer)
 {
-    gchar *oldProducer = m_Producer;
+    g_free (m_Producer);
     m_Producer = g_strdup (producer);
-    g_free (oldProducer);
     g_free (producer);
 }
 
@@ -739,9 +739,8 @@
 void
 IDocument::setFormat (gchar *format)
 {
-    gchar *oldFormat = m_Format;
+    g_free (m_Format);
     m_Format = g_strdup (format);
-    g_free (oldFormat);
     g_free (format);
 }
 
@@ -755,11 +754,16 @@
 const gchar *
 IDocument::getLinearized ()
 {
+#if defined (HAVE_POPPLER_0_15_1)
+    if ( m_Linearized ) return "Yes";
+    else return "No";
+#else
     if ( NULL == m_Linearized )
     {
         return "No";
     }
     return m_Linearized;
+#endif
 }
 
 ///
@@ -768,14 +772,21 @@
 /// @param linearized Set to "Yes" if the document is linearized. "No"
 ///                   otherwise. IDocument will free it.
 ///
-void
-IDocument::setLinearized (gchar *linearized)
-{
-    gchar *oldLinearized = m_Linearized;
+#if defined (HAVE_POPPLER_0_15_1)
+void
+IDocument::setLinearized (gboolean *linearized)
+{
+    m_Linearized = linearized;
+}
+#else
+void
+    IDocument::setLinearized (gchar *linearized)
+{
+    g_free (m_Linearized);
     m_Linearized = g_strdup (linearized);
-    g_free (oldLinearized);
     g_free (linearized);
 }
+#endif
 
 ///
 /// @brief Gets the document's creation date.
@@ -802,9 +813,8 @@
 void
 IDocument::setCreationDate (gchar *date)
 {
-    gchar *oldCreationDate = m_CreationDate;
+    g_free (m_CreationDate);
     m_CreationDate = g_strdup (date);
-    g_free (oldCreationDate);
     g_free (date);
 }
 
@@ -833,9 +843,8 @@
 void
 IDocument::setModifiedDate (gchar *date)
 {
-    gchar *oldModifiedDate = m_ModifiedDate;
+    g_free (m_ModifiedDate);
     m_ModifiedDate = g_strdup (date);
-    g_free (oldModifiedDate);
     g_free (date);
 }
 
@@ -917,9 +926,8 @@
 void
 IDocument::setPassword (const gchar *password)
 {
-    gchar *oldPassword = m_Password;
+    g_free (m_Password);
     m_Password = g_strdup (password);
-    g_free (oldPassword);
 }
 
 ///
@@ -959,14 +967,8 @@
 {
     g_assert (NULL != fileName && "Tried to set a NULL file name.");
 
-    // Don't ask me why, but then I set like this:
-    //      g_free (m_FileName);
-    //      m_FileName = fileName
-    // Somehow the g_free also frees the parameter ????????
-    //      
-    gchar *oldFileName = m_FileName;
+    g_free(m_FileName);
     m_FileName = g_strdup (fileName);
-    g_free (oldFileName);
 }
 
 ///

=== modified file 'src/IDocument.h'
--- src/IDocument.h	2009-03-10 00:06:29 +0000
+++ src/IDocument.h	2011-06-19 19:53:28 +0000
@@ -306,7 +306,11 @@
             const gchar *getFormat (void);
             void setFormat (gchar *format);
             const gchar *getLinearized (void);
+#if defined (HAVE_POPPLER_0_15_1)
+            void setLinearized (gboolean *linearized);
+#else
             void setLinearized (gchar *linearized);
+#endif
             const gchar *getCreationDate (void);
             void setCreationDate (gchar *date);
             const gchar *getModifiedDate (void);
@@ -382,7 +386,11 @@
             /// The document's keyword.
             gchar *m_Keywords;
             /// Tells if the document is linearized or not.
+#if defined (HAVE_POPPLER_0_15_1)
+            gboolean *m_Linearized;
+#else
             gchar *m_Linearized;
+#endif
             /// The document's modification date and time.
             gchar *m_ModifiedDate;
             /// @brief The list of classes that will receive notifications

=== modified file 'src/PDFDocument.cxx'
--- src/PDFDocument.cxx	2011-02-11 22:38:22 +0000
+++ src/PDFDocument.cxx	2011-06-19 19:53:28 +0000
@@ -299,7 +299,11 @@
     gchar *format = NULL;
     gchar *keywords = NULL;
     PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
+#if defined (HAVE_POPPLER_0_15_1)
+    gboolean *linearized = NULL;
+#else
     gchar *linearized = NULL;
+#endif
     GTime modDate;
     PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
     gchar *producer = NULL;