diff options
| -rw-r--r-- | epan/crypt/airpdcap.c | 2 | ||||
| -rw-r--r-- | plugins/ethercat/packet-ethercat-datagram.c | 4 | ||||
| -rw-r--r-- | plugins/unistim/packet-unistim.c | 6 | ||||
| -rw-r--r-- | ui/gtk/sctp_byte_graph_dlg.c | 1 | ||||
| -rw-r--r-- | ui/voip_calls.c | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/epan/crypt/airpdcap.c b/epan/crypt/airpdcap.c index 52e0275937..66d9a85346 100644 --- a/epan/crypt/airpdcap.c +++ b/epan/crypt/airpdcap.c @@ -1129,7 +1129,7 @@ AirPDcapWepMng( sa->key=tmp_key; if (key!=NULL) { - memcpy(key, &sa->key, sizeof(AIRPDCAP_KEY_ITEM)); + memcpy(key, sa->key, sizeof(AIRPDCAP_KEY_ITEM)); key->KeyType=AIRPDCAP_KEY_TYPE_WEP; } diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index cdb0ccb0c0..cd7761b49d 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -514,7 +514,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree subsize = get_cmd_len(&ecHdr); len = ecHdr.len & 0x07ff; - if ( len >= sizeof(ETHERCAT_MBOX_HEADER_LEN) && + if ( len >= ETHERCAT_MBOX_HEADER_LEN && (ecHdr.cmd==EC_CMD_TYPE_FPWR || ecHdr.cmd==EC_CMD_TYPE_FPRD || ecHdr.cmd==EC_CMD_TYPE_APWR || ecHdr.cmd==EC_CMD_TYPE_APRD) && ecHdr.anAddrUnion.a.ado>=0x1000 ) @@ -528,7 +528,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree case ETHERCAT_MBOX_TYPE_FOE: case ETHERCAT_MBOX_TYPE_COE: case ETHERCAT_MBOX_TYPE_SOE: - if ( /*pMBox->Length > 0 &&*/ mbox.Length <= 1500 /*&& pMBox->Length+sizeof(ETHERCAT_MBOX_HEADER_LEN) >= len*/ ) + if ( /*pMBox->Length > 0 &&*/ mbox.Length <= 1500 /*&& (pMBox->Length+ETHERCAT_MBOX_HEADER_LEN) >= len*/ ) { bMBox = TRUE; } diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c index d634231f41..a1b653a307 100644 --- a/plugins/unistim/packet-unistim.c +++ b/plugins/unistim/packet-unistim.c @@ -1108,8 +1108,9 @@ dissect_display_switch(proto_tree *msg_tree, hf_display_write_address_char_pos, tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)!= - DISPLAY_WRITE_ADDRESS_LINE_FLAG) + DISPLAY_WRITE_ADDRESS_LINE_FLAG){ offset+=1;msg_len-=1; + } } if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)== DISPLAY_WRITE_ADDRESS_LINE_FLAG){ @@ -1169,8 +1170,9 @@ dissect_display_switch(proto_tree *msg_tree, hf_display_write_address_char_pos, tvb,offset,1,ENC_BIG_ENDIAN); if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)!= - DISPLAY_WRITE_ADDRESS_LINE_FLAG) + DISPLAY_WRITE_ADDRESS_LINE_FLAG){ offset+=1;msg_len-=1; + } } if((address_byte&DISPLAY_WRITE_ADDRESS_LINE_FLAG)== DISPLAY_WRITE_ADDRESS_LINE_FLAG){ diff --git a/ui/gtk/sctp_byte_graph_dlg.c b/ui/gtk/sctp_byte_graph_dlg.c index c7f22a00e1..55a5bcd766 100644 --- a/ui/gtk/sctp_byte_graph_dlg.c +++ b/ui/gtk/sctp_byte_graph_dlg.c @@ -1516,7 +1516,6 @@ void create_byte_graph(guint16 dir, struct sctp_analyse* userdata) struct sctp_udata *u_data; u_data=(struct sctp_udata *)g_malloc(sizeof(struct sctp_udata)); - u_data->assoc=(sctp_assoc_info_t *)g_malloc(sizeof(sctp_assoc_info_t)); u_data->assoc=userdata->assoc; u_data->io=NULL; u_data->dir = dir; diff --git a/ui/voip_calls.c b/ui/voip_calls.c index c937b8c073..fcae969cff 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -1590,7 +1590,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, /* check if the called number match a LRQ/LCF */ if ( (strcmp(callsinfo->to_identity, tmp_listinfo->to_identity)==0) - && (memcmp(&tmp2_h323info->guid, &guid_allzero, GUID_LEN) == 0) ) { + && (memcmp(tmp2_h323info->guid, &guid_allzero, GUID_LEN) == 0) ) { /* change the call graph to the LRQ/LCF to belong to this call */ callsinfo->npackets += change_call_num_graph(tapinfo, tmp_listinfo->call_num, callsinfo->call_num); |