fix error handling

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

Hide file tree

Showing 2 changed files with 6 additions and 2 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
@@ -1590,7 +1590,6 @@ NVGcontext* nvgCreateGLES3(int flags)
 
 error:
 	// 'gl' is freed by nvgDeleteInternal.
-	if (ctx != NULL) nvgDeleteInternal(ctx);
 	return NULL;
 }
-Original file 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 @@