[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sw/source

[Noel Power]

 sw/source/filter/ww8/ww8par6.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 69137bc93d54d77146ae66682fc77c1a5f315518
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 2 22:37:33 2011 +0100

    Related: #i38880# crash in new field code
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index e393472..65aa924 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2709,10 +2709,13 @@ void SwWW8ImplReader::Read_Obj(sal_uInt16 , const sal_uInt8* pData, short nLen)
 
         if( bObj && nPicLocFc && bEmbeddObj )
         {
-            if ( maFieldStack.back().mnFieldId == 56 ) {
+            if (!maFieldStack.empty() && maFieldStack.back().mnFieldId == 56)
+            {
                 // For LINK fields, store the nObjLocFc value in the field entry
                 maFieldStack.back().mnObjLocFc = nPicLocFc;
-            } else {
+            }
+            else
+            {
                 nObjLocFc = nPicLocFc;
             }
         }