[fix] Add check on failed allocation in legacy/zstd_v06 #4050
Conversation
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
|
I'm trying to follow the same coding style used in: |
4f71e74 to
30546c1
Compare
Cyan4973
requested changes
May 17, 2024
lib/legacy/zstd_v06.c
Outdated
| @@ -3919,6 +3919,7 @@ ZBUFFv06_DCtx* ZBUFFv06_createDCtx(void) | |||
| if (zbd==NULL) return NULL; | |||
| memset(zbd, 0, sizeof(*zbd)); | |||
| zbd->zd = ZSTDv06_createDCtx(); | |||
| if (zbd->zd==NULL) return NULL; | |||
There was a problem hiding this comment.
Returning immediately here would result in a memory leak, because zbd has been allocated at that point.
Free zbd, using ZBUFFv06_freeDCtx(), before returning.
8000
There was a problem hiding this comment.
Oh, indeed. Thanks a lot for the review, I will fix that.
30546c1 to
0e37337
Compare
Adenilson
commented
May 17, 2024
lib/legacy/zstd_v06.c
Outdated
| @@ -3919,6 +3919,7 @@ ZBUFFv06_DCtx* ZBUFFv06_createDCtx(void) | |||
| if (zbd==NULL) return NULL; | |||
| memset(zbd, 0, sizeof(*zbd)); | |||
| zbd->zd = ZSTDv06_createDCtx(); | |||
| if (zbd->zd == NULL) return NULL; | |||
There was a problem hiding this comment.
Remove empty spaces around ==.
lib/legacy/zstd_v06.c
Outdated
| @@ -3919,6 +3919,7 @@ ZBUFFv06_DCtx* ZBUFFv06_createDCtx(void) | |||
| if (zbd==NULL) return NULL; | |||
| memset(zbd, 0, sizeof(*zbd)); | |||
| zbd->zd = ZSTDv06_createDCtx(); | |||
| if (zbd->zd==NULL) return NULL; | |||
There was a problem hiding this comment.
Oh, indeed. Thanks a lot for the review, I will fix that.
lib/legacy/zstd_v06.c
Outdated
| @@ -3919,6 +3919,7 @@ ZBUFFv06_DCtx* ZBUFFv06_createDCtx(void) | |||
| if (zbd==NULL) return NULL; | |||
| memset(zbd, 0, sizeof(*zbd)); | |||
| zbd->zd = ZSTDv06_createDCtx(); | |||
| < 8000 /td> | if (zbd->zd==NULL) return NULL; | ||
As reported by Ben Hawkes in facebook#4026, a failure to allocate a zstd context would lead to a dereference of a NULL pointer due to a missing check on the returned result of ZSTDv06_createDCtx(). This patch fix the issue by adding a check for valid returned pointer.
0e37337 to
1872688
Compare
Cyan4973
approved these changes
May 18, 2024
|
@Cyan4973 anything else you like to see changed in the patch? |
|
Nope, it's good! |
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.
As reported by Ben Hawkes in #4026, a failure to allocate a zstd context would lead to a dereference of a NULL pointer due to a missing check on the returned result of ZSTDv06_createDCtx().
This patch fix the issue by adding a check for valid returned pointer.