mirror
/
gluon-packages
mirror of https://github.com/freifunk-gluon/packages.git
1
0
Fork 0
Code Releases Activity

autoupdater: Replace mallocs with safe_malloc 

During parsing of cinfiguration multiple null ptr dereferences were
possible due to a lack of NULL checks

Signed-off-by: Tobias Schramm <tobleminer@gmail.com>
This commit is contained in:
Tobias Schramm 2018-02-20 12:12:50 +01:00
parent c9b1b76034
commit a96a2d7718
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/autoupdater/src/settings.c
View File

@ -27,6 +27,7 @@
#include "settings.h"
#include "hexutil.h"
#include "util.h"
#include <uci.h>
@ -97,7 +98,7 @@ static const char ** load_string_list(struct uci_context *ctx, struct uci_sectio
i++;
*len = i;
const char **ret = malloc(i * sizeof(char *));
const char **ret = safe_malloc(i * sizeof(char *), "failed to allocate string list");
i = 0;
uci_foreach_element(&o->v.list, e)
@ -154,7 +155,7 @@ void load_settings(struct settings *settings) {
settings->mirrors = load_string_list(ctx, branch, "mirror", &settings->n_mirrors);
const char **pubkeys_str = load_string_list(ctx, branch, "pubkey", &settings->n_pubkeys);
settings->pubkeys = malloc(settings->n_pubkeys * sizeof(ecc_25519_work_t));
settings->pubkeys = safe_malloc(settings->n_pubkeys * sizeof(ecc_25519_work_t), "failed to allocate memory for public keys");
size_t ignored_keys = 0;
for (size_t i = 0; i < settings->n_pubkeys; i++) {
ecc_int256_t pubkey_packed;