aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-01-19 19:36:20 +0000
committerEvan Huus <eapache@gmail.com>2013-01-19 19:36:20 +0000
commit1390569a9940e06cf066c63abf196e46c7f0ef6c (patch)
tree96807238869b66cd6ad5fcc55d45ea13ab3c4094 /epan/dissectors
parent8f62d93328e566408f56cc7035a5cb379d76d0fe (diff)
Use wmem epan-scoped memory when initializing dcerpc so that it gets freed when
we shut down. Cleans up 5Kb worth of valgrind sorta-false-positive leaks. svn path=/trunk/; revision=47168
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-dcerpc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 0d57a8cf0e..14e2a84ada 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -41,6 +41,7 @@
#include <epan/reassemble.h>
#include <epan/tap.h>
#include <epan/emem.h>
+#include <epan/wmem/wmem.h>
#include <epan/expert.h>
#include <epan/strutil.h>
#include <epan/addr_resolv.h>
@@ -890,7 +891,7 @@ again:
}
if (!vs) {
- vs = g_malloc((num_sd + 1) * sizeof(value_string));
+ vs = wmem_alloc(wmem_epan_scope(), (num_sd + 1) * sizeof(value_string));
goto again;
}