summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-12 18:05:54 -0800
committerAlan Coopersmith <alan.coopersmith@oracle.com>2024-01-15 11:17:47 -0800
commit1174436d1a2a79cda5c852935f43a31e5df69b52 (patch)
tree202ac5496eac38f2ca7602942d1065e1b13f01ee
parent5072df5b9d96db8cea6281b8508c452b7729a48f (diff)
Fix 5 of 5 -Wstringop-truncation warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/sis_driver.c1
-rw-r--r--src/sis_utility.c3
2 files changed, 3 insertions, 1 deletions
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;
}