From 95f484a91ee34ea3caa2c325170e52d0bf07489b Mon Sep 17 00:00:00 2001 From: Evan Huus Date: Fri, 25 Oct 2013 22:14:25 +0000 Subject: Add a very small hack to make the UAT update callback error string freeable, and convert all existing UAT update callbacks to use glib memory instead of ephemeral memory for that string. UAT code paths are entirely distinct from packet dissection, so using ephemeral memory was the wrong choice, because there was no guarantees about when it would be freed. The move away from emem still needs to be propogated deeper into the UAT code itself at some point. Net effect: remove another bunch of emem calls from dissectors, where replacing with wmem would have caused assertions. svn path=/trunk/; revision=52854 --- epan/dissectors/packet-sccp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-sccp.c') diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 6a6653932e..3b77eb51cd 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -3404,12 +3404,12 @@ sccp_users_update_cb(void *r, const char **err) empty = range_empty(); if (ranges_are_equal(u->called_pc, empty)) { - *err = ep_strdup_printf("Must specify a PC"); + *err = g_strdup("Must specify a PC"); return; } if (ranges_are_equal(u->called_ssn, empty)) { - *err = ep_strdup_printf("Must specify an SSN"); + *err = g_strdup("Must specify an SSN"); return; } -- cgit v1.2.1