diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-25 11:47:39 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-01-25 11:47:39 +0000 |
commit | c198fc65462567cf87c914dc7eff758f18680297 (patch) | |
tree | 03dd1faf270372972f7c1da1e0b81875d16eae54 /epan/dissectors/packet-msrp.c | |
parent | 17a01968d9904dcf2d4a35568755866cec7224ca (diff) |
From Didier Gautheron via bug 4419:
se_alloc and ep_alloc never return NULL and se_alloc0 already initialized
data with 0.
svn path=/trunk/; revision=31654
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
-rw-r--r-- | epan/dissectors/packet-msrp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 3189d88081..b2b0ec0e66 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -204,12 +204,7 @@ void msrp_add_address( packet_info *pinfo, */ if (!p_conv_data) { /* Create conversation data */ - p_conv_data = se_alloc(sizeof(struct _msrp_conversation_info)); - if (!p_conv_data) - { - return; - } - memset(p_conv_data, 0, sizeof(struct _msrp_conversation_info)); + p_conv_data = se_alloc0(sizeof(struct _msrp_conversation_info)); conversation_add_proto_data(p_conv, proto_msrp, p_conv_data); } @@ -250,10 +245,6 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* Save this conversation info into packet info */ p_conv_packet_data = se_alloc(sizeof(struct _msrp_conversation_info)); - if (!p_conv_packet_data) - { - return; - } memcpy(p_conv_packet_data, p_conv_data, sizeof(struct _msrp_conversation_info)); |