From 17c939f7ae7541fc4e2f9facb48080ac0a565c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deuc=D0=B5?= <shurd@sasktel.net> Date: Sun, 22 Sep 2024 18:40:08 -0400 Subject: [PATCH] Fix some warnings, return false for zero-length strings. --- src/syncterm/syncterm.c | 2 ++ src/xpdev/netwrap.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c index 2601f4a3dc..0a1553b1c7 100644 --- a/src/syncterm/syncterm.c +++ b/src/syncterm/syncterm.c @@ -1257,6 +1257,8 @@ get_syncterm_filename(char *fn, int fnlen, int type, bool shared) sprintf(fn, "%.*s", fnlen - 1, config_override); return fn; } +if ((type == SYNCTERM_PATH_LIST) && !shared) +fprintf(stderr, "List override = %p, type = %d (%d), shared: %d\n", list_override, type, SYNCTERM_PATH_LIST, shared); if ((list_override != NULL) && (type == SYNCTERM_PATH_LIST) && !shared) { sprintf(fn, "%.*s", fnlen - 1, list_override); return fn; diff --git a/src/xpdev/netwrap.c b/src/xpdev/netwrap.c index 1e325b40ff..4017f212c3 100644 --- a/src/xpdev/netwrap.c +++ b/src/xpdev/netwrap.c @@ -185,12 +185,12 @@ const char* IPv4AddressToStr(uint32_t addr, char* dest, size_t size) static bool isValidHostnameString(const char *str) { - size_t pos; size_t seglen = 0; size_t totallen = 0; - size_t segcount = 0; bool last_was_hyphen = false; + if (!*str) + return false; while (*str) { if ((*str >= 'a' && *str <= 'z') || (*str >= 'A' && *str <= 'Z') @@ -211,7 +211,6 @@ isValidHostnameString(const char *str) if (*str == '-') { return false; } - segcount++; } seglen++; if (seglen > 63) { -- GitLab