From c7bb724eb31f848e3d6f78fdcee5ee70ab0516ac Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Mon, 12 Dec 2005 10:38:40 +0000
Subject: [PATCH] =?utf8?q?Bug=20319089:=20editkeywords.cgi=20throws=20an?=
 =?utf8?q?=20error=20when=20action=3D"edit"=20or=20"delete"=20and=20the=20?=
 =?utf8?q?"id"=20parameter=20is=20invalid=20-=20Patch=20by=20Fr=C3=A9d?=
 =?utf8?q?=C3=A9ric=20Buclin=20<LpSolit@gmail.com>=20r=3Dwicked=20a=3Djust?=
 =?utf8?q?dave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 editkeywords.cgi | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/editkeywords.cgi b/editkeywords.cgi
index da412bfdc6..5397f0aa57 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -53,6 +53,14 @@ sub Validate {
     $_[1] = $description;
 }
 
+sub ValidateKeyID {
+    my $id = shift;
+
+    $id = trim($id || 0);
+    detaint_natural($id) || ThrowCodeError('invalid_keyword_id');
+    return $id;
+}
+
 
 #
 # Preliminary checks:
@@ -165,8 +173,7 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'edit') {
-    my $id = trim($cgi->param('id'));
-    detaint_natural($id);
+    my $id = ValidateKeyID(scalar $cgi->param('id'));
 
     # get data of keyword
     my ($name, $description) =
@@ -201,8 +208,7 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    my $id = $cgi->param('id');
-    detaint_natural($id);
+    my $id = ValidateKeyID(scalar $cgi->param('id'));
 
     my $name  = trim($cgi->param('name') || '');
     my $description  = trim($cgi->param('description')  || '');
@@ -234,8 +240,7 @@ if ($action eq 'update') {
 
 
 if ($action eq 'delete') {
-    my $id = $cgi->param('id');
-    detaint_natural($id);
+    my $id = ValidateKeyID(scalar $cgi->param('id'));
 
     my $name = $dbh->selectrow_array('SELECT name FROM keyworddefs
                                       WHERE id= ?', undef, $id);
-- 
2.47.2