fix error handling #481
Open
fix error handling #481
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
memononen
requested changes
May 17, 2018
| @@ -288,7 +288,11 @@ NVGcontext* nvgCreateInternal(NVGparams* params) | |||
| FONSparams fontParams; | |||
| NVGcontext* ctx = (NVGcontext*)malloc(sizeof(NVGcontext)); | |||
| int i; | |||
| if (ctx == NULL) goto error; | |||
| if (ctx == NULL) { | |||
There was a problem hiding this comment.
This should be (ctx->params is not set yet either):
if (ctx == NULL) {
// Call renderer delete explicitly. Context is not initialized yet, so we cannot call nvgDeleteInternal() which usually calls the function.
if (params->renderDelete != NULL)
params->renderDelete(params->userPtr);
return NULL;
}
src/nanovg_gl.h
Outdated
| @@ -1590,7 +1590,6 @@ NVGcontext* nvgCreateGLES3(int flags) | |||
|
|
|||
| error: | |||
| // 'gl' is freed by nvgDeleteInternal. | |||
|
Updated) |
|
Is changes good? Anything needed from my side? |
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.
ctx can't be != NULL on error path, nvgDeleteInternal can return immediately (if (ctx == NULL) return;) without userPtr cleanup => "gl" can leak.