Changeset e88e9e38ef3322a56040d64badb9dd6c77934d47

Timestamp:

05/02/12 13:12:58 (1 year ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1335964378 -0400

git-parent:

[d5e61dbf0c7e4b34195decd6f2b28faf0b3df9c1]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1335964378 -0400

Message:

various memory leaks related so xmlXPathCastNodeToString and xmlGetNodePath

Files:

• src/noit_conf.c (modified) (2 diffs)
• src/noit_conf_checks.c (modified) (7 diffs)
• src/noit_filters.c (modified) (1 diff)

src/noit_conf.c

@@ -1790 +1790 @@
-                       noit_console_state_t *state, void *closure) {
-  const char *err = "internal error";
-
+ = NULL
-  noit_conf_t_userdata_t *info;
-  xmlXPathObjectPtr pobj = NULL;
@@ -1847 +1847 @@
-  if(!strcmp(path + 1, root_node_name))
-    info->path = strdup("/");
-
-
+
+
+
-                        strlen(root_node_name));
+    free(xmlpath);
+  }
+
+  if(path) free(path);
-  if(pobj) xmlXPathFreeObject(pobj);
-  if(closure) noit_console_state_pop(ncct, argc, argv, NULL, NULL);
-  return 0;
- bad:
+  if(path) free(path);
-  if(pobj) xmlXPathFreeObject(pobj);
-  nc_printf(ncct, "%s [%s]\n", err, xpath);

src/noit_conf_checks.c

@@ -232 +232 @@
-  noit_conf_t_userdata_t *info;
-  char xpath[1024], newuuid_str[37];
-
+ = NULL
-  uuid_t checkid;
-  xmlXPathContextPtr xpath_ctxt = NULL;
@@ -303 +303 @@
-
-  if(info) {
+    char *xmlpath;
-    if(info->path) free(info->path);
-
+
+
+
-    uuid_copy(info->current_check, checkid);
-    if(argc > 1) refresh_subchecks(ncct, info);
@@ -314 +317 @@
-  }
- out:
+  if(uuid_conf) free(uuid_conf);
-  if(pobj) xmlXPathFreeObject(pobj);
-  return 0;
@@ -463 +467 @@
-
-    if(!INHERIT(module, mnode, module)) module = NULL;
-
+ {
-      nc_printf(ncct, " name: %s\n", value);
+      free(value);
+    }
-    else
-      nc_printf(ncct, " name: %s [from module]\n", module ? module : "[undef]");
@@ -699 +705 @@
-    if(node->children && node->children == xmlGetLastChild(node) &&
-      xmlNodeIsText(node->children)) {
+      char *node_str, *xmlpath;
+      node_str = (char *)xmlXPathCastNodeToString(node->children);
+      xmlpath = (char *)xmlGetNodePath(node);
-      if(!titled++) nc_printf(ncct, "== Section Settings ==\n");
-
-
+
+
+
-    }
-  }
@@ -743 +753 @@
-  titled = 0;
-  for(i=0; i<cnt; i++) {
+    char *xmlpath;
-    node = (noit_conf_section_t)xmlXPathNodeSetItem(pobj->nodesetval, i);
-    if(!strcmp((char *)node->name, "check")) continue;
-    if(!strcmp((char *)node->name, "filterset")) continue;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-
@@ -773 +787 @@
-      int busted = 1;
-      xmlAttr *attr;
-
+
+
-
-      if(!titled++) nc_printf(ncct, "== Checks ==\n");
-
-      for(attr=node->properties; attr; attr = attr->next) {
-
+ {
-          uuid_str = (char *)xmlXPathCastNodeToString(attr->children);
-
-
-
-
-
-
-
-
-
-
-
+
-        }
-      }
-
-
+
+
+
+
+
+
+
+
+
+
-      if(busted) nc_printf(ncct, "[check not in running system]");
-      nc_write(ncct, "\n", 1);

src/noit_filters.c

@@ -449 +449 @@
-
-  if(info) {
+    char *xmlpath = NULL;
-    if(info->path) free(info->path);
-
+
+
+
-    strlcpy(info->filter_name, argv[0], sizeof(info->filter_name));
-    if(state) {