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-ldap.c b/epan/dissectors/packet-ldap.c
index f9c0da4be6..28508ba8a8 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -627,13 +627,13 @@ attribute_types_update_cb(void *r, const char **err)
   char c;
 
   if (rec->attribute_type == NULL) {
-    *err = wmem_strdup_printf(wmem_packet_scope(), "Attribute type can't be empty");
+    *err = g_strdup("Attribute type can't be empty");
     return;
   }
 
   g_strstrip(rec->attribute_type);
   if (rec->attribute_type[0] == 0) {
-    *err = wmem_strdup_printf(wmem_packet_scope(), "Attribute type can't be empty");
+    *err = g_strdup("Attribute type can't be empty");
     return;
   }
 
@@ -642,7 +642,7 @@ attribute_types_update_cb(void *r, const char **err)
    */
   c = proto_check_field_name(rec->attribute_type);
   if (c) {
-    *err = wmem_strdup_printf(wmem_packet_scope(), "Attribute type can't contain '%c'", c);
+    *err = g_strdup_printf("Attribute type can't contain '%c'", c);
     return;
   }