Backport #1260 fix in 2.7

Author: cowtowncoder

release-notes/CREDITS

@@ -459,3 +459,7 @@ Nick Babcock (nickbabcock)
 Andrew Joseph (apjoseph@github)
   * Reported #1248: `Annotated` returns raw type in place of Generic Type in 2.7.x
    (2.7.5)
+
+Erich Schubert (kno10@github)
+  * Reported #1260: `NullPointerException` in `JsonNodeDeserializer`, provided fix
+   (2.7.5)

release-notes/VERSION

@@ -21,6 +21,8 @@ Project: jackson-databind
 #1248: `Annotated` returns raw type in place of Generic Type in 2.7.x
  (reported by Andrew J, apjoseph@github)
 #1253: Problem with context handling for `TokenBuffer`, field name
+#1260: `NullPointerException` in `JsonNodeDeserializer`
+ (reported by Eric S)
 
 2.7.4 (29-Apr-2016)
 

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

@@ -968,9 +968,10 @@ public JsonMappingException mappingException(Class<?> targetClass) {
     }
 
     public JsonMappingException mappingException(Class<?> targetClass, JsonToken token) {
+        String tokenDesc = (token == null) ? "<end of input>" : String.format("%s token", token);
         return JsonMappingException.from(_parser,
-                String.format("Can not deserialize instance of %s out of %s token",
-                        _calcName(targetClass), token));
+                String.format("Can not deserialize instance of %s out of %s",
+                        _calcName(targetClass), tokenDesc));
     }
 
     /**

src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java

@@ -219,6 +219,9 @@ protected final ObjectNode deserializeObject(JsonParser p, DeserializationContex
         for (; key != null; key = p.nextFieldName()) {
             JsonNode value;
             JsonToken t = p.nextToken();
+            if (t == null) {
+                throw ctxt.mappingException("Unexpected end-of-input when binding data into ObjectNode");
+            }
             switch (t.id()) {
             case JsonTokenId.ID_START_OBJECT:
                 value = deserializeObject(p, ctxt, nodeFactory);