[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source

[Herbert Dürr]

 sw/source/core/text/EnhancedPDFExportHelper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 225fe06a0370fe2d935b9258f0243fdb7f749fd4
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Oct 10 09:20:38 2013 +0000

    #i123409# prevent invalid iterator dereference in SwTaggedPDFHelper::CheckReopenTag()
    
    Found by: potassium19
    Patch by: hdu at apache.org
    Review by: orw at apache.org

diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 0c9ac4e..1b09633 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -375,8 +375,9 @@ bool SwTaggedPDFHelper::CheckReopenTag()
             if ( pKey )
             {
                 FrmTagIdMap& rFrmTagIdMap = SwEnhancedPDFExportHelper::GetFrmTagIdMap();
-                const FrmTagIdMap::const_iterator aIter =  rFrmTagIdMap.find( pKey );
-                nReopenTag = (*aIter).second;
+                const FrmTagIdMap::const_iterator aIter = rFrmTagIdMap.find( pKey );
+                if( aIter != rFrmTagIdMap.end())
+                    nReopenTag = (*aIter).second;
             }
         }
     }