Commit 623aee25 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com

Bug 340253: .cgi scripts should call Throw*Error() instead of die() - Patch by…

Bug 340253: .cgi scripts should call Throw*Error() instead of die() - Patch by Frédéric Buclin <LpSolit@gmail.com> r=vladd a=justdave
parent 1a18e5fc
......@@ -1890,8 +1890,7 @@ foreach my $id (@idlist) {
shift @oldlist;
} else {
if ($oldlist[0] != $newlist[0]) {
$dbh->bz_unlock_tables(UNLOCK_ABORT);
die "Error in list comparing code";
ThrowCodeError('list_comparison_error');
}
shift @oldlist;
shift @newlist;
......
......@@ -232,7 +232,8 @@ sub chart_image_name {
# and number
if ($datasets !~ m/^[A-Za-z0-9:]+$/) {
die "Invalid datasets $datasets";
$vars->{'datasets'} = $datasets;
ThrowUserError('invalid_datasets', $vars);
}
# Since we pass the tests, consider it OK
......
......@@ -193,6 +193,9 @@
The series_id [% series_id FILTER html %] is not valid. It may be that
this series has been deleted.
[% ELSIF error == "list_comparison_error" %]
Unexpected error in list comparing code.
[% ELSIF error == "mismatched_bug_ids_on_obsolete" %]
Attachment [% attach_id FILTER html %] ([% description FILTER html %])
is attached to [% terms.bug %] [%+ attach_bug_id FILTER html %],
......
......@@ -696,6 +696,11 @@
The context [% context FILTER html %] is invalid (must be a number,
"file" or "patch").
[% ELSIF error == "invalid_datasets" %]
[% title = "Invalid Datasets" %]
Invalid datasets <em>[% datasets FILTER html %]</em>. Only digits,
letters and colons are allowed.
[% ELSIF error == "invalid_format" %]
[% title = "Invalid Format" %]
The format "[% format FILTER html %]" is invalid (must be one of
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment