diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2006-03-11 11:48:35 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2006-03-11 11:48:35 +0000 |
| commit | 9ed9299e17df66a5185e7672eaa1bf2db108665d (patch) | |
| tree | e50c08049e1fa364d2292373230e16867466b89e /wiretap | |
| parent | 40f5303a8eddd8bd02c01ee78ee47e1d9bc9fc97 (diff) | |
| download | wireshark-9ed9299e17df66a5185e7672eaa1bf2db108665d.tar.gz wireshark-9ed9299e17df66a5185e7672eaa1bf2db108665d.tar.bz2 wireshark-9ed9299e17df66a5185e7672eaa1bf2db108665d.zip | |
Remove an entire horde of off-by-one errors pointed out by Coverity's CID: 83
(Coverity finds just one at a time...)
svn path=/trunk/; revision=17580
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netxray.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 7d1644b3ec..c6f08a5b92 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -496,7 +496,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) break; case ETH_CAPTYPE_GIGPOD: - if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_GIGPOD + if (hdr.timeunit >= NUM_NETXRAY_TIMEUNITS_GIGPOD || TpS_gigpod[hdr.timeunit] == 0.0) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf( @@ -516,7 +516,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) break; case ETH_CAPTYPE_OTHERPOD: - if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_OTHERPOD + if (hdr.timeunit >= NUM_NETXRAY_TIMEUNITS_OTHERPOD || TpS_otherpod[hdr.timeunit] == 0.0) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf( @@ -536,7 +536,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) break; case ETH_CAPTYPE_OTHERPOD2: - if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_OTHERPOD2 + if (hdr.timeunit >= NUM_NETXRAY_TIMEUNITS_OTHERPOD2 || TpS_otherpod2[hdr.timeunit] == 0.0) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf( @@ -558,7 +558,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) break; case ETH_CAPTYPE_GIGPOD2: - if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS_GIGPOD2 + if (hdr.timeunit >= NUM_NETXRAY_TIMEUNITS_GIGPOD2 || TpS_gigpod2[hdr.timeunit] == 0.0) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf( @@ -579,7 +579,7 @@ int netxray_open(wtap *wth, int *err, gchar **err_info) break; default: - if (hdr.timeunit > NUM_NETXRAY_TIMEUNITS) { + if (hdr.timeunit >= NUM_NETXRAY_TIMEUNITS) { *err = WTAP_ERR_UNSUPPORTED; *err_info = g_strdup_printf( "netxray: Unknown timeunit %u for %u/%u version %.8s capture", |