summaryrefslogtreecommitdiffabout
path: root/lib/util.cc
authorMichael Krelin <hacker@klever.net>2008-09-22 20:08:35 (UTC)
committer Michael Krelin <hacker@klever.net>2008-09-22 20:08:35 (UTC)
commit4522de61114018633f66492e2e9977cdb3108098 (patch) (unidiff)
tree2af460f9269163320098476d484dee867c4e8138 /lib/util.cc
parent767b9926a3b2a2ab000415cc5d36df84dd90f13f (diff)
downloadlibopkele-4522de61114018633f66492e2e9977cdb3108098.zip
libopkele-4522de61114018633f66492e2e9977cdb3108098.tar.gz
libopkele-4522de61114018633f66492e2e9977cdb3108098.tar.bz2
A couple of bugfixes
- added missing 'return' statement to the forward_iterator_proxy operator=() - made temporary non-static for thread safety in url_decode() Thanks to Masato Kataoka of orenosv project Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (limited to 'lib/util.cc') (more/less context) (ignore whitespace changes)
-rw-r--r--lib/util.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.cc b/lib/util.cc
index a46ba2a..249eeed 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -201,32 +201,32 @@ namespace opkele {
201 }; 201 };
202 202
203 string url_encode(const string& str) { 203 string url_encode(const string& str) {
204 string rv; 204 string rv;
205 for_each(str.begin(),str.end(), 205 for_each(str.begin(),str.end(),
206 __url_encoder(rv)); 206 __url_encoder(rv));
207 return rv; 207 return rv;
208 } 208 }
209 209
210 string url_decode(const string& str) { 210 string url_decode(const string& str) {
211 string rv; 211 string rv;
212 back_insert_iterator<string> ii(rv); 212 back_insert_iterator<string> ii(rv);
213 char tmp[3]; tmp[2] = 0;
213 for(string::const_iterator i=str.begin(),ie=str.end(); 214 for(string::const_iterator i=str.begin(),ie=str.end();
214 i!=ie;++i) { 215 i!=ie;++i) {
215 switch(*i) { 216 switch(*i) {
216 case '+': 217 case '+':
217 *(ii++) = ' '; break; 218 *(ii++) = ' '; break;
218 case '%': 219 case '%':
219 ++i; 220 ++i;
220 static char tmp[3] = {0,0,0};
221 if(i==ie) 221 if(i==ie)
222 throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string"); 222 throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string");
223 tmp[0] = *(i++); 223 tmp[0] = *(i++);
224 if(i==ie) 224 if(i==ie)
225 throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string"); 225 throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string");
226 tmp[1] = *i; 226 tmp[1] = *i;
227 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1]))) 227 if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
228 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string"); 228 throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
229 *(ii++) = (char)strtol(tmp,0,16); 229 *(ii++) = (char)strtol(tmp,0,16);
230 break; 230 break;
231 default: 231 default:
232 *(ii++) = *i; break; 232 *(ii++) = *i; break;