osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fix text2pcap.c: Argument with 'nonnull' attribute passed null (clang analyzer) 

Clang scan analysis reports API error for text2pcap.c.

Change-Id: Ie0861d75888e258d9fd928d5d7441e1e3a8279ba
Reviewed-on: https://code.wireshark.org/review/367
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Hadriel Kaplan 2014-02-25 10:44:39 -05:00 committed by Anders Broman
parent 111c0778bd
commit 9c62ea46cd
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
text2pcap.c
View File

@ -1182,6 +1182,7 @@ parse_token (token_t token, char *str)
/* ----- Waiting for new packet -------------------------------------------*/
case INIT:
if (!str && token != T_EOL) goto fail_null_str;
switch (token) {
case T_TEXT:
append_to_preamble(str);
@ -1211,6 +1212,7 @@ parse_token (token_t token, char *str)
/* ----- Processing packet, start of new line -----------------------------*/
case START_OF_LINE:
if (!str && token != T_EOL) goto fail_null_str;
switch (token) {
case T_TEXT:
append_to_preamble(str);
@ -1264,6 +1266,7 @@ parse_token (token_t token, char *str)
case T_BYTE:
/* Record the byte */
state = READ_BYTE;
if (!str) goto fail_null_str;
write_byte(str);
break;
case T_TEXT:
@ -1368,6 +1371,12 @@ parse_token (token_t token, char *str)
if (debug >= 2)
fprintf(stderr, ", %s)\n", state_str[state]);
return;
fail_null_str:
fprintf(stderr, "FATAL ERROR: got NULL str pointer in state (%d)", state);
exit(1);
}
/*----------------------------------------------------------------------