Incorporated code review from r949

2011-12-16 19:10:54 +00:00 · 2011-12-16 19:10:54 +00:00 · b5ae3c945a
commit b5ae3c945a
parent a3ca4e1312
1 changed files with 5 additions and 1 deletions
--- a/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@ -300,7 +300,11 @@ public final class TypeAdapters {
        in.nextNull();
        return null;
      }
-      return in.nextString().charAt(0);
+      String str = in.nextString();
+      if (str.length() != 1) {
+        throw new JsonSyntaxException("Expecting character, got: " + str);
+      }
+      return str.charAt(0);
    }
    @Override
    public void write(JsonWriter out, Character value) throws IOException {