Fix tests

protocolbuffers · Jan 24, 2020 · bdf9f1a · bdf9f1a
1 parent 9847ddb
commit bdf9f1a
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/csharp/src/Google.Protobuf/CodedInputReader.cs b/csharp/src/Google.Protobuf/CodedInputReader.cs
@@ -226,10 +226,6 @@ public uint ReadTag()
                 // If we actually read a tag with a field of 0, that's not a valid tag.
                 ThrowInvalidTagException();
             }
-            if (ReachedLimit)
-            {
-                return 0;
-            }
 
             return lastTag;
         }
@@ -1308,7 +1304,7 @@ private void ValidateRequestedDataAvaliable(int length)
             if (length + reader.Consumed > currentLimit)
             {
                 // Read to the end of the limit.
-                reader.Advance(currentLimit);
+                reader.Advance(Math.Min(currentLimit, reader.Remaining));
                 // Then fail.
                 ThrowTruncatedMessage();
             }