[PATCH] coverity#982460: Explicit null dereferenced

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3823

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/3823/1

coverity#982460: Explicit null dereferenced

Change-Id: I64d559603bff0d618dce72927566531296984d3c
---
M l10ntools/source/xrmmerge.cxx
1 file changed, 2 insertions(+), 3 deletions(-)



diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 8a8b856..8265b4a 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -381,11 +381,10 @@
                 sFilename( rFilename ) ,
                 pResData( NULL )
 {
-    if (!rMergeSource.isEmpty())
+    if (!rMergeSource.isEmpty() && sLanguage.equalsIgnoreAsciiCase("ALL"))
+    {
         pMergeDataFile = new MergeDataFile(
             rMergeSource, sInputFileName, false);
-    if( sLanguage.equalsIgnoreAsciiCase("ALL") )
-    {
         aLanguages = pMergeDataFile->GetLanguages();
     }
     else

-- 
To view, visit https://gerrit.libreoffice.org/3823
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I64d559603bff0d618dce72927566531296984d3c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>