From ba800e2e57baf6ed9525dba1c48d21c1a79fafb5 Mon Sep 17 00:00:00 2001 From: Thomas Van Lenten Date: Mon, 23 Nov 2015 12:23:27 -0500 Subject: [PATCH] Set the stream limit to the length of the data. - Mark all conformance tests as now passing. --- conformance/failure_list_objc.txt | 3 +-- objectivec/GPBCodedInputStream.m | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/conformance/failure_list_objc.txt b/conformance/failure_list_objc.txt index a34b3f5b94..f53230ca38 100644 --- a/conformance/failure_list_objc.txt +++ b/conformance/failure_list_objc.txt @@ -1,2 +1 @@ -ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE -ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE +# No tests currently failing. diff --git a/objectivec/GPBCodedInputStream.m b/objectivec/GPBCodedInputStream.m index 71758baa6b..9371228ae2 100644 --- a/objectivec/GPBCodedInputStream.m +++ b/objectivec/GPBCodedInputStream.m @@ -264,10 +264,6 @@ void GPBCodedInputStreamPopLimit(GPBCodedInputStreamState *state, } size_t GPBCodedInputStreamBytesUntilLimit(GPBCodedInputStreamState *state) { - if (state->currentLimit == SIZE_T_MAX) { - return state->currentLimit; - } - return state->currentLimit - state->bufferPos; } @@ -299,7 +295,7 @@ void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state, buffer_ = [data retain]; state_.bytes = (const uint8_t *)[data bytes]; state_.bufferSize = [data length]; - state_.currentLimit = NSUIntegerMax; + state_.currentLimit = state_.bufferSize; } return self; }