Skip to content

examples : sprintf -> snprintf #8434

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

Jump to bottom
Merged
merged 2 commits into from
Jul 12, 2024
Merged

examples : sprintf -> snprintf #8434

merged 2 commits into from
Jul 12, 2024

Conversation

ggerganov
Copy link
Member

Fix compile warnings

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -347,7 +347,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {
char hex_result[17];
for (int offset = 0; offset < 8; offset++) {
unsigned int shift_bits_by = (8 * (8 - offset - 1));
sprintf( ( hex_result + (2*offset)), "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
snprintf( ( hex_result + (2*offset)), 17, "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), 17, "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -384,7 +384,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {

char hex_result[41] = {0};
for (int offset = 0; offset < 20; offset++) {
sprintf( ( hex_result + (2*offset)), "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), 41, "%02x", result[offset]&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), 41, "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", result[offset]&0xff);

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -421,7 +421,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {

char hex_result[SHA256_DIGEST_SIZE * 2 + 1] = {0};
for (int offset = 0; offset < SHA256_DIGEST_SIZE; offset++) {
sprintf( ( hex_result + (2*offset)), "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), SHA256_DIGEST_SIZE * 2 + 1, "%02x", result[offset]&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), SHA256_DIGEST_SIZE * 2 + 1, "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", result[offset]&0xff);

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -460,7 +460,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {
char hex_result[17];
for (int offset = 0; offset < 8; offset++) {
unsigned int shift_bits_by = (8 * (8 - offset - 1));
sprintf( ( hex_result + (2*offset)), "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
snprintf( ( hex_result + (2*offset)), 17, "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), 17, "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", (unsigned char) (hash >> shift_bits_by)&0xff);

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -490,7 +490,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {

char hex_result[41];
for (int offset = 0; offset < 20; offset++) {
sprintf( ( hex_result + (2*offset)), "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), 41, "%02x", result[offset]&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), 41, "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", result[offset]&0xff);

slaren
slaren reviewed Jul 11, 2024
View reviewed changes
examples/gguf-hash/gguf-hash.cpp Outdated
@@ -520,7 +520,7 @@ static hash_exit_code_t gguf_hash(const hash_params & hash_params) {

char hex_result[SHA256_DIGEST_SIZE * 2 + 1] = {0};
for (int offset = 0; offset < SHA256_DIGEST_SIZE; offset++) {
sprintf( ( hex_result + (2*offset)), "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), SHA256_DIGEST_SIZE * 2 + 1, "%02x", result[offset]&0xff);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
snprintf( ( hex_result + (2*offset)), SHA256_DIGEST_SIZE * 2 + 1, "%02x", result[offset]&0xff);
snprintf( ( hex_result + (2*offset)), sizeof(hex_result) - (2*offset), "%02x", result[offset]&0xff);

@ggerganov ggerganov merged commit 71c1121 into master Jul 12, 2024
54 checks passed
@ggerganov ggerganov deleted the gg/fix-sprintf branch July 12, 2024 07:46
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jul 13, 2024
@ggerganov
examples : sprintf -> snprintf (ggml-org#8434)
ff4da2c 
* examples : sprintf -> snprintf

ggml-ci

* examples : use sizeof() instead of hardcoded constants
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jul 13, 2024
@ggerganov
examples : sprintf -> snprintf (ggml-org#8434)
f012d12 
* examples : sprintf -> snprintf

ggml-ci

* examples : use sizeof() instead of hardcoded constants
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jul 13, 2024
@ggerganov
examples : sprintf -> snprintf (ggml-org#8434)
e0916db 
* examples : sprintf -> snprintf

ggml-ci

* examples : use sizeof() instead of hardcoded constants
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slaren slaren slaren left review comments

Assignees
No one assigned
Labels
examples
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ggerganov @slaren