4987763d14
fix bug #688109 & #685023 OBS-URL: https://build.opensuse.org/request/show/69943 OBS-URL: https://build.opensuse.org/package/show/network:utilities/wireshark?expand=0&rev=39
19 lines
664 B
Diff
19 lines
664 B
Diff
--- trunk-1.4/epan/dissectors/packet-dect.c 2011/04/14 16:17:09 36643
|
|
+++ trunk-1.4/epan/dissectors/packet-dect.c 2011/04/14 17:17:08 36644
|
|
@@ -1882,10 +1882,13 @@
|
|
pkt_afield.RCRC=(((guint16)pkt_ptr[6])<<8)|pkt_ptr[7];
|
|
|
|
/* fill B-Field */
|
|
- if(pkt_len>DECT_PACKET_INFO_LEN+2)
|
|
+ if(pkt_len>DECT_PACKET_INFO_LEN+2) {
|
|
+ if (pkt_len > 128+5+8)
|
|
+ pkt_len = 128+5+8; /* make these values into logical #defines */
|
|
memcpy((char*)(&(pkt_bfield.Data)), (char*)(pkt_ptr+8), pkt_len-5-8);
|
|
- else
|
|
+ } else {
|
|
memset((char*)(&(pkt_bfield.Data)), 0, 128);
|
|
+ }
|
|
pkt_bfield.Length=pkt_len-DECT_PACKET_INFO_LEN-8;
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT");
|