summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/cgi/session.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 98d38cba10..6299113c0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 24 14:40:16 2004 Shugo Maeda <shugo@ruby-lang.org>
+
+ * lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
+ session id after check. (backported from HEAD)
+
Tue Aug 24 09:09:01 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
diff --git a/lib/cgi/session.rb b/lib/cgi/session.rb
index 0bc10d013f..a5afb7e3e1 100644
--- a/lib/cgi/session.rb
+++ b/lib/cgi/session.rb
@@ -364,7 +364,7 @@ class CGI
unless check_id(id)
raise ArgumentError, "session_id `%s' is invalid" % id
end
- @path = dir+"/"+prefix+id
+ @path = dir+"/"+prefix+id.dup.untaint
unless File::exist? @path
@hash = {}
end