commit ecc0f5412702e7f69b4578c92a120c56bdd79287
author Thomas Van Lenten <thomasvl@google.com> Tue Jun 06 10:14:41 2017 -0400
committer Thomas Van Lenten <thomasvl@google.com> Tue Jun 06 10:14:41 2017 -0400
tree 874e512c4556a628f0204180b8d6e073bea67475
parent 656dedbf07ed88489bf60ddae4c583a0437d82cc

Properly error on a tag with field number zero.

objectivec/GPBCodedInputStream.m

diff --git a/objectivec/GPBCodedInputStream.m b/objectivec/GPBCodedInputStream.m
index eef0535..22859e7 100644
--- a/objectivec/GPBCodedInputStream.m
+++ b/objectivec/GPBCodedInputStream.m
@@ -230,16 +230,16 @@
   }
 
   state->lastTag = ReadRawVarint32(state);
-  if (state->lastTag == 0) {
-    // If we actually read zero, that's not a valid tag.
-    RaiseException(GPBCodedInputStreamErrorInvalidTag,
-                   @"A zero tag on the wire is invalid.");
-  }
-  // Tags have to include a valid wireformat, check that also.
+  // Tags have to include a valid wireformat.
   if (!GPBWireFormatIsValidTag(state->lastTag)) {
     RaiseException(GPBCodedInputStreamErrorInvalidTag,
                    @"Invalid wireformat in tag.");
   }
+  // Zero is not a valid field number.
+  if (GPBWireFormatGetTagFieldNumber(state->lastTag) == 0) {
+    RaiseException(GPBCodedInputStreamErrorInvalidTag,
+                   @"A zero field number on the wire is invalid.");
+  }
   return state->lastTag;
 }