Backport fix for #108

Author: cowtowncoder

protobuf/src/main/java/com/fasterxml/jackson/dataformat/protobuf/ProtobufParser.java

@@ -737,12 +737,16 @@ private JsonToken _handleRootKey(int tag) throws IOException
         int id = (tag >> 3);
 
         ProtobufField f;
-        if ((_currentField == null) || (f = _currentField.nextOrThisIf(id)) == null) {
-            f = _currentMessage.field(id);
-        }
-        // Note: may be null; if so, value needs to be skipped
-        if (f == null) {
-            return _skipUnknownField(id, wireType);
+        if (_currentField != null) {
+            if ((f = _currentField.nextOrThisIf(id)) == null) {
+                if ((f = _currentMessage.field(id)) == null) {
+                    return _skipUnknownField(id, wireType);
+                }
+            }
+        } else {
+            if ((f = _currentMessage.field(id)) == null) {
+                return _skipUnknownField(id, wireType);
+            }
         }
         _parsingContext.setCurrentName(f.name);
         // otherwise quickly validate compatibility
@@ -769,9 +773,25 @@ private JsonToken _handleNestedKey(int tag) throws IOException
         int id = (tag >> 3);
 
         ProtobufField f;
+        if (_currentField != null) {
+            if ((f = _currentField.nextOrThisIf(id)) == null) {
+                if ((f = _currentMessage.field(id)) == null) {
+                    return _skipUnknownField(id, wireType);
+                }
+            }
+        } else {
+            if ((f = _currentMessage.field(id)) == null) {
+                return _skipUnknownField(id, wireType);
+            }
+        }
+        
         if ((_currentField == null) || (f = _currentField.nextOrThisIf(id)) == null) {
             f = _currentMessage.field(id);
         }
+        // Note: may be null; if so, value needs to be skipped
+        if (f == null) {
+            return _skipUnknownField(id, wireType);
+        }
         _parsingContext.setCurrentName(f.name);
         if (!f.isValidFor(wireType)) {
             _reportIncompatibleType(f, wireType);

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadNestedUnknownFieldsTest.java

@@ -0,0 +1,106 @@
+package com.fasterxml.jackson.dataformat.protobuf;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import com.fasterxml.jackson.core.JsonParser;
+
+import com.fasterxml.jackson.dataformat.protobuf.schema.ProtobufSchema;
+
+// [dataformats-binary#108]
+public class ReadNestedUnknownFieldsTest extends ProtobufTestBase
+{
+    public static class LessNestedField {
+        @JsonProperty(value = "f1", index = 1)
+        private NestedOneField f1;
+
+        public NestedOneField getF1() {
+          return f1;
+        }
+
+        public void setF1(NestedOneField f1) {
+          this.f1 = f1;
+        }
+    }
+
+    public static class MoreNestedField {
+
+        @JsonProperty(value = "f1", index = 1)
+        private NestedTwoField f1;
+
+        public NestedTwoField getF1() {
+          return f1;
+        }
+
+        public void setF1(NestedTwoField f1) {
+          this.f1 = f1;
+        }
+    }
+
+    public static class NestedOneField {
+
+        @JsonProperty(value = "nested2", index = 2)
+        private int nested2;
+
+        public int getNested2() {
+          return nested2;
+        }
+
+        public void setNested2(int nested2) {
+          this.nested2 = nested2;
+        }
+    }
+
+    public static class NestedTwoField {
+
+        @JsonProperty(value = "nested1", index = 1)
+        private int nested1;
+
+        @JsonProperty(value = "nested2", index = 2)
+        private int nested2;
+
+        public int getNested1() {
+          return nested1;
+        }
+
+        public void setNested1(int nested1) {
+          this.nested1 = nested1;
+        }
+
+        public int getNested2() {
+          return nested2;
+        }
+
+        public void setNested2(int nested2) {
+          this.nested2 = nested2;
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    final ProtobufMapper MAPPER = new ProtobufMapper();
+
+      public void testMultipleUnknown() throws Exception
+      {
+          MoreNestedField moreNestedField = new MoreNestedField();
+          NestedTwoField nestedTwoField = new NestedTwoField();
+          nestedTwoField.setNested1(1);
+          nestedTwoField.setNested2(2);
+          moreNestedField.setF1(nestedTwoField);
+
+          byte[] in = MAPPER.writerFor(MoreNestedField.class)
+                  .with(MAPPER.generateSchemaFor(MoreNestedField.class))
+                  .writeValueAsBytes(moreNestedField);
+
+          LessNestedField lesser = MAPPER.readerFor(LessNestedField.class)
+                  .with(MAPPER.generateSchemaFor(LessNestedField.class))
+                  // important: skip through unknown
+                  .with(JsonParser.Feature.IGNORE_UNDEFINED)
+                  .readValue(in);
+
+          assertEquals(moreNestedField.getF1().getNested2(), lesser.getF1().getNested2());
+    }
+}

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadUnkownFieldsTest.java

@@ -68,19 +68,17 @@ public void setF3(int f3) {
 
     public void testMultipleUnknown() throws Exception
     {
-        ProtobufMapper mapper = new ProtobufMapper();
-
         ThreeField threeField = new ThreeField();
         threeField.setF1(1);
         threeField.setF2(2);
         threeField.setF3(3);
 
         ProtobufSchema schemaWith3 = MAPPER.generateSchemaFor(ThreeField.class);
-        byte[] in = mapper.writerFor(ThreeField.class).with(schemaWith3)
+        byte[] in = MAPPER.writer(schemaWith3)
                 .writeValueAsBytes(threeField);
 
         ProtobufSchema schemaWith1 = MAPPER.generateSchemaFor(OneField.class);
-        OneField oneField = mapper.readerFor(OneField.class).with(schemaWith1)
+        OneField oneField = MAPPER.readerFor(OneField.class).with(schemaWith1)
                 // important: skip through unknown
                 .with(JsonParser.Feature.IGNORE_UNDEFINED)
                 .readValue(in);

release-notes/VERSION

@@ -15,8 +15,9 @@ Modules:
 
 2.8.11 (not yet released)
 
-#106: fix calling _skipUnknownValue() twice
+#106: (protobuf) fix calling _skipUnknownValue() twice
  (reported, contributed fix for by marsqing@github@github)
+#108: (protobuf) fix NPE in skip unknown nested key
 
 2.8.10 (24-Aug-2017)