ext/vulnsrc/oracle: fix ELSA version comparison #366
Merged
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
Quentin-M
reviewed
Apr 19, 2017
ext/vulnsrc/oracle/oracle.go
Outdated
| @@ -115,7 +150,7 @@ func (u *updater) Update(datastore database.Datastore) (resp vulnsrc.UpdateRespo | |||
| r := elsaRegexp.FindStringSubmatch(line) | |||
| if len(r) == 2 { | |||
| elsaNo, _ := strconv.Atoi(r[1]) | |||
| if elsaNo > firstELSA { | |||
| if compareELSA(elsaNo, firstELSA) == 1 { | |||
There was a problem hiding this comment.
Usually you'd test for > 0 because this kind of comparison functions typically only offers the sign and 0 guarantees (C / Java) and return a distance/difference between the two (at least for the first part that is different).
i.e. return len(lstr) - len(rstr)
Quentin-M
reviewed
Apr 19, 2017
ext/vulnsrc/oracle/oracle.go
Outdated
| } else if len(lstr) > len(rstr) { | ||
| return 1 | ||
| } | ||
| return -1 |
There was a problem hiding this comment.
the whole block can be replaced by return len(lstr) - len(rstr) - typically what's used.
Quentin-M
reviewed
Apr 19, 2017
| return 1 | ||
| } else if ldigit < rdigit { | ||
| return -1 | ||
| } |
There was a problem hiding this comment.
can test for eq and return the diff too.
There was a problem hiding this comment.
nope, the equal case here should be continue which it already falls back to.
Go linters always want you to drop the last case like this /shrug
There was a problem hiding this comment.
i meant, you can do:
if ldigit != rdigit {
return ldigit - rdigit
}
Quentin-M
approved these changes
Apr 19, 2017
Previously we naively compared integers. However, not all versions have the same length.
KeyboardNerd
pushed a commit
to KeyboardNerd/clair
that referenced
this pull request
Feb 2, 2018
ext/vulnsrc/oracle: fix ELSA version comparison
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.
Previously we naively compared integers. However, not all versions have
the same length.