old class Stack pop'ed 0 from empty stack, which std::stack doesn't

Some places in the code assumed that if the stack is empty a null pointer is
returned by top() (or old Pop()), this doesn't work anymore with ::std::stack
that instead has undefined behavior in that case, so check !stack.empty()
first before accessing top.
(cherry picked from commit ac40f7d6503533954127e818f2bf009200c1e3f2)

1 files changed, 11 insertions, 3 deletions

diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index 207a37dfcff9..50b53c2e43b1 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -346,9 +346,17 @@ void XclEscherEx::EndShape( sal_uInt16 nShapeType, sal_uInt32 nShapeID )
 
     // get next object from stack
     DeleteCurrAppData();
-    pCurrXclObj = aStack.top().first;
-    pCurrAppData = aStack.top().second;
-    aStack.pop();
+    if (aStack.empty())
+    {
+        pCurrXclObj = NULL;
+        pCurrAppData = NULL;
+    }
+    else
+    {
+        pCurrXclObj = aStack.top().first;
+        pCurrAppData = aStack.top().second;
+        aStack.pop();
+    }
     if( nAdditionalText == 3 )
         nAdditionalText = 0;
 }