Handle the case where there are no IDBs before the first non-SHB/non-IDB

block, which could be the case even in a *valid* file (consider a file
with an SHB, an NRB, an IDB, and a packet block, in that order); even if
there's no IDB before the first packet block, that should be reported to
the user as "interface N not less than interface count M", to more
precisely indicate the problem.

(Yes, the loop should probably keep going until it finds a packet block,
not just a non-IDB block.)

svn path=/trunk/; revision=41132

1 files changed, 4 insertions, 0 deletions

diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c
index c46142a988..c79a08911f 100644
--- a/wiretap/pcapng.c
+++ b/wiretap/pcapng.c
@@ -1632,6 +1632,10 @@ pcapng_open(wtap *wth, int *err, gchar **err_info)
 	while(1){
 		bytes_read = pcapng_read_block(wth->fh, FALSE, &pn, &wblock, err, err_info);
 		wth->data_offset += bytes_read;
+		if (bytes_read == 0) {
+			pcapng_debug0("No more IDBs available...");
+			break;
+		}
 		if (bytes_read <= 0) {
 			pcapng_debug0("pcapng_open: couldn't read IDB");
 			*err = file_error(wth->fh, err_info);