Fix regression from commit 165330b7bf0757e30fa8a6de9998a564fb62796f #1545
Conversation
This file contains 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
With the changed logic, the if-clause can fall through without ever initializing s. The exit code condition is getting more complicated now so move it to helper variable, assume failure for a safe default. Fixes: 165330b
DemiMarie
reviewed
Feb 18, 2021
| @@ -409,7 +409,8 @@ unsigned headerSizeof(Header h, int magicp) | |||
| static inline int strtaglen(const char *str, rpm_count_t c, const char *end) | |||
| { | |||
| const char *start = str; | |||
| const char *s; | |||
| const char *s = NULL; | |||
| int len = -1; /* assume failure */ | |||
There was a problem hiding this comment.
Suggested change
| int len = -1; /* assume failure */ |
Comment on lines
+429
to
+432
| if (s != NULL && c == 0) | ||
| len = s - str + 1; | ||
|
|
||
| return len; |
There was a problem hiding this comment.
Suggested change
| if (s != NULL && c == 0) | |
| len = s - str + 1; | |
| return len; | |
| return s != NULL && c == 0 ? s - str + 1 : -1; |
|
Note the commit message:
Shortness is only a goal if it helps readability. |
Indeed that is true. Another option would have been to re-introduce the earlier check, but this is more readable, IMO. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
With the changed logic, the if-clause can fall through without ever
initializing s. The exit code condition is getting more complicated
now so move it to helper variable, assume failure for a safe default.
Fixes: 165330b