Skip to content

Cleanup CodeQL warnings about wrong type format arguments (CWE-686). #274

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Cleanup CodeQL warnings about wrong type format arguments (CWE-686). #274

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2873,7 +2873,7 @@ bool string_to_hex_array(const string& str, uint8_t *array, size_t size, const s
if (!str.empty() && str.find("0x") == 0) {
// Hex string instead of file
if (str.size() != size*2 + 2) {
fail(ERROR_ARGS, "%s hex string must be %d characters long (the supplied string is %d characters)", error_msg.c_str(), size*2, str.size() - 2);
fail(ERROR_ARGS, "%s hex string must be %lu characters long (the supplied string is %lu characters)", error_msg.c_str(), size*2, str.size() - 2);
}
for (size_t i=0; i < size; i++) {
auto value = "0x" + str.substr(2 + i*2, 2);
Expand Down Expand Up @@ -5264,7 +5264,7 @@ bool encrypt_command::execute(device_map &devices) {
aes_file->seekg(0, std::ios::beg);
aes_file->read((char*)aes_key_share.bytes, sizeof(aes_key_share.bytes));
} else {
fail(ERROR_INCOMPATIBLE, "The AES key file must be a 128 byte key share, or a 32 byte key (the supplied file is %d bytes)", aes_key_file_size);
fail(ERROR_INCOMPATIBLE, "The AES key file must be a 128 byte key share, or a 32 byte key (the supplied file is %d bytes)", (int)aes_key_file_size);
}
}

Expand Down Expand Up @@ -5362,7 +5362,7 @@ bool encrypt_command::execute(device_map &devices) {
iv_salt_file->exceptions(std::iostream::failbit | std::iostream::badbit);
iv_salt_file->seekg(0, std::ios::end);
if (iv_salt_file->tellg() != 16) {
fail(ERROR_INCOMPATIBLE, "The IV OTP salt must be a 16 byte file (the supplied file is %d bytes)", iv_salt_file->tellg());
fail(ERROR_INCOMPATIBLE, "The IV OTP salt must be a 16 byte file (the supplied file is %d bytes)", (int)iv_salt_file->tellg());
}
iv_salt_file->seekg(0, std::ios::beg);
iv_salt_file->read((char*)iv_salt.data(), iv_salt.size());
Expand Down Expand Up @@ -6562,7 +6562,7 @@ bool partition_create_command::execute(device_map &devices) {
new_p.name = p["name"];
new_p.flags |= PICOBIN_PARTITION_FLAGS_HAS_NAME_BITS;
if (new_p.name.size() > 127) {
fail(ERROR_INCOMPATIBLE, "Partition name \"%s\" is %d characters long - max length is 127 characters\n", new_p.name.c_str(), new_p.name.size());
fail(ERROR_INCOMPATIBLE, "Partition name \"%s\" is %lu characters long - max length is 127 characters\n", new_p.name.c_str(), new_p.name.size());
}
}
if (p.contains("id")) {
Expand Down
Loading