From c874bf3f7bd6bbe31416506d9b4213bcbbbac4fa Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Tue, 1 Sep 2015 09:39:58 +0100
Subject: Resolves: tdf#91060 don't crash on loading certain pptx

Change-Id: Ibf32ef644222a59c5fe6a9736ff64739ab24b74f
---
 oox/source/ppt/slidefragmenthandler.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'oox')

diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index 95ea8393b22f..5a27ea34a114 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -194,7 +194,7 @@ SlideFragmentHandler::~SlideFragmentHandler()
     case PPT_TOKEN( cmLst ):
         break;
     case PPT_TOKEN( cm ):
-        if(!mpSlidePersistPtr->getCommentsList().cmLst.empty())
+        if (!mpSlidePersistPtr->getCommentsList().cmLst.empty() && !getCharVector().empty())
         {
             // set comment text for earlier comment
             mpSlidePersistPtr->getCommentsList().cmLst.back().setText( getCharVector().back() );
-- 
cgit