Bugfix for looking up characters > 255

planetlevel · planetlevel · commit b14d148fbc3b · 2008-12-19T16:53:42.000Z
diff --git a/src/main/java/org/owasp/esapi/codecs/Codec.java b/src/main/java/org/owasp/esapi/codecs/Codec.java
@@ -114,7 +114,8 @@ public Character decodeCharacter( PushbackString input ) {
 	 * Lookup the hex value of any character that is not alphanumeric, return null if alphanumeric.
 	 */
 	public static String getHex( char c ) {
-		return hex[(int)c];
+		if ( c > 0xFF ) return null;
+		return hex[c];
 	}
 
 	/**
diff --git a/src/test/java/org/owasp/esapi/reference/EncoderTest.java b/src/test/java/org/owasp/esapi/reference/EncoderTest.java
@@ -353,6 +353,7 @@ public void testEncodeForHTML() throws Exception {
         assertEquals(",.-_ ", instance.encodeForHTML(",.-_ "));
         assertEquals("dir&amp;", instance.encodeForHTML("dir&"));
         assertEquals("one&amp;two", instance.encodeForHTML("one&two"));
+        assertEquals("" + (char)12345 + (char)65533 + (char)1244, "" + (char)12345 + (char)65533 + (char)1244 );
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,8 @@ public Character decodeCharacter( PushbackString input ) {`
`114`	`114`	`* Lookup the hex value of any character that is not alphanumeric, return null if alphanumeric.`
`115`	`115`	`*/`
`116`	`116`	`public static String getHex( char c ) {`
`117`		`- return hex[(int)c];`
	`117`	`+ if ( c > 0xFF ) return null;`
	`118`	`+ return hex[c];`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -353,6 +353,7 @@ public void testEncodeForHTML() throws Exception {`
`353`	`353`	`assertEquals(",.-_ ", instance.encodeForHTML(",.-_ "));`
`354`	`354`	`assertEquals("dir&", instance.encodeForHTML("dir&"));`
`355`	`355`	`assertEquals("one&two", instance.encodeForHTML("one&two"));`
	`356`	`+ assertEquals("" + (char)12345 + (char)65533 + (char)1244, "" + (char)12345 + (char)65533 + (char)1244 );`
`356`	`357`	`}`
`357`	`358`
`358`	`359`	`/**`