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>

2 files changed, 2 insertions, 2 deletions

diff --git a/include/opkele/iterator.h b/include/opkele/iterator.h
index 8f86234..94da7e4 100644
--- a/include/opkele/iterator.h
+++ b/include/opkele/iterator.h
@@ -58,97 +58,97 @@ namespace opkele {
 
         template <typename T,typename TR=T&,typename TP=T*>
         class basic_forward_iterator_proxy_impl : public iterator<forward_iterator_tag,T,void,TP,TR> {
             public:
                 virtual ~basic_forward_iterator_proxy_impl() { }
 
                 virtual basic_forward_iterator_proxy_impl<T,TR,TP>* dup() const = 0;
 
                 virtual bool operator==(const basic_forward_iterator_proxy_impl<T,TR,TP>& x) const = 0;
                 virtual bool operator!=(const basic_forward_iterator_proxy_impl<T,TR,TP>& x) const {
                     return !((*this)==x); }
                 virtual TR operator*() const = 0;
                 virtual TP operator->() const = 0;
                 virtual void advance() = 0;
         };
 
         template <typename IT>
         class forward_iterator_proxy_impl : public basic_forward_iterator_proxy_impl<typename IT::value_type,typename IT::reference,typename IT::pointer> {
             public:
                 IT i;
 
                 forward_iterator_proxy_impl(const IT& _i) : i(_i) { }
 
                 virtual basic_forward_iterator_proxy_impl<typename IT::value_type,typename IT::reference,typename IT::pointer>* dup() const {
                     return new forward_iterator_proxy_impl<IT>(i); }
 
                 virtual bool operator==(const basic_forward_iterator_proxy_impl<typename IT::value_type,typename IT::reference,typename IT::pointer>& x) const {
                     return i==static_cast<const forward_iterator_proxy_impl<IT>*>(&x)->i; }
                 virtual bool operator!=(const basic_forward_iterator_proxy_impl<typename IT::value_type,typename IT::reference,typename IT::pointer>& x) const {
                     return i!=static_cast<const forward_iterator_proxy_impl<IT>*>(&x)->i; }
                 virtual typename IT::reference operator*() const { return *i; }
                 virtual typename IT::pointer operator->() const { return i.operator->(); }
                 virtual void advance() { ++i; }
         };
 
         template<typename T,typename TR=T&,typename TP=T*>
         class forward_iterator_proxy : public iterator<forward_iterator_tag,T,void,TP,TR> {
             public:
                 basic_forward_iterator_proxy_impl<T,TR,TP> *I;
 
                 template<typename IT>
                     forward_iterator_proxy(const IT& i)
                     : I(new forward_iterator_proxy_impl<IT>(i)) { }
                 forward_iterator_proxy(const forward_iterator_proxy<T,TR,TP>& x)
                     : I(x.I->dup()) { }
                 ~forward_iterator_proxy() { delete I; }
 
                 forward_iterator_proxy& operator=(const forward_iterator_proxy<T,TR,TP>& x) {
-                    delete I; I = x.I->dup(); }
+                    delete I; I = x.I->dup(); return *this; }
 
                 bool operator==(const forward_iterator_proxy<T,TR,TP>& x) const {
                     return (*I)==(*(x.I)); }
                 bool operator!=(const forward_iterator_proxy<T,TR,TP>& x) const {
                     return (*I)!=(*(x.I)); }
 
                 TR operator*() const {
                     return **I; }
                 TP operator->() const {
                     return I->operator->(); }
 
                 forward_iterator_proxy<T,TR,TP>& operator++() {
                     I->advance(); return *this; }
                 forward_iterator_proxy<T,TR,TP>& operator++(int) {
                     forward_iterator_proxy<T,TR,TP> rv(*this);
                     I->advance(); return rv; }
         };
 
         template<typename IT>
             class basic_filterator : public iterator<
                                           typename IT::iterator_category,
                                           typename IT::value_type,
                                           typename IT::difference_type,
                                           typename IT::pointer,
                                           typename IT::reference> {
                 public:
                     IT it;
                     IT ei;
                     bool empty;
 
                     basic_filterator() : empty(true) { }
                     basic_filterator(const IT& _bi,const IT& _ei)
                         : it(_bi), ei(_ei) { empty = (it==ei); }
                     basic_filterator(const basic_filterator<IT>& x)
                         : it(x.it), ei(x.ei), empty(x.empty) { }
                     virtual ~basic_filterator() { }
 
                     bool operator==(const basic_filterator<IT>& x) const {
                         return empty?x.empty:(it==x.it); }
                     bool operator!=(const basic_filterator<IT>& x) const {
                         return empty!=x.empty || it!=x.it; }
 
                     typename IT::reference operator*() const {
                         assert(!empty);
                         return *it; }
                     typename IT::pointer operator->() const {
                         assert(!empty);
                         return it.operator->(); }
diff --git a/lib/util.cc b/lib/util.cc
index a46ba2a..249eeed 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -165,104 +165,104 @@ namespace opkele {
                 throw failed_conversion(OPKELE_CP_ "failed to gmtime()");
             return rv;
         }
 
         /*
          *
          */
 
         static inline bool isrfc3986unreserved(int c) {
             if(c<'-') return false;
             if(c<='.') return true;
             if(c<'0') return false; if(c<='9') return true;
             if(c<'A') return false; if(c<='Z') return true;
             if(c<'_') return false;
             if(c=='_') return true;
             if(c<'a') return false; if(c<='z') return true;
             if(c=='~') return true;
             return false;
         }
 
         struct __url_encoder : public unary_function<char,void> {
             public:
                 string& rv;
 
                 __url_encoder(string& r) : rv(r) { }
 
                 result_type operator()(argument_type c) {
                     if(isrfc3986unreserved(c))
                         rv += c;
                     else{
                         char tmp[4];
                         snprintf(tmp,sizeof(tmp),"%%%02X",
                                 (c&0xff));
                         rv += tmp;
                     }
                 }
         };
 
         string url_encode(const string& str) {
             string rv;
             for_each(str.begin(),str.end(),
                     __url_encoder(rv));
             return rv;
         }
 
         string url_decode(const string& str) {
             string rv;
             back_insert_iterator<string> ii(rv);
+            char tmp[3]; tmp[2] = 0;
             for(string::const_iterator i=str.begin(),ie=str.end();
                     i!=ie;++i) {
                 switch(*i) {
                     case '+':
                         *(ii++) = ' '; break;
                     case '%':
                         ++i;
-                        static char tmp[3] = {0,0,0};
                         if(i==ie)
                             throw failed_conversion(OPKELE_CP_ "trailing percent in the url-encoded string");
                         tmp[0] = *(i++);
                         if(i==ie)
                             throw failed_conversion(OPKELE_CP_ "not enough hexadecimals after the percent sign in url-encoded string");
                         tmp[1] = *i;
                         if(!(isxdigit(tmp[0]) && isxdigit(tmp[1])))
                             throw failed_conversion(OPKELE_CP_ "non-hex follows percent in url-encoded string");
                         *(ii++) = (char)strtol(tmp,0,16);
                         break;
                     default:
                         *(ii++) = *i; break;
                 }
             }
             return rv;
         }
 
         string attr_escape(const string& str) {
             static const char *unsafechars = "<>&\n\"'";
             string rv;
             string::size_type p=0;
             while(true) {
                 string::size_type us = str.find_first_of(unsafechars,p);
                 if(us==string::npos) {
                     if(p!=str.length())
                         rv.append(str,p,str.length()-p);
                     return rv;
                 }
                 rv.append(str,p,us-p);
                 rv += "&#";
                 rv += long_to_string((long)str[us]);
                 rv += ';';
                 p = us+1;
             }
         }
 
         string long_to_string(long l) {
             char rv[32];
             int r=snprintf(rv,sizeof(rv),"%ld",l);
             if(r<0 || r>=(int)sizeof(rv))
                 throw failed_conversion(OPKELE_CP_ "failed to snprintf()");
             return rv;
         }
 
         long string_to_long(const string& s) {
             char *endptr = 0;
             long rv = strtol(s.c_str(),&endptr,10);
             if((!endptr) || endptr==s.c_str())