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

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index cd0c6e665b..952d270047 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -160,18 +160,18 @@ static void uat_key_record_update_cb(void* r, const char** err) {
     uat_key_record_t* rec = (uat_key_record_t *)r;
 
     if (rec->string == NULL) {
-         *err = ep_strdup_printf("Key can't be blank");
+	*err = g_strdup("Key can't be blank");
     } else {
         g_strstrip(rec->string);
 
         if (rec->string[0] != 0) {
             *err = NULL;
             if ( !zbee_security_parse_key(rec->string, rec->key, rec->byte_order) ) {
-                *err = ep_strdup_printf("Expecting %d hexadecimal bytes or\n"
+                *err = g_strdup_printf("Expecting %d hexadecimal bytes or\n"
                         "a %d character double-quoted string", ZBEE_SEC_CONST_KEYSIZE, ZBEE_SEC_CONST_KEYSIZE);
             }
         } else {
-            *err = ep_strdup_printf("Key can't be blank");
+            *err = g_strdup("Key can't be blank");
         }
     }
 }