summaryrefslogtreecommitdiff
path: root/asn1/pres
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:21:22 +0000
committerStig Bjørlykke <stig@bjorlykke.org>2009-03-13 22:21:22 +0000
commit9ebac2bff6a3b945a6bdef67a9548fb648387888 (patch)
tree5fa314a8f356089956554ab984dc40862013e32e /asn1/pres
parent62f60df6b4966d4e3d7f478284768115ef150b20 (diff)
downloadwireshark-9ebac2bff6a3b945a6bdef67a9548fb648387888.tar.gz
g_free() is NULL safe, so we don't need check against it.
svn path=/trunk/; revision=27719
Diffstat (limited to 'asn1/pres')
-rw-r--r--asn1/pres/packet-pres-template.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c
index 796036b30a..6e1cc3a5b1 100644
--- a/asn1/pres/packet-pres-template.c
+++ b/asn1/pres/packet-pres-template.c
@@ -182,6 +182,7 @@ pres_copy_cb(void *dest, const void *orig, unsigned len _U_)
pres_user_t *u = dest;
const pres_user_t *o = orig;
+ u->ctx_id = o->ctx_id;
u->oid = g_strdup(o->oid);
return dest;
@@ -192,7 +193,7 @@ pres_free_cb(void *r)
{
pres_user_t *u = r;
- if (u->oid) g_free(u->oid);
+ g_free(u->oid);
}
static gboolean