Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

auc: don't segfault on invalid URL

Browse source 
Show error message instead of segfaulting in case of an invalid URL
being read from UCI config.

Fixes: #17971
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit c0d2c82528)
This commit is contained in:
Daniel Golle 2022-03-13 23:48:28 +00:00
parent 31e2e7ccb8
commit 793e7ee484
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
utils/auc/src/auc.c
View file

@ -307,6 +307,7 @@ static int load_config() {
struct uci_context *uci_ctx; struct uci_context *uci_ctx;
struct uci_package *uci_attendedsysupgrade; struct uci_package *uci_attendedsysupgrade;
struct uci_section *uci_s; struct uci_section *uci_s;
char *url;
uci_ctx = uci_alloc_context(); uci_ctx = uci_alloc_context();
if (!uci_ctx) if (!uci_ctx)
@ -319,13 +320,23 @@ static int load_config() {
fprintf(stderr, "Failed to load attendedsysupgrade config\n"); fprintf(stderr, "Failed to load attendedsysupgrade config\n");
return -1; return -1;
} }
uci_s = uci_lookup_section(uci_ctx, uci_attendedsysupgrade, "server"); uci_s = uci_lookup_section(uci_ctx, uci_attendedsysupgrade, "server");
if (!uci_s) { if (!uci_s) {
fprintf(stderr, "Failed to read server config section\n");
return -1;
}
url = uci_lookup_option_string(uci_ctx, uci_s, "url");
if (!url) {
fprintf(stderr, "Failed to read server url from config\n"); fprintf(stderr, "Failed to read server url from config\n");
return -1; return -1;
} }
serverurl = strdup(uci_lookup_option_string(uci_ctx, uci_s, "url")); if (strncmp(url, "https://", strlen("https://")) &&
strncmp(url, "http://", strlen("http://"))) {
fprintf(stderr, "Server url invalid (needs to be http://... or https://...)\n");
return -1;
}
serverurl = strdup(url);
uci_s = uci_lookup_section(uci_ctx, uci_attendedsysupgrade, "client"); uci_s = uci_lookup_section(uci_ctx, uci_attendedsysupgrade, "client");
if (!uci_s) { if (!uci_s) {