diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-16 13:06:28 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-17 01:47:46 +0000 |
| commit | 8cd167a06cdba22f4b1efeb8929228d387ea5f23 (patch) | |
| tree | 92453da8e5b139d1783fad4ab9362dc8ada2c88f /epan/dissectors/packet-ipsec.c | |
| parent | 379c3c6fde8a35648b570e714fc8b2ea7eead22e (diff) | |
| download | wireshark-8cd167a06cdba22f4b1efeb8929228d387ea5f23.tar.gz | |
Fix sscanf VS Code Analysis warnings.
Some needed to check return value, others were converted to use strtoul.
Change-Id: I55aae216f95362b67e006f6e682abbd5ae2c8dcc
Reviewed-on: https://code.wireshark.org/review/16502
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipsec.c')
| -rw-r--r-- | epan/dissectors/packet-ipsec.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index 45ed09af60..c9631bf9a5 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -788,9 +788,13 @@ get_full_ipv4_addr(char* ipv4_address_expanded, char *ipv4_address) } else { - sscanf(addr_byte_string_tmp,"%u",&addr_byte); - if(addr_byte < 16) g_snprintf(addr_byte_string,4,"0%X",addr_byte); - else g_snprintf(addr_byte_string,4,"%X",addr_byte); + if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) != 1) + return FALSE; + + if(addr_byte < 16) + g_snprintf(addr_byte_string,4,"0%X",addr_byte); + else + g_snprintf(addr_byte_string,4,"%X",addr_byte); for(i = 0; i < strlen(addr_byte_string); i++) { ipv4_address_expanded[cpt] = addr_byte_string[i]; @@ -813,9 +817,13 @@ get_full_ipv4_addr(char* ipv4_address_expanded, char *ipv4_address) } else { - sscanf(addr_byte_string_tmp,"%u",&addr_byte); - if(addr_byte < 16) g_snprintf(addr_byte_string,4,"0%X",addr_byte); - else g_snprintf(addr_byte_string,4,"%X",addr_byte); + if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) != 1) + return FALSE; + + if(addr_byte < 16) + g_snprintf(addr_byte_string,4,"0%X",addr_byte); + else + g_snprintf(addr_byte_string,4,"%X",addr_byte); for(i = 0; i < strlen(addr_byte_string); i++) { ipv4_address_expanded[cpt] = addr_byte_string[i]; @@ -908,8 +916,10 @@ filter_address_match(gchar *addr, gchar *filter, gint typ) addr_string_tmp[0] = addr[i]; addr_string_tmp[1] = '\0'; - sscanf(filter_string_tmp,"%x",&filter_tmp); - sscanf(addr_string_tmp,"%x",&addr_tmp); + if (sscanf(filter_string_tmp,"%x",&filter_tmp) != 1) + return FALSE; + if (sscanf(addr_string_tmp,"%x",&addr_tmp) != 1) + return FALSE; for(i = 0; i < (filter_len % 4); i++) { if(((filter_tmp >> (4 -i -1)) & 1) != ((addr_tmp >> (4 -i -1)) & 1)) |