From 344f8a47db3813dca84fda0ed9e468c46c3e585a Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 14 Jun 2021 21:08:50 +0200
Subject: [PATCH] gluon-mesh-vpn-core: fix two more missing NULL checks
read_stdout can return NULL and thus the return value need to be checked
prior to accessing it.
Signed-off-by: David Bauer <mail@david-bauer.net>
---
package/gluon-mesh-vpn-core/src/respondd.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/gluon-mesh-vpn-core/src/respondd.c b/package/gluon-mesh-vpn-core/src/respondd.c
index 8f11a35f5..ed3019b8e 100644
--- a/package/gluon-mesh-vpn-core/src/respondd.c
+++ b/package/gluon-mesh-vpn-core/src/respondd.c
@@ -110,6 +110,9 @@ static struct json_object * get_mesh_vpn_enabled() {
int enabled = -1;
char *line = read_stdout("exec lua -e 'print(require(\"gluon.mesh-vpn\").enabled())'");
+ if (!line)
+ return NULL;
+
if (!strcmp(line, "true"))
enabled = 1;
if (!strcmp(line, "false"))
@@ -126,7 +129,7 @@ static struct json_object * get_mesh_vpn_enabled() {
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)'");
- if (!strcmp(line, "nil")) {
+ if (line && !strcmp(line, "nil")) {
free(line);
return NULL;
}
--
GitLab