collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Guarding against freeing NULL pointers.

Browse source
This commit is contained in:
Omer Katz 2014-05-21 12:46:56 +03:00
parent 3ea9354e0b
commit 61b3b24e2e
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/node.c
View file

@ -65,25 +65,27 @@ node * r3_tree_create(int cap) {
} }
void r3_tree_free(node * tree) { void r3_tree_free(node * tree) {
for (int i = 0 ; i < tree->edge_len ; i++ ) { if (tree) {
if (tree->edges[i]) { for (int i = 0 ; i < tree->edge_len ; i++ ) {
r3_edge_free(tree->edges[ i ]); if (tree->edges[i]) {
r3_edge_free(tree->edges[ i ]);
}
} }
if (tree->edges)
zfree(tree->edges);
if (tree->routes)
zfree(tree->routes);
if (tree->combined_pattern)
zfree(tree->combined_pattern);
if (tree->pcre_pattern)
zfree(tree->pcre_pattern);
if (tree->pcre_extra)
zfree(tree->pcre_extra);
if (tree->ov)
zfree(tree->ov);
zfree(tree);
tree = NULL;
} }
if (tree->edges)
zfree(tree->edges);
if (tree->routes)
zfree(tree->routes);
if (tree->combined_pattern)
zfree(tree->combined_pattern);
if (tree->pcre_pattern)
zfree(tree->pcre_pattern);
if (tree->pcre_extra)
zfree(tree->pcre_extra);
if (tree->ov)
zfree(tree->ov);
zfree(tree);
tree = NULL;
} }
@ -237,8 +239,10 @@ match_entry * match_entry_createl(char * path, int path_len) {
} }
void match_entry_free(match_entry * entry) { void match_entry_free(match_entry * entry) {
str_array_free(entry->vars); if (entry) {
zfree(entry); str_array_free(entry->vars);
zfree(entry);
}
} }
@ -385,7 +389,9 @@ route * r3_route_create(char * path) {
} }
void r3_route_free(route * route) { void r3_route_free(route * route) {
zfree(route); if (route) {
zfree(route);
}
} }
route * r3_route_createl(char * path, int path_len) { route * r3_route_createl(char * path, int path_len) {