AIR/mxml
1
0
Fork 0
mirror of https://github.com/michaelrsweet/mxml.git synced 2024-11-08 13:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in mxmlLoad*() functions (STR #27)

Browse Source 
Fix default implementation of mxml_error() to properly format the
error message.
This commit is contained in:
Michael R Sweet 2005-08-16 14:46:18 +00:00
parent 1bbf8b7da6
commit 74e7d69032
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -1,8 +1,10 @@
CHANGES - 08/10/2005
CHANGES - 08/16/2005
--------------------
CHANGES IN Mini-XML 2.2.3
- The mxmlLoad*() functions could leak a node on an error
(STR #27)
- The mxml_vsnprintf() function could get in an infinite
loop on a buffer overflow (STR #25)
- Added new mxmlNewCDATA() and mxmlSetCDATA() functions

3
doc/relnotes.html
View File

@ -7,6 +7,9 @@
<ul>
<li>The mxmlLoad*() functions could leak a node on an
error (STR #27)</li>
<li>The mxml_vsnprintf() function could get in an infinite
loop on a buffer overflow (STR #25)</li>

35
mxml-file.c
View File

@ -1453,7 +1453,11 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
if (ch == '<' && whitespace && type == MXML_TEXT)
{
mxmlNewText(parent, whitespace, "");
node = mxmlNewText(parent, whitespace, "");
if (!first && node)
first = node;
whitespace = 0;
}
@ -1521,7 +1525,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
*bufptr = '\0';
if (!mxmlNewElement(parent, buffer))
if ((node = mxmlNewElement(parent, buffer)) == NULL)
{
/*
* Just print error for now...
@ -1531,6 +1535,9 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
parent ? parent->value.element.name : "null");
break;
}
if (!first)
first = node;
}
else if (!strcmp(buffer, "![CDATA["))
{
@ -1567,7 +1574,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
*bufptr = '\0';
if (!mxmlNewElement(parent, buffer))
if ((node = mxmlNewElement(parent, buffer)) == NULL)
{
/*
* Print error and return...
@ -1577,6 +1584,9 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
parent ? parent->value.element.name : "null");
goto error;
}
if (!first)
first = node;
}
else if (buffer[0] == '?')
{
@ -1613,7 +1623,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
*bufptr = '\0';
if (!(parent = mxmlNewElement(parent, buffer)))
if ((parent = mxmlNewElement(parent, buffer)) == NULL)
{
/*
* Print error and return...
@ -1624,6 +1634,9 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
goto error;
}
if (!first)
first = parent;
if (cb)
type = (*cb)(parent);
}
@ -1669,8 +1682,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
*bufptr = '\0';
node = mxmlNewElement(parent, buffer);
if (!node)
if ((node = mxmlNewElement(parent, buffer)) == NULL)
{
/*
* Print error and return...
@ -1681,6 +1693,9 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
goto error;
}
if (!first)
first = node;
/*
* Descend into this node, setting the value type as needed...
*/
@ -1729,9 +1744,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
* Handle open tag...
*/
node = mxmlNewElement(parent, buffer);
if (!node)
if ((node = mxmlNewElement(parent, buffer)) == NULL)
{
/*
* Just print error for now...
@ -1742,6 +1755,9 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
goto error;
}
if (!first)
first = node;
if (isspace(ch))
ch = mxml_parse_element(node, p, &encoding, getc_cb);
else if (ch == '/')
@ -1750,6 +1766,7 @@ mxml_load_data(mxml_node_t *top, /* I - Top node */
{
mxml_error("Expected > but got '%c' instead for element <%s/>!",
ch, buffer);
mxmlDelete(node);
goto error;
}

10
mxml-private.c
View File

@ -47,7 +47,7 @@ mxml_error(const char *format, /* I - Printf-style format string */
...) /* I - Additional arguments as needed */
{
va_list ap; /* Pointer to arguments */
char *s; /* Message string */
char s[1024]; /* Message string */
/*
@ -63,7 +63,7 @@ mxml_error(const char *format, /* I - Printf-style format string */
va_start(ap, format);
s = mxml_strdupf(format, ap);
vsnprintf(s, sizeof(s), format, ap);
va_end(ap);
@ -75,12 +75,6 @@ mxml_error(const char *format, /* I - Printf-style format string */
(*mxml_error_cb)(s);
else
fprintf(stderr, "mxml: %s\n", s);
/*
* Free the string...
*/
free(s);
}