This repository has been archived by the owner on Sep 11, 2020. It is now read-only.
packfile: Avoid panics patching corrupted deltas. #492
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
mcuadros
suggested changes
Jul 19, 2017
| @@ -40,15 +45,18 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) error { | |||
| return nil | |||
| } | |||
|
|
|||
| var ErrDeltaLen = errors.New("wrong delta length") | |||
There was a problem hiding this comment.
can you group the errors?
| @@ -40,15 +45,18 @@ func ApplyDelta(target, base plumbing.EncodedObject, delta []byte) error { | |||
| return nil | |||
| } | |||
|
|
|||
| var ErrDeltaLen = errors.New("wrong delta length") | |||
| var ErrDeltaCmd = errors.New("wrong delta command") | |||
|
|
|||
| // PatchDelta returns the result of applying the modification deltas in delta to src. | |||
There was a problem hiding this comment.
Can you explain why an error can be returned?
smola
reviewed
Jul 19, 2017
| @@ -59,6 +67,12 @@ func PatchDelta(src, delta []byte) []byte { | |||
| for { | |||
| cmd = delta[0] | |||
| delta = delta[1:] | |||
|
|
|||
| if len(delta) < 2 { | |||
| // wrong delta | |||
There was a problem hiding this comment.
No need for the comment? It's returning an error explaining that the delta is not valid, so there is no need to comment that.
| @@ -76,17 +90,23 @@ func PatchDelta(src, delta []byte) []byte { | |||
| } | |||
| dest = append(dest, delta[0:sz]...) | |||
| remainingTargetSz -= sz | |||
|
|
|||
| if len(delta) < int(sz) { | |||
| // wrong delta | |||
ajnavarro
force-pushed
the
fix/panic-in-invalid-delta
branch
from
52ed67e
to
4f713d1
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
No description provided.