From 477185a38715414928fe691f5c88ae6b05b15c5f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 18 Apr 2012 02:48:23 +0000 Subject: If we see a 5View time-stamped header with a bad key, make sure we return the right error code and information string. InfoVista bought Accellent Group, and, at least according to the InfoVista Web site, it's "5View", not "5Views". svn path=/trunk/; revision=42119 --- wiretap/5views.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'wiretap/5views.c') diff --git a/wiretap/5views.c b/wiretap/5views.c index 90e2e75f1a..1ad604204f 100644 --- a/wiretap/5views.c +++ b/wiretap/5views.c @@ -223,8 +223,12 @@ _5views_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset) wth->data_offset += bytes_read; TimeStamped_Header.Key = pletohl(&TimeStamped_Header.Key); - if(TimeStamped_Header.Key != CST_5VW_RECORDS_HEADER_KEY) + if(TimeStamped_Header.Key != CST_5VW_RECORDS_HEADER_KEY) { + *err = WTAP_ERR_BAD_FILE; + *err_info = g_strdup_printf("5views: Time-stamped header has bad key value 0x%08X", + TimeStamped_Header.Key); return FALSE; + } TimeStamped_Header.RecSubType = pletohl(&TimeStamped_Header.RecSubType); -- cgit v1.2.1