Blame SOURCES/wireshark-1.10.6-CVE-2014-2282.patch
|
 |
6415a4 |
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
|
|
|
6415a4 |
index 5ad56a3..f0f96dc 100644
|
|
|
6415a4 |
--- a/epan/dissectors/packet-m3ua.c
|
|
|
6415a4 |
+++ b/epan/dissectors/packet-m3ua.c
|
|
|
6415a4 |
@@ -39,7 +39,7 @@
|
|
|
6415a4 |
#include <epan/packet.h>
|
|
|
6415a4 |
#include <epan/prefs.h>
|
|
|
6415a4 |
#include <epan/sctpppids.h>
|
|
|
6415a4 |
-#include <epan/emem.h>
|
|
|
6415a4 |
+#include <epan/wmem/wmem.h>
|
|
|
6415a4 |
#include "packet-mtp3.h"
|
|
|
6415a4 |
#include "packet-sccp.h"
|
|
|
6415a4 |
#include "packet-frame.h"
|
|
|
6415a4 |
@@ -1160,12 +1160,14 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro
|
|
|
6415a4 |
guint16 ulp_length;
|
|
|
6415a4 |
tvbuff_t *payload_tvb;
|
|
|
6415a4 |
proto_item *item, *gen_item;
|
|
|
6415a4 |
- mtp3_tap_rec_t* mtp3_tap = ep_new0(mtp3_tap_rec_t);
|
|
|
6415a4 |
+ mtp3_tap_rec_t* mtp3_tap;
|
|
|
6415a4 |
proto_tree *q708_tree;
|
|
|
6415a4 |
gint heuristic_standard;
|
|
|
6415a4 |
guint8 si;
|
|
|
6415a4 |
guint32 opc, dpc;
|
|
|
6415a4 |
|
|
|
6415a4 |
+ mtp3_tap = wmem_new0(pinfo->pool, mtp3_tap_rec_t);
|
|
|
6415a4 |
+
|
|
|
6415a4 |
si = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET);
|
|
|
6415a4 |
ulp_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH - DATA_HDR_LENGTH;
|
|
|
6415a4 |
payload_tvb = tvb_new_subset(parameter_tvb, DATA_ULP_OFFSET, ulp_length, ulp_length);
|