aboutsummaryrefslogtreecommitdiffstats
path: root/echld
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2014-07-29 00:04:00 +0200
committerEvan Huus <eapache@gmail.com>2014-07-29 01:53:32 +0000
commit0272b9c435db6b8665504d402ce1a23325f5b409 (patch)
tree37d6e8f1ad8906b16261f7995e9af218fcf217a7 /echld
parent3db115a545587f3420b9509bd4dc6097417184d5 (diff)
Fix heap-use-after-free via setlocale
setlocale returns a statically-allocated memory which can be modified by subsequent calls of setlocale. This triggers a heap-use-after free in ASAN when the setlocale function is called again with the previous pointer. This was found when trying to use the "Show All Streams" option via the Telephony -> RTP menu. While at it, add some modelines Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a Reviewed-on: https://code.wireshark.org/review/3234 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'echld')
-rw-r--r--echld/dispatcher.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/echld/dispatcher.c b/echld/dispatcher.c
index 2286fc630a..c6176ebd9c 100644
--- a/echld/dispatcher.c
+++ b/echld/dispatcher.c
@@ -1062,4 +1062,15 @@ void echld_dispatcher_start(int* in_pipe_fds, int* out_pipe_fds, char* argv0, in
exit(dispatcher_loop());
}
-
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 noexpandtab:
+ * :indentSize=4:tabSize=8:noTabs=false:
+ */