Skip to content

Fix gcc warnings in appendLibId. #626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkCallow merged 3 commits into from
Sep 4, 2022
Merged

Fix gcc warnings in appendLibId. #626

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e71ce6d
Fix gcc warnings in appendLibId.
MarkCallow Sep 3, 2022
baa3978
Fix gcc string truncation warning.
MarkCallow Sep 4, 2022
085333f
Revert inadvertent damage.
MarkCallow Sep 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions lib/writer2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ appendLibId(ktxHashList* head, ktxHashListEntry* writerEntry)
const char* libVer;
const char libIdIntro[] = " / libktx ";
size_t idLen, libIdLen;

if (writerEntry) {
ktx_uint32_t len;
result = ktxHashListEntry_GetValue(writerEntry, &len, (void**)&id);
Expand All @@ -123,25 +124,22 @@ appendLibId(ktxHashList* head, ktxHashListEntry* writerEntry)
id = "Unidentified app";
idLen = 17;
}

// strnstr needed because KTXwriter values may not be NUL terminated.
if (strnstr(id, "__default__", idLen) != NULL) {
libVer = STR(LIBKTX_DEFAULT_VERSION);
} else {
libVer = STR(LIBKTX_VERSION);
}
// sizeof(libIdIntro) includes space for the terminating NUL which we will
// sizeof(libIdIntro) includes space for its terminating NUL which we will
// overwrite so no need for +1 after strlen.
libIdLen = sizeof(libIdIntro) + (ktx_uint32_t)strlen(libVer);
char* libId = malloc(libIdLen);
if (!libId)
return KTX_OUT_OF_MEMORY;
// &libIdIntro[0] instead of libIdIntro is to workaround a gcc warning
// that I'm passing the same thing to sizeof as to the src
// parameter (i.e. I'm requesting the sizeof a pointer).
// Actually libIdIntro is an array of char not a pointer. Looks
// like a gcc bug.
strncpy(libId, &libIdIntro[0], sizeof(libIdIntro));
strncpy(&libId[sizeof(libIdIntro)-1], libVer, strlen(libVer) + 1);
strncpy(libId, libIdIntro, libIdLen);
strncpy(&libId[sizeof(libIdIntro)-1], libVer,
libIdLen-(sizeof(libIdIntro)-1));

if (strnstr(id, libId, idLen) != NULL) {
// This lib id is already in the writer value.
Expand Down