-
-
Notifications
You must be signed in to change notification settings - Fork 265
Fix ignored snprintf return value in StatusArg.cpp #8967
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.
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
annafilimonova1
wants to merge
3
commits into
FirebirdSQL:master
Choose a base branch
from
annafilimonova1:fix_snprintf_retval
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+9
−3
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -407,19 +407,25 @@ Num::Num(ISC_STATUS s) noexcept : | |
| Int64::Int64(SINT64 val) noexcept : | ||
| Str(text) | ||
| { | ||
| snprintf(text, sizeof(text), "%" SQUADFORMAT, val); | ||
| [[maybe_unused]] auto result = snprintf(text, sizeof(text), "%" SQUADFORMAT, val); | ||
| fb_assert(result >= 0); | ||
| } | ||
|
|
||
| Int64::Int64(FB_UINT64 val) noexcept : | ||
| Str(text) | ||
| { | ||
| snprintf(text, sizeof(text), "%" UQUADFORMAT, val); | ||
| [[maybe_unused]] auto result = snprintf(text, sizeof(text), "%" UQUADFORMAT, val); | ||
| fb_assert(result >= 0); | ||
| } | ||
|
|
||
| Quad::Quad(const ISC_QUAD* quad) noexcept : | ||
| Str(text) | ||
| { | ||
| snprintf(text, sizeof(text), "%x:%x", quad->gds_quad_high, quad->gds_quad_low); | ||
| [[maybe_unused]] auto result = snprintf(text, sizeof(text), "%x:%x", | ||
| static_cast<unsigned int>(quad->gds_quad_high), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Format is hexadecimal. What's wrong with signed integer? |
||
| quad->gds_quad_low | ||
| ); | ||
| fb_assert(result >= 0); | ||
| } | ||
|
|
||
| Interpreted::Interpreted(const char* text) noexcept : | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding asserts is good idea - but they should be complete. Look here:
From man:
The functions snprintf() and vsnprintf() do not write more than size bytes (including the terminating null byte ('\0')). If the output was truncated due to this limit, then the return value is the number of characters (excluding the terminating null byte) which would have been written to the final string if enough space had been available. Thus, a return value of size or more means that the output was truncated.
I.e. sizeof(text) should also be taken into an account.