From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 28 Dec 2010 08:55:31 +0000 (-0600)
Subject: Skip <range> elements with begin > end
X-Git-Tag: root-2~33
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=43bf659eedb3eeff75d219864af475dcadcf6983;p=fontconfig.git

Skip <range> elements with begin > end
---

diff --git a/src/fcxml.c b/src/fcxml.c
index 1aa3e4c..ff30b7b 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -1148,10 +1148,13 @@ FcParseBlank (FcConfigParse *parse)
 		goto bail;
 	    break;
 	case FcVStackRange:
-	    for (i = v->u.range.begin; i <= v->u.range.end; i++)
+	    if (v->u.range.begin <= v->u.range.end)
 	    {
-		if (!FcBlanksAdd (parse->config->blanks, i))
-		    goto bail;
+	      for (i = v->u.range.begin; i <= v->u.range.end; i++)
+	      {
+		  if (!FcBlanksAdd (parse->config->blanks, i))
+		      goto bail;
+	      }
 	    }
 	    break;
 	default:
@@ -1428,14 +1431,17 @@ FcParseCharSet (FcConfigParse *parse)
 		n++;
 	    break;
 	case FcVStackRange:
-	    for (i = vstack->u.range.begin; i <= vstack->u.range.end; i++)
+	    if (vstack->u.range.begin <= vstack->u.range.end)
 	    {
-		if (!FcCharSetAddChar (charset, i))
-		{
-		    FcConfigMessage (parse, FcSevereWarning, "invalid character: 0x%04x", i);
-		}
-		else
-		    n++;
+	      for (i = vstack->u.range.begin; i <= vstack->u.range.end; i++)
+	      {
+		  if (!FcCharSetAddChar (charset, i))
+		  {
+		      FcConfigMessage (parse, FcSevereWarning, "invalid character: 0x%04x", i);
+		  }
+		  else
+		      n++;
+	      }
 	    }
 	    break;
 	default: