Skip to content
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

snprintf warning fix #433

Merged
merged 2 commits into from
Sep 11, 2024
Merged

snprintf warning fix #433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b53b8c1
snprintf warning fix
philippedistributive Sep 10, 2024
52181e1
check for snprintf return value for full fix to warning
philippedistributive Sep 10, 2024
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: 9 additions & 5 deletions src/PyBytesProxyHandler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,26 @@ static bool array_valueOf(JSContext *cx, unsigned argc, JS::Value *vp) {
for (size_t i = 0; i < byteLength; i++) {
numberOfDigits += data[i] < 10 ? 1 : data[i] < 100 ? 2 : 3;
}

const size_t STRING_LENGTH = byteLength + numberOfDigits;
JS::Latin1Char *buffer = (JS::Latin1Char *)malloc(sizeof(JS::Latin1Char) * STRING_LENGTH);

size_t charIndex = 0;
snprintf((char *)&buffer[charIndex], 4, "%d", data[0]);
charIndex += data[0] < 10 ? 1 : data[0] < 100 ? 2 : 3;
if (snprintf((char *)&buffer[0], 3 + 1, "%hu", data[0]) < 0) {
philippedistributive marked this conversation as resolved.
Show resolved Hide resolved
return false;
}
size_t charIndex = data[0] < 10 ? 1 : data[0] < 100 ? 2 : 3;

for (size_t dataIndex = 1; dataIndex < byteLength; dataIndex++) {
buffer[charIndex] = ',';
charIndex++;
snprintf((char *)&buffer[charIndex], 4, "%d", data[dataIndex]);
if (snprintf((char *)&buffer[charIndex], 3 + 1, "%hu", data[dataIndex]) < 0) {
return false;
}
charIndex += data[dataIndex] < 10 ? 1 : data[dataIndex] < 100 ? 2 : 3;
}

JS::UniqueLatin1Chars str(buffer);
args.rval().setString(JS_NewLatin1String(cx, std::move(str), STRING_LENGTH - 1)); // don't include null byte
args.rval().setString(JS_NewLatin1String(cx, std::move(str), STRING_LENGTH - 1)); // don't include the null terminating byte
return true;
}

Expand Down
Loading