new fallbacks for gradientLink == NULL

memononen · Jul 20, 2018 · a573824 · a573824
1 parent 8e75cda
commit a573824
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/nanosvg.h b/src/nanosvg.h
@@ -837,6 +837,7 @@ static NSVGgradient* nsvg__createGradient(NSVGparser* p, NSVGshape* shape, NSVGg
 	float ox, oy, sw, sh, sl;
 	int nstops = 0;
 
+	if (link == NULL) return NULL;
 	data = nsvg__findGradientData(p, link->id);
 	if (data == NULL) return NULL;
 
@@ -1002,7 +1003,10 @@ static void nsvg__addShape(NSVGparser* p)
 	} else if (attr->hasFill == 2) {
 		shape->fill.type = NSVG_PAINT_GRADIENT_LINK;
 		shape->fill.gradientLink = nsvg__createGradientLink(attr->fillGradient, attr->xform);
-		if (shape->fill.gradientLink == NULL) goto error;
+		if (shape->fill.gradientLink == NULL) {
+			shape->fill.type = NSVG_PAINT_NONE;
+			goto error;
+		}
 	}
 
 	// Set stroke
@@ -1015,7 +1019,10 @@ static void nsvg__addShape(NSVGparser* p)
 	} else if (attr->hasStroke == 2) {
 		shape->stroke.type = NSVG_PAINT_GRADIENT_LINK;
 		shape->stroke.gradientLink = nsvg__createGradientLink(attr->strokeGradient, attr->xform);
-		if (shape->stroke.gradientLink == NULL) goto error;
+		if (shape->stroke.gradientLink == NULL) {
+			shape->stroke.type = NSVG_PAINT_NONE;
+			goto error;
+		}
 	}
 
 	// Set flags
@@ -2744,7 +2751,9 @@ static void nsvg__assignGradients(NSVGparser* p)
 			NSVGgradientLink* link = shape->fill.gradientLink;
 			shape->fill.gradient = nsvg__createGradient(
 				p, shape, link, &shape->fill.type);
-			free(link);
+			if (link != NULL) {
+				free(link);
+			}
 			if (shape->fill.gradient == NULL) {
 				shape->fill.type = NSVG_PAINT_NONE;
 			}
@@ -2753,7 +2762,9 @@ static void nsvg__assignGradients(NSVGparser* p)
 			NSVGgradientLink* link = shape->stroke.gradientLink;
 			shape->stroke.gradient = nsvg__createGradient(
 				p, shape, link, &shape->stroke.type);
-			free(link);
+			if (link != NULL) {
+				free(link);
+			}
 			if (shape->stroke.gradient == NULL) {
 				shape->stroke.type = NSVG_PAINT_NONE;
 			}