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

Merge pull request #2240 from blocktrron/pr-gluon-mesh-vpn-respondd-fix

Browse Source 
gluon-mesh-vpn-core: fix potential null pointer dereferences
This commit is contained in:
Matthias Schiffer 2021-06-16 17:29:15 +02:00 committed by GitHub
commit 7e45878b4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/gluon-mesh-vpn-core/src/respondd.c
View File

@ -60,11 +60,11 @@ static struct json_object * get_bandwidth_limit(void) {
enabled = true; enabled = true;
const char *egress_str = uci_lookup_option_string(ctx, s, "limit_egress"); const char *egress_str = uci_lookup_option_string(ctx, s, "limit_egress");
if (strcmp(egress_str, "-")) if (egress_str && strcmp(egress_str, "-"))
egress = atoi(egress_str); egress = atoi(egress_str);
const char *ingress_str = uci_lookup_option_string(ctx, s, "limit_ingress"); const char *ingress_str = uci_lookup_option_string(ctx, s, "limit_ingress");
if (strcmp(ingress_str, "-")) if (ingress_str && strcmp(ingress_str, "-"))
ingress = atoi(ingress_str); ingress = atoi(ingress_str);
if (egress >= 0) if (egress >= 0)
@ -110,6 +110,9 @@ static struct json_object * get_mesh_vpn_enabled() {
int enabled = -1; int enabled = -1;
char *line = read_stdout("exec lua -e 'print(require(\"gluon.mesh-vpn\").enabled())'"); char *line = read_stdout("exec lua -e 'print(require(\"gluon.mesh-vpn\").enabled())'");
if (!line)
return NULL;
if (!strcmp(line, "true")) if (!strcmp(line, "true"))
enabled = 1; enabled = 1;
if (!strcmp(line, "false")) if (!strcmp(line, "false"))
@ -126,7 +129,7 @@ static struct json_object * get_mesh_vpn_enabled() {
static struct json_object * get_active_vpn_provider() { static struct json_object * get_active_vpn_provider() {
char *line = read_stdout("exec lua -e 'name, _ = require(\"gluon.mesh-vpn\").get_active_provider(); print(name)'"); char *line = read_stdout("exec lua -e 'name, _ = require(\"gluon.mesh-vpn\").get_active_provider(); print(name)'");
if (!strcmp(line, "nil")) { if (line && !strcmp(line, "nil")) {
free(line); free(line);
return NULL; return NULL;
} }