diff options
| author | Frédéric Boisnard <fredericx.boisnard@intel.com> | 2012-10-18 18:20:03 +0200 |
|---|---|---|
| committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:03:29 +0100 |
| commit | a409daaa0575e2e1db197a32fc95804736acf841 (patch) | |
| tree | 1747dce7a6458a6f51fd3cf8dabe13e51197f354 /parameter/XmlFileIncluderElement.cpp | |
| parent | df6649888c0beb66e0461e1f5a15b5f676b5a048 (diff) | |
| download | external_parameter-framework-a409daaa0575e2e1db197a32fc95804736acf841.zip external_parameter-framework-a409daaa0575e2e1db197a32fc95804736acf841.tar.gz external_parameter-framework-a409daaa0575e2e1db197a32fc95804736acf841.tar.bz2 | |
PFW: Prevent crash if subsystem structure missing
BZ: 62524
If the XML file defining a subsystem is missing, the PFW crashes
without any message.
This patch fixes this issue.
Change-Id: Ibc0e9d195a8207d41d25613f56d1c9740bf6c784
Signed-off-by: Frédéric Boisnard <fredericx.boisnard@intel.com>
Reviewed-on: http://android.intel.com:8080/70698
Reviewed-by: Denneulin, Guillaume <guillaume.denneulin@intel.com>
Reviewed-by: Rocard, KevinX <kevinx.rocard@intel.com>
Reviewed-by: Centelles, Sylvain <sylvain.centelles@intel.com>
Reviewed-by: Baron, Georges-henriX <georges-henrix.baron@intel.com>
Tested-by: Dixon, CharlesX <charlesx.dixon@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/XmlFileIncluderElement.cpp')
| -rw-r--r-- | parameter/XmlFileIncluderElement.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp index 89e5c14..4986758 100644 --- a/parameter/XmlFileIncluderElement.cpp +++ b/parameter/XmlFileIncluderElement.cpp @@ -56,6 +56,11 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement& xmlElement, CXmlSeriali // Use a doc source that load data from a file CXmlFileDocSource fileDocSource(strPath, elementSerializingContext.getXmlSchemaPathFolder() + "/" + strIncludedElementType + ".xsd", strIncludedElementType); + if (!fileDocSource.isParsable(elementSerializingContext)) { + + return false; + } + // Get top level element CXmlElement childElement; |