From 324ea8a4039f901ab6fee0d9c8ee3aa5f492eb4f Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 29 Sep 2012 13:29:52 +0200
Subject: Bug 793893: Tabular reports crash when no format parameter is defined
 r=glob a=LpSolit

---
 report.cgi | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'report.cgi')

diff --git a/report.cgi b/report.cgi
index a5d170825..5c7ec870b 100755
--- a/report.cgi
+++ b/report.cgi
@@ -117,10 +117,12 @@ $width <= 2000 || ThrowUserError("chart_too_large");
   || ThrowCodeError("invalid_dimensions");
 $height <= 2000 || ThrowUserError("chart_too_large");
 
+my $formatparam = $cgi->param('format') || '';
+
 # These shenanigans are necessary to make sure that both vertical and 
 # horizontal 1D tables convert to the correct dimension when you ask to
 # display them as some sort of chart.
-if (defined $cgi->param('format') && $cgi->param('format') eq "table") {
+if ($formatparam eq "table") {
     if ($col_field && !$row_field) {    
         # 1D *tables* should be displayed vertically (with a row_field only)
         $row_field = $col_field;
@@ -243,7 +245,7 @@ $vars->{'row_names'} = \@row_names;
 $vars->{'tbl_names'} = \@tbl_names;
 
 # Below a certain width, we don't see any bars, so there needs to be a minimum.
-if ($cgi->param('format') eq "bar") {
+if ($formatparam eq "bar") {
     my $min_width = (scalar(@col_names) || 1) * 20;
 
     if (!$cgi->param('cumulate')) {
@@ -259,8 +261,6 @@ $vars->{'query'} = $query;
 $vars->{'saved_report_id'} = $cgi->param('saved_report_id');
 $vars->{'debug'} = $cgi->param('debug');
 
-my $formatparam = $cgi->param('format');
-
 if ($action eq "wrap") {
     # So which template are we using? If action is "wrap", we will be using
     # no format (it gets passed through to be the format of the actual data),
@@ -269,7 +269,6 @@ if ($action eq "wrap") {
     # data, or images generated by calling report.cgi again with action as
     # "plot".
     $formatparam =~ s/[^a-zA-Z\-]//g;
-    trick_taint($formatparam);
     $vars->{'format'} = $formatparam;
     $formatparam = '';
 
-- 
cgit v1.2.3-24-g4f1b