From 1174436d1a2a79cda5c852935f43a31e5df69b52 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Fri, 12 Jan 2024 18:05:54 -0800 Subject: Fix 5 of 5 -Wstringop-truncation warnings Signed-off-by: Alan Coopersmith --- src/sis_driver.c | 1 + src/sis_utility.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sis_driver.c b/src/sis_driver.c index 766c362..7bc39c2 100644 --- a/src/sis_driver.c +++ b/src/sis_driver.c @@ -3122,6 +3122,7 @@ SiS_CheckKernelFB(ScrnInfoPtr pScrn) if(pSiS->sisfbfound) { strncpy(pSiS->sisfbdevname, name, 15); + pSiS->sisfbdevname[15] = '\0'; } else { xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "sisfb not found\n"); } diff --git a/src/sis_utility.c b/src/sis_utility.c index 6c5b3cd..e43e9cf 100644 --- a/src/sis_utility.c +++ b/src/sis_utility.c @@ -856,7 +856,8 @@ sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring) sdcbuf->sdc_buffer[0] = 0; if(mystring) { slen = strlen(mystring); - if(slen > 31) slen = 31; + if (slen > (sizeof(sdcbuf->sdc_buffer) - 1)) + slen = sizeof(sdcbuf->sdc_buffer) - 1; strncpy(&sdcbuf->sdc_buffer[0], mystring, slen); sdcbuf->sdc_buffer[slen] = 0; } -- cgit v1.2.3