From aef2111fd14d654f72ae910eb52eb8c8f2b8cc94 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 16 Apr 2014 13:19:44 +0200
Subject: l10ntools: helpex: don't crash if the file can't be parsed; return
 error

Change-Id: I637f8486b0774b399ed5e250868d756c944e50f6
---
 l10ntools/source/helpmerge.cxx | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'l10ntools')

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 6d3c4ddb73b5..20773de553ac 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -152,6 +152,11 @@ bool HelpParser::Merge( const OString &rPOFile, const OString &rDestinationFile,
     //TODO: explicit BOM handling?
 
     XMLFile* xmlfile = ( aParser.Execute( sHelpFile, new XMLFile( OString('0') ) ) );
+    if (!xmlfile)
+    {
+        SAL_WARN("l10ntools", "could not parse " << sHelpFile);
+        return false;
+    }
     bool hasNoError = MergeSingleFile( xmlfile , pMergeDataFile , rLanguage , rDestinationFile );
     delete xmlfile;
     return hasNoError;
-- 
cgit