mirror of
https://github.com/haproxy/haproxy.git
synced 2026-06-09 00:32:33 -04:00
MINOR: addons/51degrees: handle memory allocation failures
Found via cppcheck --force --enable=all --output-file=haproxy.log : addons/51degrees/51d.c:130:3: warning: If memory allocation fails, then there is a possible null pointer dereference: name [nullPointerOutOfMemory] addons/51degrees/51d.c:922:4: warning: If memory allocation fails, then there is a possible null pointer dereference: _51d_property_list [nullPointerOutOfMemory]
This commit is contained in:
parent
9393ff4f71
commit
a93b407811
1 changed files with 13 additions and 0 deletions
|
|
@ -127,7 +127,16 @@ static int _51d_property_name_list(char **args, int section_type, struct proxy *
|
|||
|
||||
while (*(args[cur_arg])) {
|
||||
name = calloc(1, sizeof(*name));
|
||||
if (!name) {
|
||||
memprintf(err, "'%s' failed to allocate memory.", args[0]);
|
||||
return -1;
|
||||
}
|
||||
name->name = strdup(args[cur_arg]);
|
||||
if (!name->name) {
|
||||
free(name);
|
||||
memprintf(err, "'%s' failed to allocate memory.", args[0]);
|
||||
return -1;
|
||||
}
|
||||
LIST_APPEND(&global_51degrees.property_names, &name->list);
|
||||
++cur_arg;
|
||||
}
|
||||
|
|
@ -928,6 +937,10 @@ static int init_51degrees(void)
|
|||
list_for_each_entry(name, &global_51degrees.property_names, list)
|
||||
++i;
|
||||
_51d_property_list = calloc(i, sizeof(*_51d_property_list));
|
||||
if (!_51d_property_list) {
|
||||
ha_alert("51Degrees: Failed to allocate property list.\n");
|
||||
return (ERR_FATAL | ERR_ALERT);
|
||||
}
|
||||
|
||||
i = 0;
|
||||
list_for_each_entry(name, &global_51degrees.property_names, list)
|
||||
|
|
|
|||
Loading…
Reference in a new issue