mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#982460: Explicit null dereferenced

Browse Source 
Change-Id: I64d559603bff0d618dce72927566531296984d3c
Reviewed-on: https://gerrit.libreoffice.org/3823
Reviewed-by: Noel Power <noel.power@suse.com>
Tested-by: Noel Power <noel.power@suse.com>
This commit is contained in:
Julien Nabet
2013-05-08 01:46:40 +02:00
committed by Noel Power
parent dc5bb7dfa7
commit 02beb61475
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
l10ntools/source/xrmmerge.cxx
View File

@@ -381,11 +381,10 @@ XRMResMerge::XRMResMerge(
sFilename( rFilename ) , sFilename( rFilename ) ,
pResData( NULL ) pResData( NULL )
{ {
if (!rMergeSource.isEmpty()) if (!rMergeSource.isEmpty() && sLanguage.equalsIgnoreAsciiCase("ALL"))
{
pMergeDataFile = new MergeDataFile( pMergeDataFile = new MergeDataFile(
rMergeSource, sInputFileName, false); rMergeSource, sInputFileName, false);
if( sLanguage.equalsIgnoreAsciiCase("ALL") )
{
aLanguages = pMergeDataFile->GetLanguages(); aLanguages = pMergeDataFile->GetLanguages();
} }
else else