aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-opensafety.c6
-rw-r--r--wiretap/netmon.c3
2 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c
index f8d80f4a47..c0e046402d 100644
--- a/epan/dissectors/packet-opensafety.c
+++ b/epan/dissectors/packet-opensafety.c
@@ -545,10 +545,10 @@ static gboolean findSafetyFrame ( tvbuff_t *message_tvb, guint u_Offset, gboolea
guint *u_frameOffset, guint *u_frameLength, opensafety_packet_info *packet )
{
guint ctr, rem_length;
- guint16 crc, f2crc, calcCrc;
- guint8 b_Length, b_CTl, crcOffset, crc1Type;
+ guint16 crc, f2crc, calcCrc = 0;
+ guint8 b_Length = 0, b_CTl = 0, crcOffset = 0, crc1Type = 0;
guint8 *bytes;
- guint b_ID;
+ guint b_ID = 0;
gboolean found;
found = FALSE;
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 02d1747a1a..466c87affc 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -1056,6 +1056,9 @@ netmon_process_record(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
case 0xE088:
pkt_encap = WTAP_ENCAP_MA_WFP_CAPTURE_AUTH_V6;
break;
+ default:
+ pkt_encap = WTAP_ENCAP_UNKNOWN;
+ break;
}
} else if ((network & 0xF000) == NETMON_NET_PCAP_BASE) {
/*