[poppler] qt4/src qt5/src

[Albert Astals Cid]

 qt4/src/poppler-page.cc |    3 ++-
 qt5/src/poppler-page.cc |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dbbe1590d49e620ef0743cb1b99b0b5b9a1f36ec
Author: Arseniy Lartsev <arseniy at alumni.chalmers.se>
Date:   Thu Apr 28 23:59:05 2016 +0200

    qt: Fix crash on certain PDF form item activation actions
    
    Bug #94873

diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index 83bcf4a..9e466da 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -15,6 +15,7 @@
  * Copyright (C) 2012, 2015 Adam Reichold <adamreichold at myopera.com>
  * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
  * Copyright (C) 2015 William Bader <williambader at hotmail.com>
+ * Copyright (C) 2016 Arseniy Lartsev <arseniy at alumni.chalmers.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -205,7 +206,7 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
       if ( lrn->hasScreenAnnot() )
         reference = lrn->getScreenAnnot();
 
-      popplerLink = new LinkRendition( linkArea, lrn->getMedia()->copy(), lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
+      popplerLink = new LinkRendition( linkArea, lrn->getMedia() ? lrn->getMedia()->copy() : NULL, lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
     }
     break;
 
diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc
index 42a342d..937b3b3 100644
--- a/qt5/src/poppler-page.cc
+++ b/qt5/src/poppler-page.cc
@@ -15,6 +15,7 @@
  * Copyright (C) 2012, 2015 Adam Reichold <adamreichold at myopera.com>
  * Copyright (C) 2012, 2013 Thomas Freitag <Thomas.Freitag at alfa.de>
  * Copyright (C) 2015 William Bader <williambader at hotmail.com>
+ * Copyright (C) 2016 Arseniy Lartsev <arseniy at alumni.chalmers.se>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -205,7 +206,7 @@ Link* PageData::convertLinkActionToLink(::LinkAction * a, DocumentData *parentDo
       if ( lrn->hasScreenAnnot() )
         reference = lrn->getScreenAnnot();
 
-      popplerLink = new LinkRendition( linkArea, lrn->getMedia()->copy(), lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
+      popplerLink = new LinkRendition( linkArea, lrn->getMedia() ? lrn->getMedia()->copy() : NULL, lrn->getOperation(), UnicodeParsedString( lrn->getScript() ), reference );
     }
     break;