Don't write out packets that have a "captured length" bigger than we're

willing to read or that's bigger than will fit in the file format;
instead, report an error.

For the "I can't write a packet of that type in that file type" error,
report the file type in question.

svn path=/trunk/; revision=54882

1 files changed, 6 insertions, 0 deletions

diff --git a/wiretap/5views.c b/wiretap/5views.c
index 5ff61101dc..c43fb35c8d 100644
--- a/wiretap/5views.c
+++ b/wiretap/5views.c
@@ -372,6 +372,12 @@ static gboolean _5views_dump(wtap_dumper *wdh,
 	_5views_dump_t *_5views = (_5views_dump_t *)wdh->priv;
 	t_5VW_TimeStamped_Header HeaderFrame;
 
+	/* Don't write out something bigger than we can read. */
+	if (phdr->caplen > WTAP_MAX_PACKET_SIZE) {
+		*err = WTAP_ERR_PACKET_TOO_LARGE;
+		return FALSE;
+	}
+
 	/* Frame Header */
 	/* constant fields */
 	HeaderFrame.Key = GUINT32_TO_LE(CST_5VW_RECORDS_HEADER_KEY);