80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4310 from cold-brewed/gcc-warning-fix

Browse Source 
Fix gcc warning with use of strncpy
This commit is contained in:
Miran Grča
2024-03-28 07:19:12 +01:00
committed by GitHub
parent d69eb5cd49 bf09f6c9fc
commit 86c6cc27ab
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/disk/zip.c
View File

@@ -532,6 +532,11 @@ zip_load(zip_t *dev, char *fn)
fatal("zip_load(): Error seeking to the beginning of the file\n"); fatal("zip_load(): Error seeking to the beginning of the file\n");
strncpy(dev->drv->image_path, fn, sizeof(dev->drv->image_path) - 1); strncpy(dev->drv->image_path, fn, sizeof(dev->drv->image_path) - 1);
// After using strncpy, dev->drv->image_path needs to be explicitly null terminated to make gcc happy.
// In the event strlen(dev->drv->image_path) == sizeof(dev->drv->image_path) (no null terminator)
// it is placed at the very end. Otherwise, it is placed right after the string.
const size_t term = strlen(dev->drv->image_path) == sizeof(dev->drv->image_path) ? sizeof(dev->drv->image_path) - 1 : strlen(dev->drv->image_path);
dev->drv->image_path[term] = '\0';
return 1; return 1;
} }