IPSec: fix decryption broken in g8cd167a

Having no matching in sscanf is a valid use case as the object is already initialized

Bug: 12671
Change-Id: Iee7185290ea72968437159c344a376defe464dd4
Reviewed-on: https://code.wireshark.org/review/16711
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 853ad5251a05f3b40baacfd13acf1b57b565a72c..5dfaf85a75bd67c5c26cb00d55ec70cb1ed33adb 100644 (file)
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -781,7 +781,7 @@ get_full_ipv4_addr(char* ipv4_address_expanded, char *ipv4_address)
         }
         else
         {
-          if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) != 1)
+          if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) == EOF)
             return FALSE;
 
           if(addr_byte < 16)
@@ -810,7 +810,7 @@ get_full_ipv4_addr(char* ipv4_address_expanded, char *ipv4_address)
         }
         else
         {
-          if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) != 1)
+          if (sscanf(addr_byte_string_tmp,"%u",&addr_byte) == EOF)
             return FALSE;
 
           if(addr_byte < 16)
@@ -909,9 +909,9 @@ filter_address_match(gchar *addr, gchar *filter, gint typ)
          addr_string_tmp[0] = addr[i];
          addr_string_tmp[1] = '\0';
 
-         if (sscanf(filter_string_tmp,"%x",&filter_tmp) != 1)
+         if (sscanf(filter_string_tmp,"%x",&filter_tmp) == EOF)
              return FALSE;
-         if (sscanf(addr_string_tmp,"%x",&addr_tmp) != 1)
+         if (sscanf(addr_string_tmp,"%x",&addr_tmp) == EOF)
              return FALSE;
          for(i = 0; i < (filter_len % 4); i++)
          {