summaryrefslogtreecommitdiffabout
Side-by-side diff
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
@@ -24,6 +24,8 @@ 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) { }
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 81727c0..8729cfb 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -6,4 +6,5 @@
#include <opkele/exception.h>
#include <opkele/util.h>
+#include <opkele/debug.h>
#include "config.h"
@@ -176,5 +177,9 @@ namespace opkele {
/* 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;
}
@@ -226,5 +231,5 @@ namespace opkele {
html_start_element(n,a);
}else{
- skipping = -1;
+ skipping = -1; stop_parser();
}
}else{
@@ -311,6 +316,7 @@ namespace opkele {
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")) {
@@ -318,5 +324,5 @@ namespace opkele {
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;
@@ -375,5 +381,5 @@ namespace opkele {
}
}else if(is_element(n,"body")) {
- skipping = -1;
+ skipping = -1; stop_parser();
}
}