Bug 238802 : Input filter for integer sort key gives bad error output

Patch by Frederic Buclin <LpSolit@gmail.com>  r=mkanat  a=justdave

diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index c28fda4babf97ae444cce83d7bbf6167df78528e..9c14219d20db35b2d1779a5e807fcfcfc0feebd9 100755 (executable)
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -445,8 +445,10 @@ sub deactivate {
 ################################################################################
 
 sub validateID {
+    # $::FORM{'id'} is destroyed if detaint_natural fails.
+    my $flagtype_id = $::FORM{'id'};
     detaint_natural($::FORM{'id'})
-      || ThrowCodeError("flag_type_id_invalid", { id => $::FORM{'id'} });
+      || ThrowCodeError("flag_type_id_invalid", { id => $flagtype_id });
 
     SendSQL("SELECT 1 FROM flagtypes WHERE id = $::FORM{'id'}");
     FetchOneColumn()
@@ -499,10 +501,12 @@ sub validateComponent {
 }
 
 sub validateSortKey {
+    # $::FORM{'sortkey'} is destroyed if detaint_natural fails.
+    my $sortkey = $::FORM{'sortkey'};
     detaint_natural($::FORM{'sortkey'})
       && $::FORM{'sortkey'} < 32768
       || ThrowUserError("flag_type_sortkey_invalid", 
-                        { sortkey => $::FORM{'sortkey'} });
+                        { sortkey => $sortkey });
 }
 
 sub validateTargetType {