From 5fdbb7a5ac8a0a68b42264bde094b90d455350e5 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 14 Dec 2016 14:42:54 -0800 Subject: Don't assume we've read a line long enough to contain a magic number. Check the length of the line first. Bug: 13246 Change-Id: I906bb652594898061afb4b2cd4edb916af354161 Reviewed-on: https://code.wireshark.org/review/19273 Reviewed-by: Guy Harris --- wiretap/daintree-sna.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'wiretap/daintree-sna.c') diff --git a/wiretap/daintree-sna.c b/wiretap/daintree-sna.c index 233c08e274..dfb51c27a3 100644 --- a/wiretap/daintree-sna.c +++ b/wiretap/daintree-sna.c @@ -95,7 +95,8 @@ wtap_open_return_val daintree_sna_open(wtap *wth, int *err, gchar **err_info) } /* check magic text */ - if (memcmp(readLine, daintree_magic_text, DAINTREE_MAGIC_TEXT_SIZE) != 0) + if (strlen(readLine) >= DAINTREE_MAGIC_TEXT_SIZE && + memcmp(readLine, daintree_magic_text, DAINTREE_MAGIC_TEXT_SIZE) != 0) return WTAP_OPEN_NOT_MINE; /* not daintree format */ /* read second header line */ -- cgit v1.2.1