Skip to content

libdom fix qnamebuf size with malloc #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danoli3 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libdom fix qnamebuf size with malloc #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions bindings/xml/libxml_xmlparser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
strlen((const char *) child->ns->prefix) : 0) +
(child->ns->prefix != NULL ? 1 : 0) /* ':' */ +
strlen((const char *) child->name);
uint8_t qnamebuf[qnamelen + 1 /* '\0' */];
uint8_t *qnamebuf = (uint8_t *)malloc(qnamelen + 1 /* '\0' */);

/* Create namespace DOM string */
err = dom_string_create(
Expand All @@ -727,6 +727,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
if (err != DOM_NO_ERR) {
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"No memory for namespace");
if(qnamebuf) free(qnamebuf);
return err;
}

Expand All @@ -747,6 +748,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
dom_string_unref(namespace);
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"No memory for qname");
if(qnamebuf) free(qnamebuf);
return err;
}

Expand All @@ -759,12 +761,14 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"Failed creating element '%s'",
qnamebuf);
if(qnamebuf) free(qnamebuf);
return err;
}

/* No longer need namespace / qname */
dom_string_unref(namespace);
dom_string_unref(qname);
if(qnamebuf) free(qnamebuf);
}

/* Add attributes to created element */
Expand Down Expand Up @@ -809,7 +813,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
strlen((const char *) a->ns->prefix) : 0) +
(a->ns->prefix != NULL ? 1 : 0) /* ':' */ +
strlen((const char *) a->name);
uint8_t qnamebuf[qnamelen + 1 /* '\0' */];
uint8_t *qnamebuf = (uint8_t *)malloc(qnamelen + 1 /* '\0' */);

/* Create namespace DOM string */
err = dom_string_create(
Expand All @@ -819,6 +823,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
if (err != DOM_NO_ERR) {
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"No memory for namespace");
if(qnamebuf) free(qnamebuf);
goto cleanup;
}

Expand All @@ -839,6 +844,7 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
dom_string_unref(namespace);
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"No memory for qname");
if(qnamebuf) free(qnamebuf);
goto cleanup;
}

Expand All @@ -851,12 +857,14 @@ dom_exception xml_parser_add_element_node(dom_xml_parser *parser,
parser->msg(DOM_MSG_CRITICAL, parser->mctx,
"Failed creating attribute \
'%s'", qnamebuf);
if(qnamebuf) free(qnamebuf);
goto cleanup;
}

/* No longer need namespace / qname */
dom_string_unref(namespace);
dom_string_unref(qname);
if(qnamebuf) free(qnamebuf);
}

/* Clone subtree (attribute value) */
Expand Down