summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-11-28 16:17:22 -0500
committerMichael Mann <mmann78@netscape.net>2015-11-30 01:40:41 +0000
commit9cf09cf777cb5478d470436278db45ab42d84e06 (patch)
tree6c2ca9b5d9877d8c592a05058d02171ec33e5ad7
parent51ccf92c014f6e1423ce74e62f7ebf8647e316e1 (diff)
downloadwireshark-master-1.12.tar.gz
Fix out-of-bounds read in ascend_seek.master-1.12
Bug: 11794 Change-Id: I74517806b119729ae6d9780bbd4bb094701ff05e Reviewed-on: https://code.wireshark.org/review/12266 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> (cherry picked from commit 338da1c0ea0b2f8595d3a7b6d6c9548f7da3e27b) Reviewed-on: https://code.wireshark.org/review/12296 (cherry picked from commit 7abfa36686850a0d81ef1ef280a181d09e5e639c) Reviewed-on: https://code.wireshark.org/review/12297
-rw-r--r--wiretap/ascendtext.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c
index 1e6f4fbbf8..a67d6f1f43 100644
--- a/wiretap/ascendtext.c
+++ b/wiretap/ascendtext.c
@@ -119,6 +119,7 @@ static gint64 ascend_seek(wtap *wth, int *err, gchar **err_info)
but keep looking for other headers. */
if (strcmp(strptr, ASCEND_DATE) == 0) {
date_off = cur_off - len;
+ string_level[string_i] = 0;
} else {
if (date_off == -1) {
/* Back up over the header we just read; that's where a read