applied_patches/0579-xlsx-export-notes-avoid-dereferencing-0-svx.diff

   1 From 0f9961f0c35bcaa03d4ef81601cc47cdca22870b Mon Sep 17 00:00:00 2001
   2 From: Jan Nieuwenhuizen <janneke@gnu.org>
   3 Date: Thu, 7 May 2009 11:40:24 +0200
   4 Subject: [PATCH] OOXML: check mpHostAppData before dereferencing.  Fixes n#497417.
   5
   6    * Modified     svx/source/msfilter/eschesdo.cxx
   7 ---
   8  svx/source/msfilter/eschesdo.cxx |    2 +-
   9  1 files changed, 1 insertions(+), 1 deletions(-)
  10
  11 diff --git svx/source/msfilter/eschesdo.cxx svx/source/msfilter/eschesdo.cxx
  12 index 03b4e2a..a82b46f 100644
  13 --- svx/source/msfilter/eschesdo.cxx
  14 +++ svx/source/msfilter/eschesdo.cxx
  15 @@ -251,7 +251,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
  16          // #i51348# shape name
  17          if( aShapeName.Len() > 0 )
  18              aPropOpt.AddOpt( ESCHER_Prop_wzName, aShapeName );
  19 -        if ( InteractionInfo* pInteraction = mpHostAppData->GetInteractionInfo() )
  20 +        if ( InteractionInfo* pInteraction = mpHostAppData ? mpHostAppData->GetInteractionInfo() : 0)
  21                 {
  22                         const std::auto_ptr< SvMemoryStream >& pMemStrm = pInteraction->getHyperlinkRecord();
  23                         if ( pMemStrm.get() )
  24 --
  25 1.6.0.rc1.49.g98a8
  26