From: Florian Forster <octo@huhu.verplant.org>
Date: Mon, 11 Jan 2010 14:46:07 +0000 (+0100)
Subject: curl_xml plugin: Check the return value of “cx_evaluate_xpath”.
X-Git-Tag: collectd-4.10.0~72^2~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=74dc5ede8695cf7030d4053a483abd78c1572d77;p=collectd.git

curl_xml plugin: Check the return value of “cx_evaluate_xpath”.
---

diff --git a/src/curl_xml.c b/src/curl_xml.c
index a8dbc1cc..78051667 100644
--- a/src/curl_xml.c
+++ b/src/curl_xml.c
@@ -251,7 +251,6 @@ static int  cx_submit_xpath_values (char *plugin_instance, /* {{{ */
 
   xmlXPathObjectPtr base_node_obj = NULL;
   xmlXPathObjectPtr instance_node_obj = NULL;
-  xmlXPathObjectPtr values_node_obj = NULL;
   xmlNodeSetPtr base_nodes = NULL;
   xmlNodeSetPtr instance_node = NULL;
   xmlNodeSetPtr values_node = NULL;
@@ -337,11 +336,16 @@ static int  cx_submit_xpath_values (char *plugin_instance, /* {{{ */
           xmlXPathFreeObject (instance_node_obj);
           continue;
         }
-     }
+     } /* if (xpath->instance != NULL) */
 
      for (j = 0; j < xpath->values_len; j++)
      {
+       xmlXPathObjectPtr values_node_obj;
+
        values_node_obj = cx_evaluate_xpath (xpath_ctx, BAD_CAST xpath->values[j].path);
+       if (values_node_obj == NULL)
+         continue; /* Error already logged. */
+
        values_node = values_node_obj->nodesetval;
        tmp_size = (values_node) ? values_node->nodeNr : 0;