From: "堀川 久" Date: 2004-07-10T13:56:37+09:00 Subject: [ruby-dev:23876] cgi, cgi/session This is a multi-part message in MIME format. --------=_1089435372.644.640 Content-Type: text/plain; charset=ISO-2022-JP こんにちは。 次の点を修正するパッチを書きました。よろしかったら取り入れてください。 　・Session#delete()がエラーになることがある 　・妥当性を確認せずにuntaintするのはどうかと ・空のフォームデータでエラーになることがある 　・CGI#[]をもっとシンプルに read_multipart()は、きちんと書き直したほうがよさそうですが、単にエラー 回避のコードを足しました。 CGI#[]は、変なものを返されたら本当に困ります。 よろしくお願いします。 -- HORIKAWA Hisashi (in Kanji: 堀川 久) Netsphere Laboratories http://www.nslabs.jp/ --------=_1089435372.644.640 Content-Type: application/octet-stream; name="ruby-1.8.2-20040708-q1.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="ruby-1.8.2-20040708-q1.diff" ZGlmZiAtTmF1ciBydWJ5LTEuOC4yLTIwMDQwNzA4Lm9yaWcvbGliL2NnaS9z ZXNzaW9uLnJiIHJ1YnktMS44LjItMjAwNDA3MDgtY3VyL2xpYi9jZ2kvc2Vz c2lvbi5yYgotLS0gcnVieS0xLjguMi0yMDA0MDcwOC5vcmlnL2xpYi9jZ2kv c2Vzc2lvbi5yYgkyMDA0LTA1LTIwIDEzOjI4OjM2LjAwMDAwMDAwMCArMDkw MAorKysgcnVieS0xLjguMi0yMDA0MDcwOC1jdXIvbGliL2NnaS9zZXNzaW9u LnJiCTIwMDQtMDctMTAgMTM6NDU6NDUuMzU0Mjg2ODgwICswOTAwCkBAIC0z NjUsNyArMzY1LDYgQEAKIAkgIHJhaXNlIEFyZ3VtZW50RXJyb3IsICJzZXNz aW9uX2lkIGAlcycgaXMgaW52YWxpZCIgJSBpZAogCWVuZAogCUBwYXRoID0g ZGlyKyIvIitwcmVmaXgraWQKLQlAcGF0aC51bnRhaW50CiAJdW5sZXNzIEZp bGU6OmV4aXN0PyBAcGF0aAogCSAgQGhhc2ggPSB7fQogCWVuZApAQCAtNDEz LDcgKzQxMiwxMCBAQAogCiAgICAgICAjIENsb3NlIGFuZCBkZWxldGUgdGhl IHNlc3Npb24ncyBGaWxlU3RvcmUgZmlsZS4KICAgICAgIGRlZiBkZWxldGUK LQlGaWxlOjp1bmxpbmsgQHBhdGgKKyAgICAgICAgYmVnaW4KKyAgICAgICAg ICBGaWxlOjp1bmxpbmsgQHBhdGgKKyAgICAgICAgcmVzY3VlIEVycm5vOjpF Tk9FTlQKKyAgICAgICAgZW5kCiAgICAgICBlbmQKICAgICBlbmQKIApkaWZm IC1OYXVyIHJ1YnktMS44LjItMjAwNDA3MDgub3JpZy9saWIvY2dpLnJiIHJ1 YnktMS44LjItMjAwNDA3MDgtY3VyL2xpYi9jZ2kucmIKLS0tIHJ1YnktMS44 LjItMjAwNDA3MDgub3JpZy9saWIvY2dpLnJiCTIwMDQtMDUtMjcgMTY6NTA6 MDQuMDAwMDAwMDAwICswOTAwCisrKyBydWJ5LTEuOC4yLTIwMDQwNzA4LWN1 ci9saWIvY2dpLnJiCTIwMDQtMDctMTAgMTM6NDI6MDkuMjY4MTM2OTY4ICsw OTAwCkBAIC05NzEsMTEgKzk3MSwxMiBAQAogCiAgICAgICAjIHN0YXJ0IG11 bHRpcGFydC9mb3JtLWRhdGEKICAgICAgIHN0ZGlucHV0LmJpbm1vZGUgaWYg ZGVmaW5lZD8gc3RkaW5wdXQuYmlubW9kZQotICAgICAgYm91bmRhcnlfc2l6 ZSA9IGJvdW5kYXJ5LnNpemUgKyBFT0wuc2l6ZQotICAgICAgY29udGVudF9s ZW5ndGggLT0gYm91bmRhcnlfc2l6ZQotICAgICAgc3RhdHVzID0gc3RkaW5w dXQucmVhZChib3VuZGFyeV9zaXplKQorICAgICAgY29udGVudF9sZW5ndGgg LT0gYm91bmRhcnkuc2l6ZSArIDIKKyAgICAgIHN0YXR1cyA9IHN0ZGlucHV0 LnJlYWQoYm91bmRhcnkuc2l6ZSArIDIpCiAgICAgICBpZiBuaWwgPT0gc3Rh dHVzCiAgICAgICAgIHJhaXNlIEVPRkVycm9yLCAibm8gY29udGVudCBib2R5 IgorICAgICAgZWxzaWYgc3RhdHVzID09IGJvdW5kYXJ5ICsgIi0tIgorICAg ICAgICByZXR1cm4gcGFyYW1zCiAgICAgICBlbHNpZiBib3VuZGFyeSArIEVP TCAhPSBzdGF0dXMKICAgICAgICAgcmFpc2UgRU9GRXJyb3IsICJiYWQgY29u dGVudCBib2R5IgogICAgICAgZW5kCkBAIC0xMTI1LDM3ICsxMTI2LDEyIEBA CiAgICAgICBAbXVsdGlwYXJ0CiAgICAgZW5kCiAKLSAgICBjbGFzcyBWYWx1 ZSA8IERlbGVnYXRlQ2xhc3MoU3RyaW5nKSAgICAjIDpub2RvYzoKLSAgICAg IGRlZiBpbml0aWFsaXplKHN0ciwgcGFyYW1zKQotICAgICAgICBAcGFyYW1z ID0gcGFyYW1zCi0gICAgICAgIHN1cGVyKHN0cikKLSAgICAgIGVuZAotICAg ICAgZGVmIFtdKGlkeCwgKmFyZ3MpCi0gICAgICAgIGlmIGFyZ3Muc2l6ZSA9 PSAwCi0gICAgICAgICAgd2FybiAiI3tjYWxsZXIoMSlbMF19OkNBVVRJT04h IGNnaVsna2V5J10gPT0gY2dpLnBhcmFtc1sna2V5J11bMF07IGlmIHdhbnQg QXJyYXksIHVzZSBjZ2kucGFyYW1zWydrZXknXSIKLSAgICAgICAgICBzZWxm Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICBzZWxmLnRvX3NbaWR4LCphcmdz XQotICAgICAgICBlbmQKLSAgICAgIGVuZAotICAgICAgZGVmIGZpcnN0Ci0g ICAgICAgIHdhcm4gIiN7Y2FsbGVyKDEpWzBdfTpDQVVUSU9OISBjZ2lbJ2tl eSddID09IGNnaS5wYXJhbXNbJ2tleSddWzBdOyBpZiB3YW50IEFycmF5LCB1 c2UgY2dpLnBhcmFtc1sna2V5J10iCi0gICAgICAgIHNlbGYKLSAgICAgIGVu ZAotICAgICAgYWxpYXMgbGFzdCBmaXJzdAotICAgICAgZGVmIHRvX2EKLSAg ICAgICAgQHBhcmFtcyB8fCBbc2VsZl0KLSAgICAgIGVuZAotICAgICAgYWxp YXMgdG9fYXJ5IHRvX2EgICAJIyB0byBiZSByaHMgb2YgbXVsdGlwbGUgYXNz aWdubWVudAotICAgIGVuZAotCiAgICAgIyBHZXQgdGhlIHZhbHVlIGZvciB0 aGUgcGFyYW1ldGVyIHdpdGggYSBnaXZlbiBrZXkuCiAgICAgIwogICAgICMg SWYgdGhlIHBhcmFtZXRlciBoYXMgbXVsdGlwbGUgdmFsdWVzLCBvbmx5IHRo ZSBmaXJzdCB3aWxsIGJlIAogICAgICMgcmV0cmlldmVkOyB1c2UgI3BhcmFt cygpIHRvIGdldCB0aGUgYXJyYXkgb2YgdmFsdWVzLgogICAgIGRlZiBbXShr ZXkpCi0gICAgICBwYXJhbXMgPSBAcGFyYW1zW2tleV0KLSAgICAgIHZhbHVl ID0gcGFyYW1zWzBdCisgICAgICB2YWx1ZSA9IEBwYXJhbXNba2V5XS5maXJz dAogICAgICAgaWYgQG11bHRpcGFydAogICAgICAgICBpZiB2YWx1ZQogICAg ICAgICAgIHJldHVybiB2YWx1ZQpAQCAtMTE2NSw3ICsxMTQxLDcgQEAKICAg ICAgICAgICBUZW1wZmlsZS5uZXcoIkNHSSIpCiAgICAgICAgIGVuZAogICAg ICAgZWxzZQotICAgICAgICBWYWx1ZS5uZXcodmFsdWUgfHwgIiIsIHBhcmFt cykKKyAgICAgICAgdmFsdWUgfHwgIiIKICAgICAgIGVuZAogICAgIGVuZAog Cg== --------=_1089435372.644.640--