3 files changed, 49 insertions, 16 deletions

diff --git a/lib/basic_rp.cc b/lib/basic_rp.cc
index 3cad71c..9c7113b 100644
--- a/lib/basic_rp.cc
+++ b/lib/basic_rp.cc
@@ -219,5 +219,6 @@ namespace opkele {
         reset_vars();
         bool o2 = om.has_field("ns")
-            && om.get_field("ns")==OIURI_OPENID20;
+            && om.get_field("ns")==OIURI_OPENID20
+            && om.has_field("op_endpoint") && !om.get_field("op_endpoint").empty();
         if( (!o2) && om.has_field("user_setup_url"))
             throw id_res_setup(OPKELE_CP_ "assertion failed, setup url provided",
diff --git a/lib/discovery.cc b/lib/discovery.cc
index bd1f917..b4ed3b6 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -284,4 +284,5 @@ namespace opkele {
                 set_user_data(); set_element_handler();
                 set_character_data_handler();
+                set_unknown_encoding_handler();
 
                 if(xmode&xmode_html) {
@@ -454,23 +455,38 @@ namespace opkele {
                 }
                 if(is_qelement(n,NSURI_XRD "\tType")) {
-                    assert(xrd); assert(xrd_service); assert(cdata==&cdata_buf);
-                    xrd_service->types.insert(cdata_buf);
+                    if(xrd && xrd_service) {
+                        assert(cdata==&cdata_buf);
+                        xrd_service->types.insert(cdata_buf);
+                    }
                 }else if(is_qelement(n,NSURI_XRD "\tService")) {
-                    assert(xrd); assert(xrd_service);
-                    assert(!pt_stack.empty());
-                    assert(pt_stack.back()==(NSURI_XRD "\tService"));
-                    pt_stack.pop_back();
-                    xrd_service = 0;
-                }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
-                    assert(xrd);
-                    if(is_qelement(pt_stack.back().c_str(),n)) {
-                        assert(cdata==&status_string);
+                    if(!(xrd && xrd_service)) {
+                        skipping = -1;
+                    }else{
+                        assert(!pt_stack.empty());
+                        assert(pt_stack.back()==(NSURI_XRD "\tService"));
                         pt_stack.pop_back();
-                        if(status_code!=100)
-                            skipping = -1;
+                        xrd_service = 0;
+                    }
+                }else if(is_qelement(n,NSURI_XRD "\tStatus")) {
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
+                        if(is_qelement(pt_stack.back().c_str(),n)) {
+                            assert(cdata==&status_string);
+                            pt_stack.pop_back();
+                            if(status_code!=100)
+                                skipping = -1;
+                        }
                     }
                 }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
-                    assert(xrd);
-                    xrd->expires = util::w3c_to_time(cdata_buf);
+                    if(!xrd) {
+                        skipping=-1;
+                    }else{
+                        xrd->expires = util::w3c_to_time(cdata_buf);
+                    }
+                }else if(is_qelement(n,NSURI_XRD "\tXRD")) {
+                    assert(!pt_stack.empty());
+                    assert(pt_stack.back()==(NSURI_XRD "\tXRD"));
+                    pt_stack.pop_back();
                 }else if((xmode&xmode_html) && is_element(n,"head")) {
                     skipping = -1;
@@ -570,4 +586,11 @@ namespace opkele {
             }
 
+            int unknown_encoding(const XML_Char* /* n */,XML_Encoding *i) {
+                for(unsigned int ii=0;ii < sizeof(i->map)/sizeof(i->map[0]);++ii)
+                    i->map[ii] = ii;
+                i->convert = 0; i->release = 0;
+                return XML_STATUS_OK;
+            }
+
     };
 
diff --git a/lib/expat.cc b/lib/expat.cc
index c4dab7e..fb58a9a 100644
--- a/lib/expat.cc
+++ b/lib/expat.cc
@@ -93,4 +93,13 @@ namespace opkele {
         }
 
+        static int _unknown_encoding(void *ehd,const XML_Char *n,XML_Encoding *i) {
+            return ((expat_t*)ehd)->unknown_encoding(n,i);
+        }
+
+        void expat_t::set_unknown_encoding_handler() {
+            assert(_x);
+            XML_SetUnknownEncodingHandler(_x,_unknown_encoding,this);
+        }
+
     }