Corrected the routine that parses MASKHINTS_* in cell properties to

avoid an infinite loop in the case that the mask hint does not have
a number of values that is a multiple of 4.

Author: RTimothyEdwards

VERSION

@@ -1 +1 @@
-8.3.475
+8.3.476

cif/CIFhier.c

@@ -285,16 +285,17 @@ cifFlatMaskHints(name, value, mhd)
     Rect r, newr;
     char *vptr, *newval, *lastval, *propvalue;
     bool propfound;
-    int lastlen;
+    int lastlen, numvals;
 
     if (!strncmp(name, "MASKHINTS_", 10))
     {
 	newval = (char *)NULL;
 	vptr = value;
 	while (*vptr != '\0')
 	{
-	    if (sscanf(vptr, "%d %d %d %d", &r.r_xbot, &r.r_ybot,
-			&r.r_xtop, &r.r_ytop) == 4)
+	    numvals = sscanf(vptr, "%d %d %d %d", &r.r_xbot, &r.r_ybot,
+			&r.r_xtop, &r.r_ytop);
+	    if (numvals == 4)
 	    {
 		/* Transform rectangle to top level coordinates */
 		GeoTransRect(mhd->mh_trans, &r, &newr);
@@ -320,6 +321,12 @@ cifFlatMaskHints(name, value, mhd)
 		while (*vptr && !isspace(*vptr)) vptr++;
 		while (*vptr && isspace(*vptr)) vptr++;
 	    }
+	    else
+	    {
+		TxError("MASKHINTS_%s:  Expected 4 values, found only %d\n",
+				name + 10, numvals);
+		break;
+	    }
 	}
 
 	/* Check if name exists already in the flattened cell */