callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 647708 - e_plugin_xml_prop() can return libxml2 allocated memory

Browse Source 
Always copy the xmlChar property into GLib-allocated memory.
g_mem_is_system_malloc() has nothing to do with libxml2.
This commit is contained in:
Matthew Barnes
2011-04-18 19:16:32 -04:00
parent d2390b4cc3
commit 37b3d691ca
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
e-util/e-plugin.c
View File

@ -732,8 +732,7 @@ e_plugin_get_configure_widget (EPlugin *ep)
* @id: The name of the property to retrieve.
*
* A static helper function to look up a property on an XML node, and
* ensure it is allocated in GLib system memory. If GLib isn't using
* the system malloc then it must copy the property value.
* ensure it is allocated in GLib system memory.
*
* Return value: The property, allocated in GLib memory, or NULL if no
* such property exists.
@ -741,17 +740,17 @@ e_plugin_get_configure_widget (EPlugin *ep)
gchar *
e_plugin_xml_prop (xmlNodePtr node, const gchar *id)
{
gchar *p = (gchar *)xmlGetProp (node, (const guchar *)id);
xmlChar *xml_prop;
gchar *glib_prop = NULL;
if (g_mem_is_system_malloc ()) {
return p;
} else {
gchar * out = g_strdup (p);
xml_prop = xmlGetProp (node, (xmlChar *) id);
if (p)
xmlFree (p);
return out;
if (xml_prop != NULL) {
glib_prop = g_strdup ((gchar *) xml_prop);
xmlFree (xml_prop);
}
return glib_prop;
}
/**