ippool: Fix strncpy -Wformat-truncation warning

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Khem Raj 2019-12-26 09:17:59 -08:00
parent 7b70af667a
commit 81a7c640a9
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,39 @@
Replace strncpy with memcpy
since the length of data to
be copied has already been determined with strlen(). Replace strncpy()
with memcpy() to address the warning and optimize the code a little.
| ippool_config.c:112:2: note: 'snprintf' output between 8 and 55 bytes into a destination of size 48
| 112 | snprintf(prompt, sizeof(prompt), "ippool-%s", server_name);
| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/cli/cli_readline.c
+++ b/cli/cli_readline.c
@@ -257,10 +257,15 @@ static void cli_rl_display_wrapped_text(
int pos;
int in_ws;
int i;
+ int bufsize = sizeof(text_buf)/sizeof(text_buf[0]);
if (left_margin == 0) {
left_margin = 3;
}
+ if (left_margin > bufsize) {
+ left_margin = bufsize;
+ }
+
if (right_margin == 0) {
right_margin = 78;;
}
@@ -271,7 +276,7 @@ static void cli_rl_display_wrapped_text(
/* First copy the text heading to the buffer and add a "-", accounting for
* the specified left margin.
*/
- strncpy(&text_buf[0], text1, left_margin - 3);
+ memcpy(&text_buf[0], text1, left_margin - 3);
for (pos = strlen(text1); pos < left_margin - 3; pos++) {
text_buf[pos] = ' ';
}

View File

@ -26,6 +26,7 @@ SRC_URI = "https://sourceforge.net/projects/openl2tp/files/${BPN}/${PV}/${BPN}-$
file://0003-cli-Mark-return-of-strtol-as-long-int.patch \
file://0002-link-with-libtirpc.patch \
file://0003-musl-fixes.patch \
file://strncpy-truncation.patch \
"
LIC_FILES_CHKSUM = "file://LICENSE;md5=4c59283b82fc2b166455e0fc23c71c6f"