Skip to content

Commit

Permalink
fix error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
lieff committed May 17, 2018
1 parent 6fa3b3d commit 284d93d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
7 changes: 6 additions & 1 deletion src/nanovg.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,12 @@ NVGcontext* nvgCreateInternal(NVGparams* params)
FONSparams fontParams;
NVGcontext* ctx = (NVGcontext*)malloc(sizeof(NVGcontext));
int i;
if (ctx == NULL) goto error;
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;
}
memset(ctx, 0, sizeof(NVGcontext));

ctx->params = *params;
Expand Down
1 change: 0 additions & 1 deletion src/nanovg_gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,6 @@ NVGcontext* nvgCreateGLES3(int flags)

error:
// 'gl' is freed by nvgDeleteInternal.
if (ctx != NULL) nvgDeleteInternal(ctx);
return NULL;
}

Expand Down

0 comments on commit 284d93d

Please sign in to comment.