From: Vincent Bernat <vincent@bernat.ch>
Date: Sat, 25 Nov 2023 15:14:08 +0000 (+0100)
Subject: build: ensure we use -Werror on Linux builds
X-Git-Tag: 1.0.18~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=247fb1a989fd3b939fe7099c388c7a9d78a2c1d8;p=thirdparty%2Flldpd.git

build: ensure we use -Werror on Linux builds
---

diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
index 1932f4f4..287058fe 100644
--- a/src/daemon/lldpd.c
+++ b/src/daemon/lldpd.c
@@ -952,9 +952,11 @@ lldpd_hide_ports(struct lldpd *cfg, struct lldpd_hardware *hardware, int mask)
 				memcpy(buffer + sizeof(buffer) - 4, "...", 4);
 				break;
 			}
-			if (buffer[0]) strncat(buffer, ", ", 2);
+			if (buffer[0])
+				strncat(buffer, ", ",
+				    sizeof(buffer) - strlen(buffer) - 1);
 			strncat(buffer, cfg->g_protocols[i].name,
-			    strlen(cfg->g_protocols[i].name));
+			    sizeof(buffer) - strlen(buffer) - 1);
 		}
 	}
 	log_debug("smartfilter", "%s: %s: %d visible neighbors (out of %d)",
diff --git a/tests/ci/run.sh b/tests/ci/run.sh
index cf868731..71526cec 100755
--- a/tests/ci/run.sh
+++ b/tests/ci/run.sh
@@ -9,7 +9,6 @@ case "$(uname -s)" in
         [ $(uname -m) != x86_64 ] || \
             LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --enable-sanitizers"
         LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS LDFLAGS=-fuse-ld=gold"
-        MAKE_ARGS="-Werror"
         ;;
     Darwin)
         LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS CFLAGS=-mmacosx-version-min=11.1"