From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Fri, 24 Jul 2009 09:14:29 +0000 (+0000)
Subject: wrap json deserialize into eval so we don't die on corrupt data
X-Git-Url: http://git.rot13.org/?p=webpac2;a=commitdiff_plain;h=09c9db404e5fa3fefa5e71018b51fa0841cc5ab7

wrap json deserialize into eval so we don't die on corrupt data


git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1248 07558da8-63fa-0310-ba24-9fe276d99e06
---

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 96cfb85..7c32a6e 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -282,9 +282,14 @@ if ( my $search = param('search') ) {
 
 		while ( my $result = $swish_results->next_result ) {
 
-			my $data = from_json( $result->property('data'), {utf8 => 1} );
-
+			my $data = $result->property('data');
 			dump_yaml( 'data', $data );
+			# FIXME if we produce valid json we shouldn't need eval here!
+			eval { $data = from_json( $data, {utf8 => 1} ); };
+			if ( $@ ) {
+				warn "ERROR: $@ from ",dump( $data );
+				next;
+			}
 
 			my $li_class = '';
 			$li_class = qq| class="z"| if $nr % 2 == 0;