Fix hex escape in C string

ActiveVolcano · Jun 13, 2022 · 3a86307 · 3a86307
1 parent d28332d
commit 3a86307
Showing 1 changed file with 32 additions and 32 deletions.
diff --git a/byte-array/ByteArray.java b/byte-array/ByteArray.java
@@ -225,47 +225,47 @@ private static byte[] fromCEscaped (final String input, Charset charset) {
 			char c1 = input.charAt (i);
 			boolean isChar = true;
 			byte b1 = 0;
+			var num = new StringBuilder (3);
 
 			c.rewind ();
 			if (c1 != '\\') {
 				c.append (c1);
 			} else if (i < input.length () - 1) {
 				c1 = input.charAt (++i);
 				switch (c1) {
-				case 'a':  c.append ('\u0007'); break; // BEL
-				case 'b':  c.append ('\b');     break; // BS
-				case 'f':  c.append ('\f');     break; // FF
-				case 'n':  c.append ('\n');     break; // LF
-				case 'r':  c.append ('\r');     break; // CR
-				case 't':  c.append ('\t');     break; // HT
-				case 'v':  c.append ('\u000B'); break; // VT
-				case '\'': c.append ('\'');     break; // '
-				case '\"': c.append ('\"');     break; // "
-				case '\\': c.append ('\\');     break; // \
+				case 'a':  c.append ('\u0007'); break;  // BEL
+				case 'b':  c.append ('\b');     break;  // BS
+				case 'f':  c.append ('\f');     break;  // FF
+				case 'n':  c.append ('\n');     break;  // LF
+				case 'r':  c.append ('\r');     break;  // CR
+				case 't':  c.append ('\t');     break;  // HT
+				case 'v':  c.append ('\u000B'); break;  // VT
+				case '\'': c.append ('\'');     break;  // '
+				case '\"': c.append ('\"');     break;  // "
+				case '\\': c.append ('\\');     break;  // \
 				}
-				if (c1 == 'x' || c1 == 'X') {          // Hex
-					var hex = new StringBuilder ();
-					while (++i < input.length ()) {
-						c1 = input.charAt (i);
-						if (isHexChar (c1)) hex.append (c1); else break;
-					}
-					i--;
-					if (! hex.isEmpty()) {
-						isChar = false;
-						b1 = decodeBase16 (hex) [0];
-					}
+				if ((c1 == 'x' || c1 == 'X') &&         // Hex
+				    (i < input.length () - 2) &&
+				    isHexChar (input.charAt (i + 1)) && isHexChar (input.charAt (i + 2))
+				) {
+					isChar = false;
+					num.setLength (0);
+					num.append (input.charAt (++i));
+					num.append (input.charAt (++i));
+					b1 = decodeBase16 (num) [0];
 				}
-				if (isOctChar (c1)) {                  // Oct
-					var oct = new StringBuilder ();
-					for (; i < input.length () ; i++) {
-						c1 = input.charAt (i);
-						if (isOctChar (c1)) oct.append (c1); else break;
-					}
-					i--;
-					if (! oct.isEmpty()) {
-						isChar = false;
-						b1 = (byte) Integer.parseInt (oct.toString (), 8);
-					}
+				if (isOctChar (c1) &&                   // Oct
+				    (i < input.length () - 3) &&
+				    isHexChar (input.charAt (i + 1)) &&
+				    isHexChar (input.charAt (i + 2)) &&
+				    isHexChar (input.charAt (i + 3))
+				) {
+					isChar = false;
+					num.setLength (0);
+					num.append (input.charAt (++i));
+					num.append (input.charAt (++i));
+					num.append (input.charAt (++i));
+					b1 = (byte) Integer.parseInt (num.toString (), 8);
 				}
 			}