From bf3bed483a99de893b276ef11fafe05c4b0bcec3 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 9 Aug 2019 10:17:41 +0000 Subject: [PATCH] Bug 16219: (QA follow-up) Tiny regex change The parameter <<>> does not work. There should be text inside. The construction .*? does not look good completely. Replacing it by the stricter [^>]+ So, no greater than's and at least one. Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize (cherry picked from commit e66ccaa3a7743378f906612562889a9476bf6802) Signed-off-by: Fridolin Somers --- misc/cronjobs/runreport.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl index 89ef2154c1..6732afae9c 100755 --- a/misc/cronjobs/runreport.pl +++ b/misc/cronjobs/runreport.pl @@ -265,7 +265,7 @@ foreach my $report_id (@ARGV) { } # convert SQL parameters to placeholders - my $params_needed = ( $sql =~ s/(<<.*?>>)/\?/g ); + my $params_needed = ( $sql =~ s/(<<[^>]+>>)/\?/g ); die("You supplied ". scalar @params . " parameter(s) and $params_needed are required by the report") if scalar @params != $params_needed; my ($sth) = execute_query( $sql, undef, undef, \@params, $report_id ); -- 2.39.5