diff options
| author | Evan Huus <eapache@gmail.com> | 2013-10-25 22:14:25 +0000 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2013-10-25 22:14:25 +0000 |
| commit | 95f484a91ee34ea3caa2c325170e52d0bf07489b (patch) | |
| tree | 83a02ff6f4f38f36c739e437881a432c75eb88b6 /ui/gtk | |
| parent | 7a3febacac8fd14009dc82dc4d139ee43d37a437 (diff) | |
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
Diffstat (limited to 'ui/gtk')
| -rw-r--r-- | ui/gtk/uat_gui.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 4b458ec562..cc58605ceb 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -373,7 +373,13 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) { dd->uat->update_cb(dd->rec, &err); if (err) { - err = ep_strdup_printf("error updating record: %s", err); + char *tmp; + tmp = ep_strdup_printf("error updating record: %s", err); + /* XXX bit of a hack to remove emem from dissectors, this can + * be removed as proper use of glib memory is propogated + * through the rest of the UAT code */ + g_free((char*)err); + err = tmp; goto on_failure; } } |