nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: check for NULL after uci_alloc_context() (#1224)

Browse Source
This commit is contained in:
lemoer 2017-09-21 20:56:40 +02:00 committed by Matthias Schiffer
parent c0b4fb54a4
commit 4899dda4af
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-autoupdater/src/respondd.c
View File

@ -36,6 +36,8 @@
static struct json_object * get_autoupdater(void) { static struct json_object * get_autoupdater(void) {
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
return NULL;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;
struct uci_package *p; struct uci_package *p;

2
package/gluon-mesh-batman-adv/src/respondd.c
View File

@ -446,6 +446,8 @@ static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifna
static void count_stations(size_t *wifi24, size_t *wifi5) { static void count_stations(size_t *wifi24, size_t *wifi5) {
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
return;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;

6
package/gluon-mesh-vpn-fastd/src/respondd.c
View File

@ -77,6 +77,8 @@ static struct json_object * get_fastd(void) {
bool enabled = false; bool enabled = false;
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
goto disabled_nofree;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;
struct uci_package *p; struct uci_package *p;
@ -92,8 +94,8 @@ static struct json_object * get_fastd(void) {
enabled = true; enabled = true;
disabled: disabled:
uci_free_context(ctx); uci_free_context(ctx);
disabled_nofree:
struct json_object *ret = json_object_new_object(); struct json_object *ret = json_object_new_object();
json_object_object_add(ret, "version", get_fastd_version()); json_object_object_add(ret, "version", get_fastd_version());
@ -159,6 +161,8 @@ static struct json_object * get_status(void) {
struct json_object *ret = NULL; struct json_object *ret = NULL;
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
return NULL;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;
struct uci_package *p; struct uci_package *p;

2
package/gluon-node-info/src/respondd.c
View File

@ -117,6 +117,8 @@ static struct json_object * respondd_provider_nodeinfo(void) {
struct json_object *ret = json_object_new_object(); struct json_object *ret = json_object_new_object();
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
return ret;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;
struct uci_package *p; struct uci_package *p;

2
package/gluon-respondd/src/respondd.c
View File

@ -70,6 +70,8 @@ static struct json_object * get_hostname(void) {
struct json_object *ret = NULL; struct json_object *ret = NULL;
struct uci_context *ctx = uci_alloc_context(); struct uci_context *ctx = uci_alloc_context();
if (!ctx)
return NULL;
ctx->flags &= ~UCI_FLAG_STRICT; ctx->flags &= ~UCI_FLAG_STRICT;
char section[] = "system.@system[0]"; char section[] = "system.@system[0]";