[SCM] okular packaging branch, master, updated. debian/4.8.4-2-8-gf73581b

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/okular.git;a=commitdiff;h=f73581b

The following commit has been merged in the master branch:
commit f73581b0f372cf9b1cbf000c893105c494a88f26
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Nov 27 20:40:06 2012 -0300

    Backport upstream commit 91e463 to avoid crashes with broken fonts.
---
 debian/changelog                                  |    2 +
 debian/patches/avoid_crash_with_broken_fonts.diff |   31 +++++++++++++++++++++
 debian/patches/series                             |    1 +
 3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8232e40..95ba7ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ okular (4:4.8.4-3) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Backport upstream commit 91e46331fd7901705a69323c75de84e2467416dd to restore
     word detection in DVI documents. Thanks Luigi Toscano.
+  * Backport upstream commit 823a84942df4d3604b041ef7878a9984b1f12b7f to avoid
+    a crash with broken fonts. Thanks Luigi Toscano.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 09 Jul 2012 15:24:28 +0200
 
diff --git a/debian/patches/avoid_crash_with_broken_fonts.diff b/debian/patches/avoid_crash_with_broken_fonts.diff
new file mode 100644
index 0000000..48c1a0e
--- /dev/null
+++ b/debian/patches/avoid_crash_with_broken_fonts.diff
@@ -0,0 +1,31 @@
+commit 823a84942df4d3604b041ef7878a9984b1f12b7f
+Author: Luigi Toscano <luigi.toscano at tiscali.it>
+Date:   Sun Jul 15 21:15:43 2012 +0200
+
+    Avoid crash when the font is broken.
+    
+    The call to FT_New_Face takes the address of the 'face' variable, whose type is a
+    typedef *something TF_Face;
+    The value of TF_Face (so a pointer to the properly filled font structure) s then
+    replaced inside the call of TF_New_Face; but when the latter function fails,
+    the value of 'face' is not reset and this leads to a crash in the distructor of
+    TeXFont_PFB.
+    So properly initialize TF_Face to 0, its address is valid, and the code works.
+    
+    BUG: 303472
+    FIXED-IN: 4.8.5
+    (cherry picked from commit 99c4da2f9ef86e345ee02cecb10e0df8f5e5b2e2)
+
+diff --git a/generators/dvi/TeXFont_PFB.cpp b/generators/dvi/TeXFont_PFB.cpp
+index cc86631..6b27093 100644
+--- a/generators/dvi/TeXFont_PFB.cpp
++++ b/generators/dvi/TeXFont_PFB.cpp
+@@ -25,7 +25,7 @@
+ 
+ 
+ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double slant)
+-  : TeXFont(parent)
++  : TeXFont(parent), face(0)
+ {
+ #ifdef DEBUG_PFB
+   if (enc != 0)
diff --git a/debian/patches/series b/debian/patches/series
index d53b922..774777f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 upstream_Call-Generator-signalPixmapRequestDone-_after_-savin.patch
 fix_word_detection_with_dvi_docs.diff
+avoid_crash_with_broken_fonts.diff

-- 
okular packaging