libxml-ruby 5.0.5 → 6.0.0

data/ext/libxml/ruby_xml_io.c

@@ -1,47 +1,49 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include <ruby/io.h>
-
-static ID READ_METHOD;
-static ID WRITE_METHOD;
-
-/* This method is called by libxml when it wants to read
- more data from a stream. We go with the duck typing
- solution to support StringIO objects. */
-int rxml_read_callback(void *context, char *buffer, int len)
-{
-  VALUE io = (VALUE) context;
-  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
-  size_t size;
-
-  if (string == Qnil)
-    return 0;
-
-  size = RSTRING_LEN(string);
-  memcpy(buffer, StringValuePtr(string), size);
-
-  return (int)size;
-}
-
-int rxml_write_callback(VALUE io, const char *buffer, int len)
-{
-    if (rb_io_check_io(io) == Qnil)
-    {
-        // Could be StringIO
-        VALUE written, string;
-        string = rb_external_str_new_with_enc(buffer, (long)strlen(buffer), rb_enc_get(io));
-        written = rb_funcall(io, WRITE_METHOD, 1, string);
-        return NUM2INT(written);
-    }
-    else
-    {
-        return (int)rb_io_bufwrite(io, buffer, (size_t)len);
-    }
-}
-
-void rxml_init_io(void)
-{
-  READ_METHOD = rb_intern("read");
-  WRITE_METHOD = rb_intern("write");
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include <ruby/io.h>
+
+static ID READ_METHOD;
+static ID WRITE_METHOD;
+
+/* This method is called by libxml when it wants to read
+ more data from a stream. We go with the duck typing
+ solution to support StringIO objects. */
+int rxml_read_callback(void *context, char *buffer, int len)
+{
+  VALUE io = (VALUE) context;
+  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
+  size_t size;
+
+  if (string == Qnil)
+    return 0;
+
+  size = RSTRING_LEN(string);
+  if (size > (size_t)len)
+    size = (size_t)len;
+  memcpy(buffer, StringValuePtr(string), size);
+
+  return (int)size;
+}
+
+int rxml_write_callback(VALUE io, const char *buffer, int len)
+{
+    if (rb_io_check_io(io) == Qnil)
+    {
+        // Could be StringIO
+        VALUE written, string;
+        string = rb_external_str_new_with_enc(buffer, (long)len, rb_enc_get(io));
+        written = rb_funcall(io, WRITE_METHOD, 1, string);
+        return NUM2INT(written);
+    }
+    else
+    {
+        return (int)rb_io_bufwrite(io, buffer, (size_t)len);
+    }
+}
+
+void rxml_init_io(void)
+{
+  READ_METHOD = rb_intern("read");
+  WRITE_METHOD = rb_intern("write");
+}

data/ext/libxml/ruby_xml_io.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_IO__
-#define __RXML_IO__
-
-int rxml_read_callback(void *context, char *buffer, int len);
-int rxml_write_callback(VALUE io, const char *buffer, int len);
-void rxml_init_io(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_IO__
+#define __RXML_IO__
+
+int rxml_read_callback(void *context, char *buffer, int len);
+int rxml_write_callback(VALUE io, const char *buffer, int len);
+void rxml_init_io(void);
+
+#endif

data/ext/libxml/ruby_xml_namespace.c

@@ -5,6 +5,11 @@
 
 VALUE cXMLNamespace;
 
+const rb_data_type_t rxml_namespace_type = {
+  "libxml/namespace",
+  {NULL, NULL, NULL},
+};
+
 /* Document-class: LibXML::XML::Namespace
  *
  * The Namespace class represents an XML namespace.
@@ -26,12 +31,12 @@ VALUE cXMLNamespace;
 
 static VALUE rxml_namespace_alloc(VALUE klass)
 {
-  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
+  return TypedData_Wrap_Struct(klass, &rxml_namespace_type, NULL);
 }
 
 VALUE rxml_namespace_wrap(xmlNsPtr xns)
 {
-  return Data_Wrap_Struct(cXMLNamespace, NULL, NULL, xns);
+  return TypedData_Wrap_Struct(cXMLNamespace, &rxml_namespace_type, xns);
 }
 
 
@@ -50,15 +55,14 @@ static VALUE rxml_namespace_initialize(VALUE self, VALUE node, VALUE prefix,
   xmlChar *xmlPrefix;
   xmlNsPtr xns;
 
-  Check_Type(node, T_DATA);
-  Data_Get_Struct(node, xmlNode, xnode);
+  TypedData_Get_Struct(node, xmlNode, &rxml_node_data_type, xnode);
   xmlResetLastError();
 
   /* Prefix can be null - that means its the default namespace */
   xmlPrefix = NIL_P(prefix) ? NULL : (xmlChar *)StringValuePtr(prefix);
   xns = xmlNewNs(xnode, (xmlChar*) StringValuePtr(href), xmlPrefix);
 
-  DATA_PTR(self) = xns;
+  RTYPEDDATA_DATA(self) = xns;
   return self;
 }
 
@@ -75,7 +79,7 @@ static VALUE rxml_namespace_initialize(VALUE self, VALUE node, VALUE prefix,
 static VALUE rxml_namespace_href_get(VALUE self)
 {
   xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
   if (xns->href == NULL)
     return Qnil;
   else
@@ -91,7 +95,7 @@ static VALUE rxml_namespace_href_get(VALUE self)
 static VALUE rxml_namespace_node_type(VALUE self)
 {
   xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
   return INT2NUM(xns->type);
 }
 
@@ -110,7 +114,7 @@ static VALUE rxml_namespace_node_type(VALUE self)
 static VALUE rxml_namespace_prefix_get(VALUE self)
 {
   xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
   if (xns->prefix == NULL)
     return Qnil;
   else
@@ -132,11 +136,15 @@ static VALUE rxml_namespace_prefix_get(VALUE self)
 static VALUE rxml_namespace_next(VALUE self)
 {
   xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->next == NULL)
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
+  /* Guard against libxml2's XPath hack where xns->next stores a parent
+     element pointer instead of the next namespace (see xmlXPathNodeSetAddNs
+     in xpath.c).  xmlNs.type and xmlNode.type share the same struct offset,
+     so checking the type is safe even when next points to an xmlNode. */
+  if (xns == NULL || xns->next == NULL || xns->next->type != XML_LOCAL_NAMESPACE)
     return (Qnil);
-  else
-    return rxml_namespace_wrap(xns->next);
+
+  return rxml_namespace_wrap(xns->next);
 }
 
 void rxml_init_namespace(void)

data/ext/libxml/ruby_xml_namespace.h

@@ -1,10 +1,11 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_NAMESPACE__
-#define __RXML_NAMESPACE__
-
-extern VALUE cXMLNamespace;
-
-void rxml_init_namespace(void);
-VALUE rxml_namespace_wrap(xmlNsPtr xns);
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_NAMESPACE__
+#define __RXML_NAMESPACE__
+
+extern VALUE cXMLNamespace;
+extern const rb_data_type_t rxml_namespace_type;
+
+void rxml_init_namespace(void);
+VALUE rxml_namespace_wrap(xmlNsPtr xns);
+#endif