mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent null dereference

Browse source 
In each case there are scenarios where we would have dereferenced NULL.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-06-21 21:43:38 -07:00
parent 18d52ec86e
commit 66375689b8
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
file.c
View file

@ -499,7 +499,7 @@ char *parse_mkvi_value(const char *haystack, const char *needle)
terminator = '\r'; terminator = '\r';
} }
*endptr = 0; *endptr = 0;
ret = strdup(valueptr); ret = copy_string(valueptr);
*endptr = terminator; *endptr = terminator;
} }
@ -513,12 +513,11 @@ char *next_mkvi_key(const char *haystack)
if ((valueptr = strstr(haystack, "\n")) != NULL) { if ((valueptr = strstr(haystack, "\n")) != NULL) {
valueptr += 1; valueptr += 1;
} if ((endptr = strstr(valueptr, ": ")) != NULL) {
if ((endptr = strstr(valueptr, ": ")) != NULL) { *endptr = 0;
*endptr = 0; ret = strdup(valueptr);
ret = strdup(valueptr); *endptr = ':';
*endptr = ':'; }
} }
return ret; return ret;
} }

2
parse-xml.c
View file

@ -1762,7 +1762,7 @@ static const char *nodename(xmlNode *node, char *buf, int len)
int levels = 2; int levels = 2;
char *p = buf; char *p = buf;
if (node->type != XML_CDATA_SECTION_NODE && (!node || !node->name)) { if (!node || (node->type != XML_CDATA_SECTION_NODE && !node->name)) {
return "root"; return "root";
} }