[poppler] poppler/SplashOutputDev.cc

[Albert Astals Cid]

 poppler/SplashOutputDev.cc |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 890178f9c946931ec34b8b227493ec9f1c6109aa
Author: Albert Astals Cid <aacid at kde.org>
Date:   Wed May 4 01:32:47 2016 +0200

    Fix potential crash in SplashOutputDev::doUpdateFont
    
    If we delete fontLoc we need to set it to NULL since it's not set to any value in all of the
    branches of this code

diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 0e50702..eeb6cc3 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -15,7 +15,7 @@
 //
 // Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
 // Copyright (C) 2006 Stefan Schweizer <genstef at gentoo.org>
-// Copyright (C) 2006-2015 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2016 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
 // Copyright (C) 2007 Koji Otani <sho at bbr.jp>
@@ -2060,6 +2060,7 @@ void SplashOutputDev::doUpdateFont(GfxState *state) {
 reload:
   delete id;
   delete fontLoc;
+  fontLoc = NULL;
   if (fontsrc && !fontsrc->isFile)
       fontsrc->unref();