diff options
| author | Dario Lombardo <lomato@gmail.com> | 2019-03-05 17:25:24 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-03-15 15:38:23 +0000 |
| commit | 134a513dd59315d67866f238459fdee6347f1055 (patch) | |
| tree | af02f9432d8adfe85be9a8c1881a330b25f3b04a /wiretap/netscaler.c | |
| parent | a152753aa929deda21b797f93848c369a68b9465 (diff) | |
netscaler: add more sanity checks.
Fix more crashes found in the provided bug report.
Bug: 15497
Change-Id: If84498fa879ad56c8677f8c1442a8dc0e5906003
Reviewed-on: https://code.wireshark.org/review/32333
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'wiretap/netscaler.c')
| -rw-r--r-- | wiretap/netscaler.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index 1c669ea6d5..687b5ac1c5 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -928,6 +928,8 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len) switch (nspr_getv##ver##recordtype(fp))\ {\ case NSPR_ABSTIME_V##ver:\ + if (!nstrace_ensure_buflen(nstrace, nstrace_buf_offset, sizeof(nspr_abstime_v##ver##_t), err, err_info))\ + return FALSE;\ ns_setabstime(nstrace, pletoh32(&((nspr_abstime_v##ver##_t *) fp)->abs_Time), pletoh16(&((nspr_abstime_v##ver##_t *) fp)->abs_RelTime));\ nstrace->nstrace_buf_offset = nstrace_buf_offset + nspr_getv##ver##recordsize(fp);\ nstrace->nstrace_buflen = nstrace_buflen;\ @@ -1320,6 +1322,8 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 * case NSPR_RELTIME_V20: { + if (!nstrace_ensure_buflen(nstrace, nstrace_buf_offset, sizeof(nspr_hd_v20_t), err, err_info)) + return FALSE; nspr_pktracefull_v20_t *fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset]; if (nspr_getv20recordsize((nspr_hd_v20_t *)fp20) == 0) { *err = WTAP_ERR_BAD_FILE; |