summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-01-05 19:39:07 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-05 22:03:51 (UTC)
commit7bde7f66284b47a75bbceadc360e7f03550ace21 (patch) (side-by-side diff)
tree401b24fc8b952fee21ad3dce117d4baf99048c9f
parent8e3f9231383194d94e41032b64d87cc6ef1c2ee8 (diff)
downloadlibopkele-7bde7f66284b47a75bbceadc360e7f03550ace21.zip
libopkele-7bde7f66284b47a75bbceadc360e7f03550ace21.tar.gz
libopkele-7bde7f66284b47a75bbceadc360e7f03550ace21.tar.bz2
discovery: stop parser with XML_StopParser()
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/expat.h6
-rw-r--r--lib/discovery.cc18
2 files changed, 16 insertions, 8 deletions
diff --git a/include/opkele/expat.h b/include/opkele/expat.h
index 60c41ac..97ed61a 100644
--- a/include/opkele/expat.h
+++ b/include/opkele/expat.h
@@ -23,8 +23,10 @@ namespace opkele {
inline bool parse(const char *s,int len,bool final=false) {
assert(_x);
- return XML_Parse(_x,s,len,final);
- }
+ return XML_Parse(_x,s,len,final); }
+ enum XML_Status stop_parser(bool resumable=false) {
+ assert(_x);
+ return XML_StopParser(_x,resumable); }
virtual void start_element(const XML_Char *n,const XML_Char **a) { }
virtual void end_element(const XML_Char *n) { }
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 81727c0..8729cfb 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -5,6 +5,7 @@
#include <opkele/discovery.h>
#include <opkele/exception.h>
#include <opkele/util.h>
+#include <opkele/debug.h>
#include "config.h"
@@ -175,7 +176,11 @@ namespace opkele {
if(skipping<0) return 0;
/* TODO: limit total size */
size_t bytes = s*nm;
- parse((const char *)p,bytes,false);
+ bool rp = parse((const char *)p,bytes,false);
+ if(!rp) {
+ skipping = -1;
+ bytes = 0;
+ }
return bytes;
}
size_t header(void *p,size_t s,size_t nm) {
@@ -225,7 +230,7 @@ namespace opkele {
}else if(xmode&xmode_html) {
html_start_element(n,a);
}else{
- skipping = -1;
+ skipping = -1; stop_parser();
}
}else{
int pt_s = pt_stack.size();
@@ -310,14 +315,15 @@ namespace opkele {
if(is_qelement(pt_stack.back().c_str(),n)) {
assert(cdata==&status_string);
pt_stack.pop_back();
- if(status_code!=100)
- skipping = -1;
+ if(status_code!=100) {
+ skipping = -1; stop_parser();
+ }
}
}else if(is_qelement(n,NSURI_XRD "\tExpires")) {
assert(xrd);
xrd->expires = util::w3c_to_time(cdata_buf);
}else if((xmode&xmode_html) && is_element(n,"head")) {
- skipping = -1;
+ skipping = -1; stop_parser();
}
cdata = 0;
}
@@ -374,7 +380,7 @@ namespace opkele {
html_openid2.local_ids.add(-1,href);
}
}else if(is_element(n,"body")) {
- skipping = -1;
+ skipping = -1; stop_parser();
}
}