[interchange-cvs] interchange - racke modified 2 files

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2008-04-25 09:08:03 GMT
Modified:  .        WHATSNEW-5.5
Modified:  lib/Vend Dispatch.pm
Log:
Avoid crash on non-hashes in Filter directive. Logging isn't enough
to catch bad data.

Revision  Changes    Path
1.111                interchange/WHATSNEW-5.5


rev 1.111, prev_rev 1.110
Index: WHATSNEW-5.5
===================================================================
RCS file: /var/cvs/interchange/WHATSNEW-5.5,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- WHATSNEW-5.5	24 Apr 2008 09:10:57 -0000	1.110
+++ WHATSNEW-5.5	25 Apr 2008 09:08:03 -0000	1.111
@@ -267,6 +267,8 @@
 * During compilation of custom routines, keep warnings and errors separated
   from valid Perl that doesn't resolve to a sub ref.
 
+* Avoid crash on non-hashes in Filter directive.
+
 Tags
 ----
 



1.101                interchange/lib/Vend/Dispatch.pm


rev 1.101, prev_rev 1.100
Index: Dispatch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Dispatch.pm,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Dispatch.pm	22 Apr 2008 18:54:09 -0000	1.100
+++ Dispatch.pm	25 Apr 2008 09:08:03 -0000	1.101
@@ -1,6 +1,6 @@
 # Vend::Dispatch - Handle Interchange page requests
 #
-# $Id: Dispatch.pm,v 1.100 2008-04-22 18:54:09 jon Exp $
+# $Id: Dispatch.pm,v 1.101 2008-04-25 09:08:03 racke Exp $
 #
 # Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 2002 Mike Heins <mike at perusion.net>
@@ -26,7 +26,7 @@
 package Vend::Dispatch;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 1.100 $, 10);
+$VERSION = substr(q$Revision: 1.101 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -1545,6 +1545,7 @@
 		next unless $macro;
 		if (ref($macro) ne 'HASH') {
 			logError("Bad CGI filter '%s'", $macro);
+			next;
 		}
 		for(keys %$macro) {
 			Vend::Interpolate::input_filter_do($_, { op => $macro->{$_} } );