aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-enip.c
diff options
context:
space:
mode:
authoretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-25 11:43:30 +0000
committeretxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7>2009-10-25 11:43:30 +0000
commit1bf35eeccc8c59ed9874cb96348966da281b0853 (patch)
treea19835aec094d07536c6def639d5d5d236f0a1cd /epan/dissectors/packet-enip.c
parentf2743805ede691924d8f265a2e8ee489116370fb (diff)
From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30691 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-enip.c')
-rw-r--r--epan/dissectors/packet-enip.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index f1ee3963d1..038ea276ff 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -50,8 +50,6 @@
#include "packet-enip.h"
#include "packet-cip.h"
-#define se_new(type) ((type*)se_alloc(sizeof(type)))
-
/* Communication Ports */
#define ENIP_ENCAP_PORT 44818 /* EtherNet/IP located on port 44818 */
#define ENIP_IO_PORT 2222 /* EtherNet/IP IO located on port 2222 */
@@ -358,8 +356,7 @@ enip_request_info_t *request_info = NULL;
{
if ( request_val == NULL )
{
- new_request_key = se_alloc(sizeof(enip_request_key_t));
- memcpy( new_request_key, prequest_key, sizeof(enip_request_key_t) );
+ new_request_key = se_memdup(prequest_key, sizeof(enip_request_key_t));
request_val = se_alloc(sizeof(enip_request_val_t));
request_val->frames = se_tree_create_non_persistent(EMEM_TREE_TYPE_RED_BLACK, "enip_frames");