aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2018-02-07 10:20:50 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2018-02-07 09:22:53 +0000
commit28960d79cca262ac6b974f339697b299a1e28fef (patch)
tree620f34d8d9efe01f5bb7ba0ab9975de95abb49cf /wiretap
parent7ee8ead85cbde1724b672f7723eadaeeebf8e4be (diff)
netmon: Initialize struct netmonrec_comment on alloc
This avoids an illegal pointer to free() on error. Bug: 14397 Change-Id: Id6e535141c7a3ee7b3d1822875b571e2199a5387 Reviewed-on: https://code.wireshark.org/review/25660 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/netmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/netmon.c b/wiretap/netmon.c
index 63ebb6909c..d9b258bd58 100644
--- a/wiretap/netmon.c
+++ b/wiretap/netmon.c
@@ -534,7 +534,7 @@ wtap_open_return_val netmon_open(wtap *wth, int *err, gchar **err_info)
return WTAP_OPEN_ERROR;
}
- comment_rec = g_new(struct netmonrec_comment, 1);
+ comment_rec = g_new0(struct netmonrec_comment, 1);
comment_rec->numFramePerComment = pletoh32(&comment_header.numFramePerComment);
comment_rec->frameOffset = pletoh32(&comment_header.frameOffset);
comment_rec->titleLength = pletoh32(&comment_header.titleLength);