Kaydet (Commit) 02beb614 authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Noel Power

coverity#982460: Explicit null dereferenced

Change-Id: I64d559603bff0d618dce72927566531296984d3c
Reviewed-on: https://gerrit.libreoffice.org/3823Reviewed-by: 's avatarNoel Power <noel.power@suse.com>
Tested-by: 's avatarNoel Power <noel.power@suse.com>
üst dc5bb7df
...@@ -381,11 +381,10 @@ XRMResMerge::XRMResMerge( ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment