diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-01-08 13:54:00 -0800 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2018-01-08 23:55:13 +0000 |
commit | 94479aded162aecce6289bdf26f95073bed0dc55 (patch) | |
tree | 3d2089eec8d14c3da82f8df88402c4d79f780c0c /epan/tvbparse.h | |
parent | 7ec5dead2ffc03f009398a0a30217052e6749ad0 (diff) |
Limit tvbparse recursion.
Add a recursion check to tvbparse so that we don't overflow our stack.
Bug: 14253
Change-Id: I0f667c3720311318267a1184b33e33253f8ff729
Reviewed-on: https://code.wireshark.org/review/25202
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/tvbparse.h')
-rw-r--r-- | epan/tvbparse.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/tvbparse.h b/epan/tvbparse.h index 6128b8bbca..863e909668 100644 --- a/epan/tvbparse.h +++ b/epan/tvbparse.h @@ -148,6 +148,7 @@ struct _tvbparse_t { int end_offset; void* data; const tvbparse_wanted_t* ignore; + int recursion_depth; }; |