aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rtps2.c
diff options
context:
space:
mode:
authorstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-25 11:47:39 +0000
committerstig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>2010-01-25 11:47:39 +0000
commit7d94bb0087c7583ca434b557cfcbd13ce5832032 (patch)
tree03dd1faf270372972f7c1da1e0b81875d16eae54 /epan/dissectors/packet-rtps2.c
parente967b6185bd635a2feb98b3d9b2d5619f62b225e (diff)
From Didier Gautheron via bug 4419:
se_alloc and ep_alloc never return NULL and se_alloc0 already initialized data with 0. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31654 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rtps2.c')
-rw-r--r--epan/dissectors/packet-rtps2.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index f7dd5a0892..2b52004f3c 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -8248,23 +8248,7 @@ static void dissect_RTPS_DATA_BATCH(tvbuff_t *tvb,
sample_info_max = 1024; /* Max size of sampleInfo shown */
}
sample_info_flags = (guint16 *)ep_alloc(sizeof(guint16) * sample_info_max);
- if (sample_info_flags == NULL) {
- proto_tree_add_text(tree,
- tvb,
- offset,
- 2,
- "out of memory allocating sample_info_flags");
- return;
- }
sample_info_length = (guint32 *)ep_alloc(sizeof(guint32) * sample_info_max);
- if (sample_info_length == NULL) {
- proto_tree_add_text(tree,
- tvb,
- offset,
- 2,
- "out of memory allocating sample_info_length");
- return;
- }
/* Sample Info List: start decoding the sample info list until the offset
* is greater or equal than 'sampleListOffset' */