diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-05-02 18:48:41 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-05-02 17:52:03 +0000 |
| commit | 131eb5593bc48112abf671aa098abcb2d27bcb2f (patch) | |
| tree | 6c322d21b81191bbf9874e77f70ae60b2e0e5dd3 /wiretap | |
| parent | cf4d7ad946c04fc419e58072988f8d4418d72531 (diff) | |
netscreen.c: fix compilation with gcc 8
netscreen.c:135:49: error: logical ‘or’ of equal expressions [-Werror=logical-op]
Change-Id: I19627178f674920030007433d7b9d0c9e3481816
Reviewed-on: https://code.wireshark.org/review/27272
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netscreen.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/netscreen.c b/wiretap/netscreen.c index 4da386e415..d954089dfc 100644 --- a/wiretap/netscreen.c +++ b/wiretap/netscreen.c @@ -132,8 +132,7 @@ static gboolean netscreen_check_file_type(wtap *wth, int *err, gchar **err_info) } reclen = (guint) strlen(buf); - if (reclen < strlen(NETSCREEN_HDR_MAGIC_STR1) || - reclen < strlen(NETSCREEN_HDR_MAGIC_STR2)) { + if (reclen < MIN(strlen(NETSCREEN_HDR_MAGIC_STR1), strlen(NETSCREEN_HDR_MAGIC_STR2))) { continue; } |