@@ -1675,18 +1675,20 @@ http_copy_decode(char       *dst,	// O - Destination buffer
     {
       if (*src == '%' && decode)
       {
-        if (_cups_isxdigit(src[1]) && _cups_isxdigit(src[2]))
-	{
-	  // Grab a hex-encoded character...
-	  *ptr++ = (char)((_cups_xdigit(src[1]) << 4) | _cups_xdigit(src[2]));
-	  src += 2;
-	}
-	else
+        int	x1, x2;			// Hex digit values
+
+        if ((x1 = _cups_xdigit(src[1])) < 0 || (x2 = _cups_xdigit(src[2])) < 0)
 	{
 	  // Bad hex-encoded character...
 	  *ptr = '\0';
 	  return (NULL);
 	}
+	else
+	{
+	  // Grab a hex-encoded character...
+	  *ptr++ = (char)((x1 << 4) | x2);
+	  src += 2;
+	}
       }
       else if ((*src & 255) <= 0x20 || (*src & 255) >= 0x7f)
       {
Original file line number	Diff line number	Diff line change
`@@ -1675,18 +1675,20 @@ http_copy_decode(char *dst, // O - Destination buffer`
`1675`	`1675`	`{`
`1676`	`1676`	`if (*src == '%' && decode)`
`1677`	`1677`	`{`
`1678`		`- if (_cups_isxdigit(src[1]) && _cups_isxdigit(src[2]))`
`1679`		`- {`
`1680`		`- // Grab a hex-encoded character...`
`1681`		`- *ptr++ = (char)((_cups_xdigit(src[1]) << 4) \| _cups_xdigit(src[2]));`
`1682`		`- src += 2;`
`1683`		`- }`
`1684`		`- else`
	`1678`	`+ int x1, x2; // Hex digit values`
	`1679`	`+`
	`1680`	`+ if ((x1 = _cups_xdigit(src[1])) < 0 \|\| (x2 = _cups_xdigit(src[2])) < 0)`
`1685`	`1681`	`{`
`1686`	`1682`	`// Bad hex-encoded character...`
`1687`	`1683`	`*ptr = '\0';`
`1688`	`1684`	`return (NULL);`
`1689`	`1685`	`}`
	`1686`	`+ else`
	`1687`	`+ {`
	`1688`	`+ // Grab a hex-encoded character...`
	`1689`	`+ *ptr++ = (char)((x1 << 4) \| x2);`
	`1690`	`+ src += 2;`
	`1691`	`+ }`
`1690`	`1692`	`}`
`1691`	`1693`	`else if ((src & 255) <= 0x20 \|\| (src & 255) >= 0x7f)`
`1692`	`1694`	`{`