Merge pull request #636 from gijsbert802/fix-hex-encoded-xml-entity-p…

…arsing Fix parsing of hexadecimal encoded entities.
hapifhir · May 20, 2017 · 77109cb · 77109cb
2 parents 9ca8a28 + 1fc1590
commit 77109cb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/hapi-fhir-base/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java
@@ -577,8 +577,8 @@ else if (c.equals("sect"))
 		else if (c.charAt(0) == '#') {
 			if (isInteger(c.substring(1), 10))
 				s.append((char) Integer.parseInt(c.substring(1)));
-			else if (isInteger(c.substring(1), 16))
-				s.append((char) Integer.parseInt(c.substring(1), 16));
+			else if (c.charAt(1) == 'x' && isInteger(c.substring(2), 16))
+				s.append((char) Integer.parseInt(c.substring(2), 16));
 		} else if (c.equals("fnof"))
 			s.append((char) 402); // latin small f with hook = function = florin, U+0192 ISOtech -->
 		else if (c.equals("Alpha"))