Add missing checks for a too-large packet, so we don't blow up trying to

allocate a huge buffer.

svn path=/trunk/; revision=40170

1 files changed, 11 insertions, 0 deletions

diff --git a/wiretap/nettl.c b/wiretap/nettl.c
index fe6217915e..e265b45da9 100644
--- a/wiretap/nettl.c
+++ b/wiretap/nettl.c
@@ -318,6 +318,17 @@ static gboolean nettl_read(wtap *wth, int *err, gchar **err_info,
     }
     wth->data_offset += ret;
 
+    if (wth->phdr.caplen > WTAP_MAX_PACKET_SIZE) {
+	/*
+	 * Probably a corrupt capture file; don't blow up trying
+	 * to allocate space for an immensely-large packet.
+	 */
+	*err = WTAP_ERR_BAD_RECORD;
+	*err_info = g_strdup_printf("nettl: File has %u-byte packet, bigger than maximum of %u",
+	    wth->phdr.caplen, WTAP_MAX_PACKET_SIZE);
+	return FALSE;
+    }
+
     /*
      * If the per-file encapsulation isn't known, set it to this
      * packet's encapsulation.