Skip to content

P
protobuf
Commit ba800e2e authored by Thomas Van Lenten's avatar Thomas Van Lenten
Browse files
Options

Set the stream limit to the length of the data. 

- Mark all conformance tests as now passing.
parent 4e338816
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
conformance/failure_list_objc.txt
View file @ ba800e2e
ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE # No tests currently failing.
ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
objectivec/GPBCodedInputStream.m
View file @ ba800e2e
...@@ -264,10 +264,6 @@ void GPBCodedInputStreamPopLimit(GPBCodedInputStreamState *state, ...@@ -264,10 +264,6 @@ void GPBCodedInputStreamPopLimit(GPBCodedInputStreamState *state,
} }
size_t GPBCodedInputStreamBytesUntilLimit(GPBCodedInputStreamState *state) { size_t GPBCodedInputStreamBytesUntilLimit(GPBCodedInputStreamState *state) {
if (state->currentLimit == SIZE_T_MAX) {
return state->currentLimit;
}
return state->currentLimit - state->bufferPos; return state->currentLimit - state->bufferPos;
} }
...@@ -299,7 +295,7 @@ void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state, ...@@ -299,7 +295,7 @@ void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state,
buffer_ = [data retain]; buffer_ = [data retain];
state_.bytes = (const uint8_t *)[data bytes]; state_.bytes = (const uint8_t *)[data bytes];
state_.bufferSize = [data length]; state_.bufferSize = [data length];
state_.currentLimit = NSUIntegerMax; state_.currentLimit = state_.bufferSize;
} }
return self; return self;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment