RawValue.toString ignores malformed bytes instead of throwing MessageTypeException

frsyuki · frsyuki · commit 5455445e3b9c · 2011-08-21T09:53:28.000+09:00
diff --git a/src/main/java/org/msgpack/type/AbstractRawValue.java b/src/main/java/org/msgpack/type/AbstractRawValue.java
@@ -18,6 +18,12 @@
 package org.msgpack.type;
 
 import java.util.Arrays;
+import java.nio.ByteBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.MalformedInputException;
 
 abstract class AbstractRawValue extends AbstractValue implements RawValue {
     public ValueType getType() {
@@ -56,7 +62,24 @@ public String toString() {
     }
 
     public StringBuilder toString(StringBuilder sb) {
-        String s = getString();
+        String s;
+        if(getClass() == StringRawValueImpl.class) {
+            // StringRawValueImpl.getString never throws exception
+            s = getString();
+        } else {
+            // don't throw encoding error exception
+            // ignore malformed bytes
+            CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder().
+                onMalformedInput(CodingErrorAction.IGNORE).
+                onUnmappableCharacter(CodingErrorAction.IGNORE);
+            try {
+                s = decoder.decode(ByteBuffer.wrap(getByteArray())).toString();
+            } catch (CharacterCodingException ex) {
+                // never comes here
+                s = new String(getByteArray());
+            }
+        }
+
         sb.append("\"");
         for(int i=0; i < s.length(); i++) {
             char ch = s.charAt(i);
@@ -102,6 +125,7 @@ public StringBuilder toString(StringBuilder sb) {
             }
         }
         sb.append("\"");
+
         return sb;
     }
 
diff --git a/src/test/java/org/msgpack/unpacker/TestMalformedEncoding.java b/src/test/java/org/msgpack/unpacker/TestMalformedEncoding.java
@@ -126,5 +126,15 @@ public void testJSONBufferPackerWriteString() throws Exception {
             }
         }
     }
+
+    @Test
+    public void testValueToString() throws Exception {
+        for(byte[] malform : malforms) {
+            RawValue r = ValueFactory.rawValue(malform);
+            String str = r.toString();
+            // malformed bytes will be ignored
+            assertEquals("\"\"", str);
+        }
+    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -126,5 +126,15 @@ public void testJSONBufferPackerWriteString() throws Exception {`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ @Test`
	`131`	`+ public void testValueToString() throws Exception {`
	`132`	`+ for(byte[] malform : malforms) {`
	`133`	`+ RawValue r = ValueFactory.rawValue(malform);`
	`134`	`+ String str = r.toString();`
	`135`	`+ // malformed bytes will be ignored`
	`136`	`+ assertEquals("\"\"", str);`
	`137`	`+ }`
	`138`	`+ }`
`129`	`139`	`}`
`130`	`140`