summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-10-30 19:09:39 +0100
committerMichael Mann <mmann78@netscape.net>2015-10-30 23:37:00 +0000
commite654611ffb00dd1c91eefa6f36654de5fdfd64f2 (patch)
tree33473f3dbf6b006d853495223a6ace94cdc5a165
parent916dfc5895a3b18572d9128fa686ce3d32f9810a (diff)
downloadwireshark-e654611ffb00dd1c91eefa6f36654de5fdfd64f2.tar.gz
RPC: fix crash when calling NLMv4 SRT statistics
Packet scope is not valid when called from GUI. As master-1.12 does not benefit from the code refactring done in master, we cannot use the same solution as in g59f4c1c Instead allow to leak a bit of memory by allocating in the epan scope. Bug: 11654 Change-Id: Ia896299766f7e132b944af48a210fd44d8412282 Reviewed-on: https://code.wireshark.org/review/11447 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-rpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 8e536c3be6..7de6ea0ad3 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -389,7 +389,7 @@ rpc_proc_name(guint32 prog, guint32 vers, guint32 proc)
else {
/* happens only with strange program versions or
non-existing dissectors */
- procname = wmem_strdup_printf(wmem_packet_scope(), "proc-%u", key.proc);
+ procname = wmem_strdup_printf(wmem_epan_scope(), "proc-%u", key.proc);
}
return procname;
}