fix error handling

memononen · May 17, 2018 · 1a3fe41 · 1a3fe41
1 parent 6fa3b3d
commit 1a3fe41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/nanovg.c b/src/nanovg.c
@@ -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;

diff --git a/src/nanovg_gl.h b/src/nanovg_gl.h
@@ -1589,8 +1589,6 @@ NVGcontext* nvgCreateGLES3(int flags)
  return ctx;
 
 error:
- // 'gl' is freed by nvgDeleteInternal.
- if (ctx != NULL) nvgDeleteInternal(ctx);
  return NULL;
 }