Fix recent analyzer regressions (#3587)

paulb777 · web-flow · commit 087e48b6e8c9 · 2019-08-14T07:43:37.000-07:00
diff --git a/Firebase/Messaging/FIRMessagingCodedInputStream.m b/Firebase/Messaging/FIRMessagingCodedInputStream.m
@@ -37,7 +37,7 @@ static BOOL ReadRawByte(BufferState *state, int8_t *output) {
   if (state == NULL || output == NULL) {
     FIRMessagingLoggerDebug(kFIRMessagingCodeInputStreamInvalidParameters, @"Invalid parameters.");
   }
-  if (CheckSize(state, sizeof(int8_t))) {
+  if (output != nil && CheckSize(state, sizeof(int8_t))) {
     *output = ((int8_t *)state->bytes)[state->bufferPos++];
     return YES;
   }
@@ -47,6 +47,7 @@ static BOOL ReadRawByte(BufferState *state, int8_t *output) {
 static BOOL ReadRawVarInt32(BufferState *state, int32_t *output) {
   if (state == NULL || output == NULL) {
     FIRMessagingLoggerDebug(kFIRMessagingCodeInputStreamInvalidParameters, @"Invalid parameters.");
+    return NO;
   }
   int8_t tmp = 0;
   if (!ReadRawByte(state, &tmp)) {

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ static BOOL ReadRawByte(BufferState state, int8_t output) {`
`37`	`37`	`if (state == NULL \|\| output == NULL) {`
`38`	`38`	`FIRMessagingLoggerDebug(kFIRMessagingCodeInputStreamInvalidParameters, @"Invalid parameters.");`
`39`	`39`	`}`
`40`		`- if (CheckSize(state, sizeof(int8_t))) {`
	`40`	`+ if (output != nil && CheckSize(state, sizeof(int8_t))) {`
`41`	`41`	`output = ((int8_t )state->bytes)[state->bufferPos++];`
`42`	`42`	`return YES;`
`43`	`43`	`}`
`@@ -47,6 +47,7 @@ static BOOL ReadRawByte(BufferState state, int8_t output) {`
`47`	`47`	`static BOOL ReadRawVarInt32(BufferState state, int32_t output) {`
`48`	`48`	`if (state == NULL \|\| output == NULL) {`
`49`	`49`	`FIRMessagingLoggerDebug(kFIRMessagingCodeInputStreamInvalidParameters, @"Invalid parameters.");`
	`50`	`+ return NO;`
`50`	`51`	`}`
`51`	`52`	`int8_t tmp = 0;`
`52`	`53`	`if (!ReadRawByte(state, &tmp)) {`