aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorMartin Mathieson <martin.r.mathieson@googlemail.com>2012-04-25 22:54:45 +0000
committerMartin Mathieson <martin.r.mathieson@googlemail.com>2012-04-25 22:54:45 +0000
commite74d2fd9dbe262bb23481bf04549de4ebfdd304d (patch)
tree2a7e4208d8a2fb5097491333237e9634acdd7ded /wiretap
parente94974887cd9ae46c6840d987b7131b4ecde4e59 (diff)
Return 0 if doesn't match signature of vwr files.
Pointed out by Martin Kaiser in bug 7196. svn path=/trunk/; revision=42248
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/vwr.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/wiretap/vwr.c b/wiretap/vwr.c
index f855a04c81..e77bdeed5b 100644
--- a/wiretap/vwr.c
+++ b/wiretap/vwr.c
@@ -615,8 +615,10 @@ int vwr_open(wtap *wth, int *err, gchar **err_info _U_)
*err = 0;
fpgaVer = vwr_get_fpga_version(wth, err, err_info);
- if ((*err != 0) || (fpgaVer == UNKNOWN_FPGA))
- return (-1);
+ if ((*err != 0) || (fpgaVer == UNKNOWN_FPGA)) {
+ return 0; /* not a VWR file */
+ }
+
FPGA_VERSION = fpgaVer;
/* set the local module options first (this is a WLAN capture) */
setup_defaults(fpgaVer);