| author | Michael Krelin <hacker@klever.net> | 2009-09-01 19:59:38 (UTC) |
|---|---|---|
| committer | Michael Krelin <hacker@klever.net> | 2009-09-01 19:59:38 (UTC) |
| commit | da3fe98e5c75940135fcd9bb45b36eed62d8b4dc (patch) (side-by-side diff) | |
| tree | eda546a705a667dd1b62f7eee481b3087fbfdf27 | |
| parent | 34d57b6b55b51e4b489a4cafce8874dec558b600 (diff) | |
| download | libopkele-da3fe98e5c75940135fcd9bb45b36eed62d8b4dc.zip libopkele-da3fe98e5c75940135fcd9bb45b36eed62d8b4dc.tar.gz libopkele-da3fe98e5c75940135fcd9bb45b36eed62d8b4dc.tar.bz2 | |
fixed normalization for the single-character trailing component
Thanks Hiroyuki ARAKI for spotting the bug and providing the fix
Signed-off-by: Michael Krelin <hacker@klever.net>
| -rw-r--r-- | lib/util.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.cc b/lib/util.cc index 249eeed..4028697 100644 --- a/lib/util.cc +++ b/lib/util.cc @@ -363,25 +363,25 @@ namespace opkele { throw bad_input(OPKELE_CP_ "Invalid percent-encoded character in URI being normalized"); int cc = strtol(tmp,0,16); if( isalpha(cc) || isdigit(cc) || strchr("._~-",cc) ) pseg += (char)cc; else{ pseg += '%'; pseg += (char)toupper(tmp[0]); pseg += (char)toupper(tmp[1]); } }else if(qf) { rv += pseg; rv += c; pseg.clear(); }else if(n>=ul || strchr("?/#",c)) { - if(pseg.empty() || pseg==".") { + if( (unsafe!=string::npos && pseg.empty()) || pseg==".") { }else if(pseg=="..") { if(psegs.size()>1) { rv.resize(psegs.top()); psegs.pop(); } }else{ psegs.push(rv.length()); if(c!='/') { pseg += c; qf = true; } rv += '/'; rv += pseg; } |