Updated NanoSVG with the latest available patches.

external/nanosvg/nanosvg.h

@@ -203,7 +203,7 @@ void nsvgDelete(NSVGimage* image);
 #define NSVG_RGB(r, g, b) (((unsigned int)r) | ((unsigned int)g << 8) | ((unsigned int)b << 16))
 
 #ifdef _MSC_VER
-#pragma warning (disable: 4996) // Switch off security warnings
+	#pragma warning (disable: 4996) // Switch off security warnings
 	#pragma warning (disable: 4100) // Switch off unreferenced formal parameter warnings
 	#ifdef __cplusplus
 	#define NSVG_INLINE inline
@@ -211,7 +211,7 @@ void nsvgDelete(NSVGimage* image);
 	#define NSVG_INLINE
 	#endif
 #else
-#define NSVG_INLINE inline
+	#define NSVG_INLINE inline
 #endif
 
 
@@ -225,11 +225,6 @@ static int nsvg__isdigit(char c)
 	return c >= '0' && c <= '9';
 }
 
-static int nsvg__isnum(char c)
-{
-	return strchr("0123456789+-.eE", c) != 0;
-}
-
 static NSVG_INLINE float nsvg__minf(float a, float b) { return a < b ? a : b; }
 static NSVG_INLINE float nsvg__maxf(float a, float b) { return a > b ? a : b; }
 
@@ -646,7 +641,7 @@ static NSVGparser* nsvg__createParser()
 
 	return p;
 
-	error:
+error:
 	if (p) {
 		if (p->image) free(p->image);
 		free(p);
@@ -736,9 +731,11 @@ static void nsvg__lineTo(NSVGparser* p, float x, float y)
 
 static void nsvg__cubicBezTo(NSVGparser* p, float cpx1, float cpy1, float cpx2, float cpy2, float x, float y)
 {
-	nsvg__addPoint(p, cpx1, cpy1);
+	if (p->npts > 0) {
-	nsvg__addPoint(p, cpx2, cpy2);
+		nsvg__addPoint(p, cpx1, cpy1);
-	nsvg__addPoint(p, x, y);
+		nsvg__addPoint(p, cpx2, cpy2);
+		nsvg__addPoint(p, x, y);
+	}
 }
 
 static NSVGattrib* nsvg__getAttr(NSVGparser* p)
@@ -808,7 +805,9 @@ static float nsvg__convertToPixels(NSVGparser* p, NSVGcoordinate c, float orig,
 static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)
 {
 	NSVGgradientData* grad = p->gradients;
-	while (grad) {
+	if (id == NULL || *id == '\0')
+		return NULL;
+	while (grad != NULL) {
 		if (strcmp(grad->id, id) == 0)
 			return grad;
 		grad = grad->next;
@@ -825,19 +824,26 @@ static NSVGgradient* nsvg__createGradient(NSVGparser* p, const char* id, const f
 	NSVGgradient* grad;
 	float ox, oy, sw, sh, sl;
 	int nstops = 0;
+	int refIter;
 
 	data = nsvg__findGradientData(p, id);
 	if (data == NULL) return NULL;
 
 	// TODO: use ref to fill in all unset values too.
 	ref = data;
+	refIter = 0;
 	while (ref != NULL) {
+		NSVGgradientData* nextRef = NULL;
 		if (stops == NULL && ref->stops != NULL) {
 			stops = ref->stops;
 			nstops = ref->nstops;
 			break;
 		}
-		ref = nsvg__findGradientData(p, ref->ref);
+		nextRef = nsvg__findGradientData(p, ref->ref);
+		if (nextRef == ref) break; // prevent infite loops on malformed data
+		ref = nextRef;
+		refIter++;
+		if (refIter > 32) break; // prevent infite loops on malformed data
 	}
 	if (stops == NULL) return NULL;
 
@@ -1022,7 +1028,7 @@ static void nsvg__addShape(NSVGparser* p)
 
 	return;
 
-	error:
+error:
 	if (shape) free(shape);
 }
 
@@ -1040,6 +1046,10 @@ static void nsvg__addPath(NSVGparser* p, char closed)
 	if (closed)
 		nsvg__lineTo(p, p->pts[0], p->pts[1]);
 
+	// Expect 1 + N*3 points (N = number of cubic bezier segments).
+	if ((p->npts % 3) != 1)
+		return;
+
 	path = (NSVGpath*)malloc(sizeof(NSVGpath));
 	if (path == NULL) goto error;
 	memset(path, 0, sizeof(NSVGpath));
@@ -1075,7 +1085,7 @@ static void nsvg__addPath(NSVGparser* p, char closed)
 
 	return;
 
-	error:
+error:
 	if (path != NULL) {
 		if (path->pts != NULL) free(path->pts);
 		free(path);
@@ -1243,19 +1253,19 @@ typedef struct NSVGNamedColor {
 
 NSVGNamedColor nsvg__colors[] = {
 
-		{ "red", NSVG_RGB(255, 0, 0) },
+	{ "red", NSVG_RGB(255, 0, 0) },
-		{ "green", NSVG_RGB( 0, 128, 0) },
+	{ "green", NSVG_RGB( 0, 128, 0) },
-		{ "blue", NSVG_RGB( 0, 0, 255) },
+	{ "blue", NSVG_RGB( 0, 0, 255) },
-		{ "yellow", NSVG_RGB(255, 255, 0) },
+	{ "yellow", NSVG_RGB(255, 255, 0) },
-		{ "cyan", NSVG_RGB( 0, 255, 255) },
+	{ "cyan", NSVG_RGB( 0, 255, 255) },
-		{ "magenta", NSVG_RGB(255, 0, 255) },
+	{ "magenta", NSVG_RGB(255, 0, 255) },
-		{ "black", NSVG_RGB( 0, 0, 0) },
+	{ "black", NSVG_RGB( 0, 0, 0) },
-		{ "grey", NSVG_RGB(128, 128, 128) },
+	{ "grey", NSVG_RGB(128, 128, 128) },
-		{ "gray", NSVG_RGB(128, 128, 128) },
+	{ "gray", NSVG_RGB(128, 128, 128) },
-		{ "white", NSVG_RGB(255, 255, 255) },
+	{ "white", NSVG_RGB(255, 255, 255) },
 
 #ifdef NANOSVG_ALL_COLOR_KEYWORDS
-{ "aliceblue", NSVG_RGB(240, 248, 255) },
+	{ "aliceblue", NSVG_RGB(240, 248, 255) },
 	{ "antiquewhite", NSVG_RGB(250, 235, 215) },
 	{ "aqua", NSVG_RGB( 0, 255, 255) },
 	{ "aquamarine", NSVG_RGB(127, 255, 212) },
@@ -1458,6 +1468,15 @@ static int nsvg__parseUnits(const char* units)
 	return NSVG_UNITS_USER;
 }
 
+static int nsvg__isCoordinate(const char* s)
+{
+	// optional sign
+	if (*s == '-' || *s == '+')
+		s++;
+	// must have at least one digit, or start by a dot
+	return (nsvg__isdigit(*s) || *s == '.');
+}
+
 static NSVGcoordinate nsvg__parseCoordinateRaw(const char* str)
 {
 	NSVGcoordinate coord = {0, NSVG_UNITS_USER};
@@ -1597,25 +1616,32 @@ static int nsvg__parseRotate(float* xform, const char* str)
 static void nsvg__parseTransform(float* xform, const char* str)
 {
 	float t[6];
+	int len;
 	nsvg__xformIdentity(xform);
 	while (*str)
 	{
 		if (strncmp(str, "matrix", 6) == 0)
-			str += nsvg__parseMatrix(t, str);
+			len = nsvg__parseMatrix(t, str);
 		else if (strncmp(str, "translate", 9) == 0)
-			str += nsvg__parseTranslate(t, str);
+			len = nsvg__parseTranslate(t, str);
 		else if (strncmp(str, "scale", 5) == 0)
-			str += nsvg__parseScale(t, str);
+			len = nsvg__parseScale(t, str);
 		else if (strncmp(str, "rotate", 6) == 0)
-			str += nsvg__parseRotate(t, str);
+			len = nsvg__parseRotate(t, str);
 		else if (strncmp(str, "skewX", 5) == 0)
-			str += nsvg__parseSkewX(t, str);
+			len = nsvg__parseSkewX(t, str);
 		else if (strncmp(str, "skewY", 5) == 0)
-			str += nsvg__parseSkewY(t, str);
+			len = nsvg__parseSkewY(t, str);
 		else{
 			++str;
 			continue;
 		}
+		if (len != 0) {
+			str += len;
+		} else {
+			++str;
+			continue;
+		}
 
 		nsvg__xformPremultiply(xform, t);
 	}
@@ -1876,8 +1902,11 @@ static int nsvg__getArgsPerElement(char cmd)
 		case 'a':
 		case 'A':
 			return 7;
+		case 'z':
+		case 'Z':
+			return 0;
 	}
-	return 0;
+	return -1;
 }
 
 static void nsvg__pathMoveTo(NSVGparser* p, float* cpx, float* cpy, float* args, int rel)
@@ -2187,6 +2216,7 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 	float args[10];
 	int nargs;
 	int rargs = 0;
+	char initPoint;
 	float cpx, cpy, cpx2, cpy2;
 	const char* tmp[4];
 	char closedFlag;
@@ -2209,13 +2239,14 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 		nsvg__resetPath(p);
 		cpx = 0; cpy = 0;
 		cpx2 = 0; cpy2 = 0;
+		initPoint = 0;
 		closedFlag = 0;
 		nargs = 0;
 
 		while (*s) {
 			s = nsvg__getNextPathItem(s, item);
 			if (!*item) break;
-			if (nsvg__isnum(item[0])) {
+			if (cmd != '\0' && nsvg__isCoordinate(item)) {
 				if (nargs < 10)
 					args[nargs++] = (float)nsvg__atof(item);
 				if (nargs >= rargs) {
@@ -2228,6 +2259,7 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 							cmd = (cmd == 'm') ? 'l' : 'L';
 							rargs = nsvg__getArgsPerElement(cmd);
 							cpx2 = cpx; cpy2 = cpy;
+							initPoint = 1;
 							break;
 						case 'l':
 						case 'L':
@@ -2277,7 +2309,6 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 				}
 			} else {
 				cmd = item[0];
-				rargs = nsvg__getArgsPerElement(cmd);
 				if (cmd == 'M' || cmd == 'm') {
 					// Commit path.
 					if (p->npts > 0)
@@ -2286,7 +2317,11 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 					nsvg__resetPath(p);
 					closedFlag = 0;
 					nargs = 0;
-				} else if (cmd == 'Z' || cmd == 'z') {
+				} else if (initPoint == 0) {
+					// Do not allow other commands until initial point has been set (moveTo called once).
+					cmd = '\0';
+				}
+				if (cmd == 'Z' || cmd == 'z') {
 					closedFlag = 1;
 					// Commit path.
 					if (p->npts > 0) {
@@ -2302,6 +2337,12 @@ static void nsvg__parsePath(NSVGparser* p, const char** attr)
 					closedFlag = 0;
 					nargs = 0;
 				}
+				rargs = nsvg__getArgsPerElement(cmd);
+				if (rargs == -1) {
+					// Command not recognized
+					cmd = '\0';
+					rargs = 0;
+				}
 			}
 		}
 		// Commit path.
@@ -2919,7 +2960,7 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 
 	return image;
 
-	error:
+error:
 	if (fp) fclose(fp);
 	if (data) free(data);
 	if (image) nsvgDelete(image);
@@ -2928,32 +2969,32 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 
 NSVGpath* nsvgDuplicatePath(NSVGpath* p)
 {
-	NSVGpath* res = NULL;
+    NSVGpath* res = NULL;
 
-	if (p == NULL)
+    if (p == NULL)
-		return NULL;
+        return NULL;
 
-	res = (NSVGpath*)malloc(sizeof(NSVGpath));
+    res = (NSVGpath*)malloc(sizeof(NSVGpath));
-	if (res == NULL) goto error;
+    if (res == NULL) goto error;
-	memset(res, 0, sizeof(NSVGpath));
+    memset(res, 0, sizeof(NSVGpath));
 
-	res->pts = (float*)malloc(p->npts*2*sizeof(float));
+    res->pts = (float*)malloc(p->npts*2*sizeof(float));
-	if (res->pts == NULL) goto error;
+    if (res->pts == NULL) goto error;
-	memcpy(res->pts, p->pts, p->npts * sizeof(float) * 2);
+    memcpy(res->pts, p->pts, p->npts * sizeof(float) * 2);
-	res->npts = p->npts;
+    res->npts = p->npts;
 
-	memcpy(res->bounds, p->bounds, sizeof(p->bounds));
+    memcpy(res->bounds, p->bounds, sizeof(p->bounds));
 
-	res->closed = p->closed;
+    res->closed = p->closed;
 
-	return res;
+    return res;
 
-	error:
+error:
-	if (res != NULL) {
+    if (res != NULL) {
-		free(res->pts);
+        free(res->pts);
-		free(res);
+        free(res);
-	}
+    }
-	return NULL;
+    return NULL;
 }
 
 void nsvgDelete(NSVGimage* image)

external/nanosvg/nanosvgrast.h

@@ -159,7 +159,7 @@ NSVGrasterizer* nsvgCreateRasterizer()
 
 	return r;
 
-	error:
+error:
 	nsvgDeleteRasterizer(r);
 	return NULL;
 }
@@ -776,7 +776,7 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
 			nsvg__duplicatePoints(r);
 
 			r->npoints = 0;
-			cur = r->points2[0];
+ 			cur = r->points2[0];
 			nsvg__appendPathPoint(r, cur);
 
 			// Figure out dash offset.
@@ -854,7 +854,7 @@ static int nsvg__cmpEdge(const void *p, const void *q)
 
 static NSVGactiveEdge* nsvg__addActive(NSVGrasterizer* r, NSVGedge* e, float startPoint)
 {
-	NSVGactiveEdge* z;
+	 NSVGactiveEdge* z;
 
 	if (r->freelist != NULL) {
 		// Restore from freelist.
@@ -981,7 +981,7 @@ static unsigned int nsvg__applyOpacity(unsigned int c, float u)
 
 static inline int nsvg__div255(int x)
 {
-	return ((x+1) * 257) >> 16;
+    return ((x+1) * 257) >> 16;
 }
 
 static void nsvg__scanlineSolid(unsigned char* dst, int count, unsigned char* cover, int x, int y,