aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-08-14 05:54:54 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-08-14 05:54:54 +0000
commitf6d36d20d02898e7fbe670bc9603ea5537e12f7a (patch)
tree334e94faa39d839c4696ef061f2682dfe5c83917 /epan
parenteb994de4cb5059e1721edd82d0a8a1a0c91785a1 (diff)
ememify cip
svn path=/trunk/; revision=15353
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-cip.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 21b9451027..6e1077e631 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -38,6 +38,7 @@
#include <glib.h>
#include <epan/packet.h>
+#include <epan/emem.h>
#include <prefs.h>
#include "packet-tcp.h"
#include "packet-cip.h"
@@ -385,7 +386,7 @@ add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start,
}
tmp = tvb_get_ptr( tvb, start, tmp_length );
- tmp2 = (char*)g_malloc( tmp2_length );
+ tmp2 = (char*)ep_alloc( tmp2_length );
tmp2start = tmp2;
@@ -409,8 +410,6 @@ add_byte_array_text_to_proto_tree( proto_tree *tree, tvbuff_t *tvb, gint start,
pi = proto_tree_add_text( tree, tvb, start, length, "%s%s", str, tmp2start );
- g_free( tmp2start );
-
return( pi );
} /* end of add_byte_array_text_to_proto_tree() */