lotuswordpro/source/filter/lwptable.cxx | 9 ++++++++- vcl/quartz/ctfonts.cxx | 7 +++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
New commits: commit 7fd180c9d0014ac275422501e70e5122026eb364 Author: Norbert Thiebaud <[email protected]> Date: Tue Feb 18 12:01:51 2014 -0600 fix SIGBUS on mac due to Font Attribute not always available Change-Id: I95c574e6386cacc473cad232100a224ff6a08dbb diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index e5c3f5931..6008aef 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -310,9 +310,12 @@ ImplDevFontAttributes DevFontFromCTFontDescriptor( CTFontDescriptorRef pFD, bool CFStringRef pUILang = CFStringCreateWithCharacters( kCFAllocatorDefault, aUILang.getStr(), aUILang.getLength() ); CFStringRef pLang = NULL; CFStringRef pFamilyName = (CFStringRef)CTFontDescriptorCopyLocalizedAttribute( pFD, kCTFontFamilyNameAttribute, &pLang ); - if ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo ) + if ( !pLang || ( CFStringCompare( pUILang, pLang, 0 ) != kCFCompareEqualTo )) { - CFRelease( pFamilyName ); + if(pFamilyName) + { + CFRelease( pFamilyName ); + } pFamilyName = (CFStringRef)CTFontDescriptorCopyAttribute( pFD, kCTFontFamilyNameAttribute ); } #else commit 263882acdcb7b54aacf834ae52de4ad56a1921bf Author: Norbert Thiebaud <[email protected]> Date: Tue Feb 18 04:37:26 2014 -0600 coverity#738749 Uninitialized scalar field Change-Id: I3a75f31e9a7775e3685f168f418a333f40312d78 diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx index 1a3022f..26eada5 100644 --- a/lotuswordpro/source/filter/lwptable.cxx +++ b/lotuswordpro/source/filter/lwptable.cxx @@ -88,7 +88,14 @@ void LwpSuperTable::XFConvert(XFContentContainer* /*pCont*/) //End of Add /*****************************************************************************/ - LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpContent(objHdr, pStrm) + LwpTable::LwpTable(LwpObjectHeader &objHdr, LwpSvStream* pStrm) + : LwpContent(objHdr, pStrm) + , m_nRow(0) + , m_nColumn(0) + , m_nHeight(0) + , m_nWidth(0) + , m_nDefaultAutoGrowRowHeight(0) + , m_nAttributes(0) {} LwpTable::~LwpTable() _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
