nokolexbor 0.2.4 → 0.2.6

data/ext/nokolexbor/nl_node.c

@@ -1,6 +1,6 @@
 #include "nokolexbor.h"
 
-#define SORT_NAME css_result
+#define SORT_NAME nl_css_result
 #define SORT_TYPE lxb_dom_node_t *
 #define SORT_CMP(x, y) (x->user >= y->user ? (x->user == y->user ? 0 : 1) : -1)
 #include "timsort.h"
@@ -199,7 +199,7 @@ nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec,
   return LXB_STATUS_OK;
 }
 
-void
+lxb_status_t
 nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 {
   const char *selector_c = StringValuePtr(selector);
@@ -207,37 +207,44 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
 
+  lxb_status_t status;
+  lxb_css_parser_t *parser = NULL;
+  lxb_selectors_t *selectors = NULL;
+  lxb_css_selector_list_t *list = NULL;
+
   /* Create CSS parser. */
-  lxb_css_parser_t *parser = lxb_css_parser_create();
-  lxb_status_t status = lxb_css_parser_init(parser, NULL, NULL);
+  parser = lxb_css_parser_create();
+  status = lxb_css_parser_init(parser, NULL, NULL);
   if (status != LXB_STATUS_OK)
   {
-    nl_raise_lexbor_error(status);
+    goto cleanup;
   }
 
   /* Selectors. */
-  lxb_selectors_t *selectors = lxb_selectors_create();
+  selectors = lxb_selectors_create();
   status = lxb_selectors_init(selectors);
   if (status != LXB_STATUS_OK)
   {
-    nl_raise_lexbor_error(status);
+    goto cleanup;
   }
 
   /* Parse and get the log. */
   // TODO: Cache the list for reuse, improves performance
-  lxb_css_selector_list_t *list = lxb_css_selectors_parse_relative_list(parser, (const lxb_char_t *)selector_c, selector_len);
+  list = lxb_css_selectors_parse_relative_list(parser, (const lxb_char_t *)selector_c, selector_len);
   if (parser->status != LXB_STATUS_OK)
   {
-    nl_raise_lexbor_error(parser->status);
+    status = parser->status;
+    goto cleanup;
   }
 
   /* Find HTML nodes by CSS Selectors. */
   status = lxb_selectors_find(selectors, node, list, cb, ctx);
   if (status != LXB_STATUS_OK)
   {
-    nl_raise_lexbor_error(status);
+    goto cleanup;
   }
 
+cleanup:
   /* Destroy Selectors object. */
   (void)lxb_selectors_destroy(selectors, true);
 
@@ -246,6 +253,8 @@ nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 
   /* Destroy all object for all CSS Selector List. */
   lxb_css_selector_list_destroy_memory(list);
+
+  return status;
 }
 
 static void
@@ -281,7 +290,7 @@ mark_node_orders(lxb_dom_node_t *root)
 }
 
 // Sort nodes in document traversal order (the same as Nokorigi)
-void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array)
+void nl_sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array)
 {
   // No need to sort if there's only one selector, the results are natually in document traversal order
   if (strchr(RSTRING_PTR(selector), ',') != NULL)
@@ -301,7 +310,7 @@ void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_arr
     {
       mark_node_orders(&doc->node);
     }
-    css_result_tim_sort((lxb_dom_node_t **)&array->list[0], array->length);
+    nl_css_result_tim_sort((lxb_dom_node_t **)&array->list[0], array->length);
   }
 }
 
@@ -311,14 +320,21 @@ nl_node_at_css(VALUE self, VALUE selector)
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
   lexbor_array_t *array = lexbor_array_create();
 
-  nl_node_find(self, selector, nl_node_at_css_callback, array);
+  lxb_status_t status = nl_node_find(self, selector, nl_node_at_css_callback, array);
+
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
 
   if (array->length == 0)
   {
+    lexbor_array_destroy(array, true);
     return Qnil;
   }
 
-  sort_nodes_if_necessary(selector, node->owner_document, array);
+  nl_sort_nodes_if_necessary(selector, node->owner_document, array);
 
   VALUE ret = nl_rb_node_create(array->list[0], nl_rb_document_get(self));
 
@@ -333,9 +349,14 @@ nl_node_css(VALUE self, VALUE selector)
   lxb_dom_node_t *node = nl_rb_node_unwrap(self);
   lexbor_array_t *array = lexbor_array_create();
 
-  nl_node_find(self, selector, nl_node_css_callback, array);
+  lxb_status_t status = nl_node_find(self, selector, nl_node_css_callback, array);
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
 
-  sort_nodes_if_necessary(selector, node->owner_document, array);
+  nl_sort_nodes_if_necessary(selector, node->owner_document, array);
 
   return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
 }

data/ext/nokolexbor/nl_node_set.c

@@ -5,8 +5,8 @@ extern VALUE cNokolexborNode;
 VALUE cNokolexborNodeSet;
 extern rb_data_type_t nl_document_type;
 
-void nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx);
-void sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array);
+lxb_status_t nl_node_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx);
+void nl_sort_nodes_if_necessary(VALUE selector, lxb_dom_document_t *doc, lexbor_array_t *array);
 lxb_status_t nl_node_at_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
 lxb_status_t nl_node_css_callback(lxb_dom_node_t *node, lxb_css_selector_specificity_t *spec, void *ctx);
 
@@ -275,8 +275,8 @@ nl_node_set_union(VALUE self, VALUE other)
   return nl_rb_node_set_create_with_data(new_array, nl_rb_document_get(self));
 }
 
-static void
-nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void* ctx)
+static lxb_status_t
+nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void *ctx)
 {
   lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
   if (doc == NULL)
@@ -319,7 +319,7 @@ nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void* ctx)
   }
   VALUE rb_frag = nl_rb_node_create(&frag->node, nl_rb_document_get(self));
 
-  nl_node_find(rb_frag, selector, cb, ctx);
+  lxb_status_t status = nl_node_find(rb_frag, selector, cb, ctx);
 
   lxb_dom_document_fragment_interface_destroy(frag);
   // Restore original node data
@@ -329,6 +329,8 @@ nl_node_set_find(VALUE self, VALUE selector, lxb_selectors_cb_f cb, void* ctx)
     free(backup_array->list[i]);
   }
   lexbor_array_destroy(backup_array, true);
+
+  return status;
 }
 
 static VALUE
@@ -337,14 +339,21 @@ nl_node_set_at_css(VALUE self, VALUE selector)
   lexbor_array_t *array = lexbor_array_create();
   lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
 
-  nl_node_set_find(self, selector, nl_node_at_css_callback, array);
+  lxb_status_t status = nl_node_set_find(self, selector, nl_node_at_css_callback, array);
+
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
 
   if (array->length == 0)
   {
+    lexbor_array_destroy(array, true);
     return Qnil;
   }
 
-  sort_nodes_if_necessary(selector, doc, array);
+  nl_sort_nodes_if_necessary(selector, doc, array);
 
   VALUE ret = nl_rb_node_create(array->list[0], nl_rb_document_get(self));
 
@@ -359,9 +368,14 @@ nl_node_set_css(VALUE self, VALUE selector)
   lexbor_array_t *array = lexbor_array_create();
   lxb_dom_document_t *doc = nl_rb_document_unwrap(nl_rb_document_get(self));
 
-  nl_node_set_find(self, selector, nl_node_css_callback, array);
+  lxb_status_t status = nl_node_set_find(self, selector, nl_node_css_callback, array);
+  if (status != LXB_STATUS_OK)
+  {
+    lexbor_array_destroy(array, true);
+    nl_raise_lexbor_error(status);
+  }
 
-  sort_nodes_if_necessary(selector, doc, array);
+  nl_sort_nodes_if_necessary(selector, doc, array);
 
   return nl_rb_node_set_create_with_data(array, nl_rb_document_get(self));
 }

data/ext/nokolexbor/nl_xpath_context.c

@@ -18,7 +18,7 @@ VALUE cNokolexborXpathSyntaxError;
 static void
 free_xml_xpath_context(xmlXPathContextPtr ctx)
 {
-  xmlXPathFreeContext(ctx);
+  nl_xmlXPathFreeContext(ctx);
 }
 
 /*
@@ -33,7 +33,7 @@ nl_xpath_context_register_ns(VALUE self, VALUE prefix, VALUE uri)
   xmlXPathContextPtr ctx;
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
-  xmlXPathRegisterNs(ctx,
+  nl_xmlXPathRegisterNs(ctx,
                      (const xmlChar *)StringValueCStr(prefix),
                      (const xmlChar *)StringValueCStr(uri));
   return self;
@@ -52,9 +52,9 @@ nl_xpath_context_register_variable(VALUE self, VALUE name, VALUE value)
   xmlXPathObjectPtr xmlValue;
   Data_Get_Struct(self, xmlXPathContext, ctx);
 
-  xmlValue = xmlXPathNewCString(StringValueCStr(value));
+  xmlValue = nl_xmlXPathNewCString(StringValueCStr(value));
 
-  xmlXPathRegisterVariable(ctx,
+  nl_xmlXPathRegisterVariable(ctx,
                            (const xmlChar *)StringValueCStr(name),
                            xmlValue);
 
@@ -74,7 +74,7 @@ xpath2ruby(xmlXPathObjectPtr c_xpath_object, xmlXPathContextPtr ctx, VALUE rb_do
   {
   case XPATH_STRING:
     rb_retval = rb_utf8_str_new_cstr((const char *)c_xpath_object->stringval);
-    xmlFree(c_xpath_object->stringval);
+    nl_xmlFree(c_xpath_object->stringval);
     return rb_retval;
 
   case XPATH_NODESET:
@@ -192,19 +192,20 @@ nl_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
   // if (Qnil != xpath_handler) {
   //   /* FIXME: not sure if this is the correct place to shove private data. */
   //   ctx->userData = (void *)xpath_handler;
-  //   xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
+  //   nl_xmlXPathRegisterFuncLookup(ctx, handler_lookup, (void *)xpath_handler);
   // }
 
-  xmlSetStructuredErrorFunc((void *)errors, nl_xpath_error_array_pusher);
-  xmlSetGenericErrorFunc((void *)errors, nl_xpath_generic_exception_pusher);
+  nl_xmlSetStructuredErrorFunc((void *)errors, nl_xpath_error_array_pusher);
+  nl_xmlSetGenericErrorFunc((void *)errors, nl_xpath_generic_exception_pusher);
 
-  xpath = xmlXPathEvalExpression(query, ctx);
+  xpath = nl_xmlXPathEvalExpression(query, ctx);
 
-  xmlSetStructuredErrorFunc(NULL, NULL);
-  xmlSetGenericErrorFunc(NULL, NULL);
+  nl_xmlSetStructuredErrorFunc(NULL, NULL);
+  nl_xmlSetGenericErrorFunc(NULL, NULL);
 
   if (xpath == NULL)
   {
+    nl_xmlXPathFreeObject(xpath);
     rb_exc_raise(rb_ary_entry(errors, 0));
   }
 
@@ -214,7 +215,7 @@ nl_xpath_context_evaluate(int argc, VALUE *argv, VALUE self)
     retval = rb_funcall(cNokolexborNodeSet, rb_intern("new"), 1, rb_ary_new());
   }
 
-  xmlXPathFreeNodeSetList(xpath);
+  nl_xmlXPathFreeObject(xpath);
 
   return retval;
 }
@@ -233,7 +234,7 @@ nl_xpath_context_new(VALUE klass, VALUE rb_node)
 
   lxb_dom_node_t *node = nl_rb_node_unwrap(rb_node);
 
-  ctx = xmlXPathNewContext(node->owner_document);
+  ctx = nl_xmlXPathNewContext(node->owner_document);
   ctx->node = node;
 
   self = Data_Wrap_Struct(klass, 0, free_xml_xpath_context, ctx);
@@ -244,7 +245,11 @@ nl_xpath_context_new(VALUE klass, VALUE rb_node)
 
 void Init_nl_xpath_context(void)
 {
-  xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+#ifndef NOKOLEXBOR_ASAN
+  nl_xmlMemSetup((xmlFreeFunc)ruby_xfree, (xmlMallocFunc)ruby_xmalloc, (xmlReallocFunc)ruby_xrealloc, ruby_strdup);
+#else
+  nl_xmlMemSetup((xmlFreeFunc)free, (xmlMallocFunc)malloc, (xmlReallocFunc)realloc, strdup);
+#endif
 
   cNokolexborXpathContext = rb_define_class_under(mNokolexbor, "XPathContext", rb_cObject);
   mNokolexborXpath = rb_define_module_under(mNokolexbor, "XPath");

data/ext/nokolexbor/private/buf.h

@@ -43,7 +43,7 @@ xmlBufIsEmpty(const xmlBufPtr buf);
 XML_HIDDEN int
 xmlBufAddLen(xmlBufPtr buf, size_t len);
 
-/* const xmlChar * xmlBufContent(const xmlBuf *buf); */
+/* const xmlChar * nl_xmlBufContent(const xmlBuf *buf); */
 /* const xmlChar * xmlBufEnd(xmlBufPtr buf); */
 
 XML_HIDDEN xmlChar *

data/ext/nokolexbor/private/error.h

@@ -5,17 +5,17 @@
 #include "libxml/xmlversion.h"
 
 XML_HIDDEN void
-__xmlRaiseError(xmlStructuredErrorFunc schannel,
+__nl_xmlRaiseError(xmlStructuredErrorFunc schannel,
                 xmlGenericErrorFunc channel, void *data, void *ctx,
                 void *nod, int domain, int code, xmlErrorLevel level,
                 const char *file, int line, const char *str1,
                 const char *str2, const char *str3, int int1, int col,
 	        const char *msg, ...) LIBXML_ATTR_FORMAT(16,17);
 XML_HIDDEN void
-__xmlSimpleError(int domain, int code, lxb_dom_node_t_ptr node,
+__nl_xmlSimpleError(int domain, int code, lxb_dom_node_t_ptr node,
                  const char *msg, const char *extra) LIBXML_ATTR_FORMAT(4,0);
 XML_HIDDEN void
-xmlGenericErrorDefaultFunc(void *ctx, const char *msg,
+nl_xmlGenericErrorDefaultFunc(void *ctx, const char *msg,
                            ...) LIBXML_ATTR_FORMAT(2,3);
 
 #endif /* XML_ERROR_H_PRIVATE__ */

data/ext/nokolexbor/xml_SAX2.c

@@ -16,7 +16,7 @@
 #include "libxml/globals.h"
 
 /**
- * xmlSAX2GetPublicId:
+ * nl_xmlSAX2GetPublicId:
  * @ctx: the user data (XML parser context)
  *
  * Provides the public ID e.g. "-//SGMLSOURCE//DTD DEMO//EN"
@@ -24,14 +24,14 @@
  * Returns a xmlChar *
  */
 const xmlChar *
-xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
+nl_xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
 {
     /* xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx; */
     return(NULL);
 }
 
 /**
- * xmlSAX2GetSystemId:
+ * nl_xmlSAX2GetSystemId:
  * @ctx: the user data (XML parser context)
  *
  * Provides the system ID, basically URL or filename e.g.
@@ -40,7 +40,7 @@ xmlSAX2GetPublicId(void *ctx ATTRIBUTE_UNUSED)
  * Returns a xmlChar *
  */
 const xmlChar *
-xmlSAX2GetSystemId(void *ctx)
+nl_xmlSAX2GetSystemId(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(NULL);
@@ -48,7 +48,7 @@ xmlSAX2GetSystemId(void *ctx)
 }
 
 /**
- * xmlSAX2GetLineNumber:
+ * nl_xmlSAX2GetLineNumber:
  * @ctx: the user data (XML parser context)
  *
  * Provide the line number of the current parsing point.
@@ -56,7 +56,7 @@ xmlSAX2GetSystemId(void *ctx)
  * Returns an int
  */
 int
-xmlSAX2GetLineNumber(void *ctx)
+nl_xmlSAX2GetLineNumber(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(0);
@@ -64,7 +64,7 @@ xmlSAX2GetLineNumber(void *ctx)
 }
 
 /**
- * xmlSAX2GetColumnNumber:
+ * nl_xmlSAX2GetColumnNumber:
  * @ctx: the user data (XML parser context)
  *
  * Provide the column number of the current parsing point.
@@ -72,7 +72,7 @@ xmlSAX2GetLineNumber(void *ctx)
  * Returns an int
  */
 int
-xmlSAX2GetColumnNumber(void *ctx)
+nl_xmlSAX2GetColumnNumber(void *ctx)
 {
     xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
     if ((ctx == NULL) || (ctxt->input == NULL)) return(0);

data/ext/nokolexbor/xml_buf.c

@@ -92,7 +92,7 @@ struct _xmlBuf {
 static void
 xmlBufMemoryError(xmlBufPtr buf, const char *extra)
 {
-    __xmlSimpleError(XML_FROM_BUFFER, XML_ERR_NO_MEMORY, NULL, NULL, extra);
+    __nl_xmlSimpleError(XML_FROM_BUFFER, XML_ERR_NO_MEMORY, NULL, NULL, extra);
     if ((buf) && (buf->error == 0))
         buf->error = XML_ERR_NO_MEMORY;
 }
@@ -107,7 +107,7 @@ xmlBufPtr
 xmlBufCreate(void) {
     xmlBufPtr ret;
 
-    ret = (xmlBufPtr) xmlMalloc(sizeof(xmlBuf));
+    ret = (xmlBufPtr) nl_xmlMalloc(sizeof(xmlBuf));
     if (ret == NULL) {
 	xmlBufMemoryError(NULL, "creating buffer");
         return(NULL);
@@ -115,13 +115,13 @@ xmlBufCreate(void) {
     ret->use = 0;
     ret->error = 0;
     ret->buffer = NULL;
-    ret->size = xmlDefaultBufferSize;
+    ret->size = nl_xmlDefaultBufferSize;
     UPDATE_COMPAT(ret);
-    ret->alloc = xmlBufferAllocScheme;
-    ret->content = (xmlChar *) xmlMallocAtomic(ret->size);
+    ret->alloc = nl_xmlBufferAllocScheme;
+    ret->content = (xmlChar *) nl_xmlMallocAtomic(ret->size);
     if (ret->content == NULL) {
 	xmlBufMemoryError(ret, "creating buffer");
-	xmlFree(ret);
+	nl_xmlFree(ret);
         return(NULL);
     }
     ret->content[0] = 0;
@@ -140,7 +140,7 @@ void
 xmlBufFree(xmlBufPtr buf) {
     if (buf == NULL) {
 #ifdef DEBUG_BUFFER
-        xmlGenericError(xmlGenericErrorContext,
+        nl_xmlGenericError(nl_xmlGenericErrorContext,
 		"xmlBufFree: buf == NULL\n");
 #endif
 	return;
@@ -148,15 +148,15 @@ xmlBufFree(xmlBufPtr buf) {
 
     if ((buf->alloc == XML_BUFFER_ALLOC_IO) &&
         (buf->contentIO != NULL)) {
-        xmlFree(buf->contentIO);
+        nl_xmlFree(buf->contentIO);
     } else if (buf->content != NULL) {
-        xmlFree(buf->content);
+        nl_xmlFree(buf->content);
     }
-    xmlFree(buf);
+    nl_xmlFree(buf);
 }
 
 /**
- * xmlBufContent:
+ * nl_xmlBufContent:
  * @buf:  the buffer
  *
  * Function to extract the content of a buffer
@@ -165,7 +165,7 @@ xmlBufFree(xmlBufPtr buf) {
  */
 
 xmlChar *
-xmlBufContent(const xmlBuf *buf)
+nl_xmlBufContent(const xmlBuf *buf)
 {
     if ((!buf) || (buf->error))
         return NULL;
@@ -258,7 +258,7 @@ xmlBufResize(xmlBufPtr buf, size_t size)
 	    buf->content[buf->use] = 0;
 	    buf->size += start_buf;
 	} else {
-	    rebuf = (xmlChar *) xmlRealloc(buf->contentIO, start_buf + newSize);
+	    rebuf = (xmlChar *) nl_xmlRealloc(buf->contentIO, start_buf + newSize);
 	    if (rebuf == NULL) {
 		xmlBufMemoryError(buf, "growing buffer");
 		return 0;
@@ -268,21 +268,21 @@ xmlBufResize(xmlBufPtr buf, size_t size)
 	}
     } else {
 	if (buf->content == NULL) {
-	    rebuf = (xmlChar *) xmlMallocAtomic(newSize);
+	    rebuf = (xmlChar *) nl_xmlMallocAtomic(newSize);
 	    buf->use = 0;
 	    rebuf[buf->use] = 0;
 	} else if (buf->size - buf->use < 100) {
-	    rebuf = (xmlChar *) xmlRealloc(buf->content, newSize);
+	    rebuf = (xmlChar *) nl_xmlRealloc(buf->content, newSize);
         } else {
 	    /*
 	     * if we are reallocating a buffer far from being full, it's
 	     * better to make a new allocation and copy only the used range
 	     * and free the old one.
 	     */
-	    rebuf = (xmlChar *) xmlMallocAtomic(newSize);
+	    rebuf = (xmlChar *) nl_xmlMallocAtomic(newSize);
 	    if (rebuf != NULL) {
 		memcpy(rebuf, buf->content, buf->use);
-		xmlFree(buf->content);
+		nl_xmlFree(buf->content);
 		rebuf[buf->use] = 0;
 	    }
 	}
@@ -320,7 +320,7 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
 
     if (len < -1) {
 #ifdef DEBUG_BUFFER
-        xmlGenericError(xmlGenericErrorContext,
+        nl_xmlGenericError(nl_xmlGenericErrorContext,
 		"xmlBufAdd: len < 0\n");
 #endif
 	return -1;
@@ -328,7 +328,7 @@ xmlBufAdd(xmlBufPtr buf, const xmlChar *str, int len) {
     if (len == 0) return 0;
 
     if (len < 0)
-        len = xmlStrlen(str);
+        len = nl_xmlStrlen(str);
 
     if (len < 0) return -1;
     if (len == 0) return 0;