Permalink
Browse files

Merge branch 'master' of github.com:ClusterLabs/pacemaker

  • Loading branch information...
2 parents 566dac3 + 9812e5b commit b593e97fd521b7ad66e2f8036f14c540c6b3eebb @beekhof beekhof committed Feb 28, 2014
Showing with 7 additions and 1 deletion.
  1. +2 −0 cib/messages.c
  2. +5 −1 lib/common/xml.c
View
@@ -223,6 +223,8 @@ cib_process_ping(const char *op, int options, const char *section, xmlNode * req
crm_info("Reporting our current digest to %s: %s (%d)", host, digest, cs && cs->targets);
+ free(digest);
+
return pcmk_ok;
#endif
}
View
@@ -794,9 +794,10 @@ xml_create_patchset(int format, xmlNode *source, xmlNode *target, bool *config_c
}
if(patch && with_digest) {
- const char *digest = calculate_xml_versioned_digest(target, FALSE, TRUE, version);
+ char *digest = calculate_xml_versioned_digest(target, FALSE, TRUE, version);
crm_xml_add(patch, XML_ATTR_DIGEST, digest);
+ free(digest);
}
return patch;
}
@@ -1320,7 +1321,9 @@ __xml_find_path(xmlNode *top, const char *key)
free(remainder);
free(current);
+ free(section);
free(tag);
+ free(id);
return target;
}
@@ -1527,6 +1530,7 @@ xml_apply_patchset(xmlNode *xml, xmlNode *patchset, bool check_version)
crm_trace("Digest matched: expected %s, calculated %s", digest, new_digest);
}
free(new_digest);
+ free(version);
}
free_xml(old);
return rc;

0 comments on commit b593e97

Please sign in to comment.