Merge pull request #2100 from icy17/add_null_check

Fix potential NULL pointer dereference before calling xmlXPathEvalExp…
OpenSCAP · Apr 3, 2024 · 9028f05 · 9028f05
2 parents b51994d + 8185b62
commit 9028f05
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/src/DS/sds.c b/src/DS/sds.c
@@ -791,7 +791,14 @@ static int ds_sds_compose_catalog_has_uri(xmlDocPtr doc, xmlNodePtr catalog, con
  xpathCtx->node = catalog;
 
  char *expression = oscap_sprintf("cat:uri[@uri = '%s']", uri);
+ if (expression == NULL)
+ {
+ oscap_seterr(OSCAP_EFAMILY_OSCAP, "Error: Unable to create XPath expression.");
+ xmlXPathFreeContext(xpathCtx);
 
+ return -1;
+ }
+
  xmlXPathObjectPtr xpathObj = xmlXPathEvalExpression(
  BAD_CAST expression,
  xpathCtx);
@@ -1012,6 +1019,13 @@ static int ds_sds_compose_has_component_ref(xmlDocPtr doc, xmlNodePtr datastream
  xpathCtx->node = datastream;
 
  char *expression = oscap_sprintf("*/ds:component-ref[@xlink:href = '#%s' and @id = '%s']", filepath, cref_id);
+ if (expression == NULL)
+ {
+ oscap_seterr(OSCAP_EFAMILY_OSCAP, "Error: Unable to create XPath expression.");
+ xmlXPathFreeContext(xpathCtx);
+
+ return -1;
+ }
 
  xmlXPathObjectPtr xpathObj = xmlXPathEvalExpression(
  BAD_CAST expression,