ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs in attr handling in RXML.

This commit is contained in:
Themaister 2013-01-07 02:10:20 +01:00
parent 4866aff654
commit 53ae024efc
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compat/rxml/rxml.c
View File

@ -128,7 +128,7 @@ static struct rxml_attrib_node *rxml_parse_attrs(const char *str)
struct rxml_attrib_node *tail = NULL; struct rxml_attrib_node *tail = NULL;
char *save; char *save;
const char *elem = strtok_r(copy, " ", &save); const char *elem = strtok_r(copy, " \n\t\f\v\r", &save);
while (elem) while (elem)
{ {
const char *eq = strstr(elem, "=\""); const char *eq = strstr(elem, "=\"");
@ -159,7 +159,7 @@ static struct rxml_attrib_node *rxml_parse_attrs(const char *str)
else else
list = tail = new_node; list = tail = new_node;
elem = strtok_r(NULL, " ", &save); elem = strtok_r(NULL, " \n\t\f\v\r", &save);
} }
end: end:
@ -167,12 +167,20 @@ end:
return list; return list;
} }
static char *find_first_space(const char *str)
{
while (*str && !isspace(*str))
str++;
return isspace(*str) ? (char*)str : NULL;
}
static bool rxml_parse_tag(struct rxml_node *node, const char *str) static bool rxml_parse_tag(struct rxml_node *node, const char *str)
{ {
const char *str_ptr = str; const char *str_ptr = str;
skip_spaces(&str_ptr); skip_spaces(&str_ptr);
const char *name_end = strchr(str_ptr, ' '); const char *name_end = find_first_space(str_ptr);
if (name_end) if (name_end)
{ {
node->name = strdup_range(str_ptr, name_end); node->name = strdup_range(str_ptr, name_end);