nokogiri 1.6.8.rc1-x86-mingw32 → 1.6.8.rc2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1390d122b49e1f336bd790d13470a57250ddff74
-  data.tar.gz: e8087f8117b56fa1eed92c18c7a790253cd733a1
+  metadata.gz: 9b9b6ced652a10d2952094c5c7a0994b41899f62
+  data.tar.gz: 6b9a4ce495fedf62cb9fd3c7e70b6ea63222a77c
 SHA512:
-  metadata.gz: 90c59fca34dd0baf8d0ade07457a6e6a38604414773472b2b3d5c7ff82544e985b3f246e1d99b3e734868c840ed40651153289672f64d5d7ea91a8b297317c88
-  data.tar.gz: 07121f8206a2f11d55337989c8cd3bea82992f69d6799f952ad94aa81e231193c76b9972f181ca9c2bd436e61143375997e549fd1b66ba57c16e91a75ca25de7
+  metadata.gz: 08b97a7a0865aed300ddd1e670722eb11e438ca9bb8f99aa64ac0c20d52bd80f996260f446ac9ae742b5b972de4d248ded4d114563912f2671f3104ff285496c
+  data.tar.gz: b0ef21cda413513fcaa7f7bdfb26ca840c2b9882aa6f9f2c08d12f85c43cfd95311b54084cbec5df2b013a7c95b0533c1baad97a8052ac714c6e0791feb42640

data/.cross_rubies

@@ -5,3 +5,5 @@
 2.1.6:x86_64-w64-mingw32
 2.2.2:i686-w64-mingw32
 2.2.2:x86_64-w64-mingw32
+2.3.0:i686-w64-mingw32
+2.3.0:x86_64-w64-mingw32

data/CHANGELOG.rdoc

@@ -5,15 +5,29 @@
 * (MRI) Bundled Libxml2 is upgraded to 2.9.3, which fixes a series of security issues. See https://mail.gnome.org/archives/xml/2015-November/msg00012.html
 
 
+==== Features
+
+Several changes were made to improve performance:
+
+* [MRI] Simplify NodeSet#to_a with a minor speed-up. (#1397)
+* XML::Node#ancestors optimization (#1297) (Thanks, Bruno Sutic!)
+* Use Symbol#to_proc where we weren't previously, because Ruby 1.8.7 reasons. (#1296) (Thanks, Bruno Sutic!)
+
+
 ==== Bug Fixes
 
 * [JRuby] fix load errors when deploying to JRuby/Torquebox (#1114) (Thanks, @atambo!)
 * [JRuby] fix NPE when inspecting nodes returned by NodeSet#drop (#1042) (Thanks, @mkristian!)
 * [JRuby] fix nil attriubte node's namespace in reader (#1327) (Thanks, @codekitchen!)
+* [JRuby] fix Nokogiri munging unicode characters that require more than 2 bytes (#1113) (Thanks, @mkristian!)
 * [MRI] fix assertion failure while accessing attribute node's namespace in reader (#843) (Thanks, @2potatocakes!)
 * [MRI] fix issue with GCing namespace nodes returned in an xpath query. (#1155)
+* [MRI] Ensure C strings are null-terminated. (#1381)
 * unescape special characters in CSS queries (#1303) (Thanks, @twalpole!)
 * consistently handle empty documents (#1349)
+* Update to mini_portile2 2.1.0 to address whitespace-handling during patching. (#1402)
+* Fix encoding of xml node namespaces.
+* Work around issue installing Nokogiri on overlayfs (commonly used in Docker containers). (#1370, #1405)
 
 
 === 1.6.7.1 / 2015-12-16
@@ -59,7 +73,7 @@ See #1374 and #1376 for details.
 * [JRuby] reset the namespace cache when replacing the document's innerHtml (#1265) (Thanks, @mkristian!)
 * [JRuby] Document#parse should support IO objects that respond to #read. (#1124) (Thanks, Jake Byman!)
 * [MRI] Duplicate-id errors when setting the `id` attribute on HTML documents are now silenced. (#1262)
-* [JRuby] SAX parser cuts texts in peices when quare brackets exist. (#1261)
+* [JRuby] SAX parser cuts texts in pieces when square brackets exist. (#1261)
 * [JRuby] Namespaced attributes aren't removed by remove_attribute. (#1299)
 
 
@@ -69,7 +83,7 @@ This version pulls in an upstream patch to the vendored libxml2 to address:
 
 * unclosed comment uninitialized access issue (#1376)
 
-This issue does not have a CVE assigned to it as this time.
+This issue was assigned CVE-2015-8710 after the fact. See http://seclists.org/oss-sec/2015/q4/616 for details.
 
 
 === 1.6.6.3 / 2015-11-16

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "https://rubygems.org/"
 
-gem "mini_portile2", "~>2.0.0"
+gem "mini_portile2", "~>2.1.0"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -14,7 +14,7 @@ gem "hoe-git", ">=1.4", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]
 gem "rake", ">=0.9", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.4.2", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.5.0", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
 gem "hoe", "~>3.14", :group => [:development, :test]

data/LICENSE.txt

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2008 - 2015:
+Copyright (c) 2008 - 2016:
 
 * [Aaron Patterson](http://tenderlovemaking.com)
 * [Mike Dalessio](http://mike.daless.io)

data/Manifest.txt

@@ -3,7 +3,6 @@
 .editorconfig
 .gemtest
 .travis.yml
-CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
 CONTRIBUTING.md
 C_CODING_STYLE.rdoc

data/Rakefile

@@ -129,7 +129,7 @@ HOE = Hoe.spec 'nokogiri' do
   unless java?
     self.extra_deps += [
       # Keep this version in sync with the one in extconf.rb !
-      ["mini_portile2",    "~> 2.0.0"],
+      ["mini_portile2",    "~> 2.1.0"],
     ]
   end
 
@@ -141,7 +141,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
     ["rake-compiler",   "~> 0.9.2"],
-    ["rake-compiler-dock", "~> 0.4.2"],
+    ["rake-compiler-dock", "~> 0.5.0"],
     ["racc",            ">= 1.4.6"],
     ["rexical",         ">= 1.0.5"]
   ]
@@ -184,6 +184,7 @@ if java?
     ext.target_version = '1.6'
     jars = ["#{jruby_home}/lib/jruby.jar"] + FileList['lib/*.jar']
     ext.classpath = jars.map { |x| File.expand_path x }.join ':'
+    ext.debug = true if ENV['JAVA_DEBUG']
   end
 
   task gem_build_path => [:compile] do
@@ -295,7 +296,8 @@ end
 require 'tasks/test'
 
 task :java_debug do
-  ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if java? && ENV['JAVA_DEBUG']
+  ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} --debug --dev"
+  ENV['JAVA_OPTS'] = '-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y' if ENV['JAVA_DEBUG']
 end
 
 if java?

data/ext/nokogiri/extconf.rb

@@ -57,7 +57,6 @@ def do_clean
     # clean the ports build directory
     Pathname.glob(pwd.join('tmp', '*', 'ports')) { |dir|
       FileUtils.rm_rf(dir, verbose: true)
-      FileUtils.rmdir(dir.parent, parents: true, verbose: true)
     }
 
     if enable_config('static')
@@ -393,7 +392,7 @@ else
 
   # The gem version constraint in the Rakefile is not respected at install time.
   # Keep this version in sync with the one in the Rakefile !
-  gem "mini_portile2", "~> 2.0.0"
+  gem "mini_portile2", "~> 2.1.0"
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 

data/ext/nokogiri/html_document.c

@@ -18,8 +18,8 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   external_id = rb_ary_entry(rest, (long)1);
 
   doc = htmlNewDoc(
-      RTEST(uri) ? (const xmlChar *)StringValuePtr(uri) : NULL,
-      RTEST(external_id) ? (const xmlChar *)StringValuePtr(external_id) : NULL
+      RTEST(uri) ? (const xmlChar *)StringValueCStr(uri) : NULL,
+      RTEST(external_id) ? (const xmlChar *)StringValueCStr(external_id) : NULL
   );
   rb_doc = Nokogiri_wrap_xml_document(klass, doc);
   rb_obj_call_init(rb_doc, argc, argv);
@@ -39,8 +39,8 @@ static VALUE read_io( VALUE klass,
                       VALUE encoding,
                       VALUE options )
 {
-  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
-  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValueCStr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValueCStr(encoding);
   VALUE error_list      = rb_ary_new();
   VALUE document;
   htmlDocPtr doc;
@@ -103,8 +103,8 @@ static VALUE read_memory( VALUE klass,
                           VALUE options )
 {
   const char * c_buffer = StringValuePtr(string);
-  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
-  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValueCStr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValueCStr(encoding);
   int len               = (int)RSTRING_LEN(string);
   VALUE error_list      = rb_ary_new();
   VALUE document;

data/ext/nokogiri/html_element_description.c

@@ -245,7 +245,7 @@ static VALUE name(VALUE self)
 static VALUE get_description(VALUE klass, VALUE tag_name)
 {
   const htmlElemDesc * description = htmlTagLookup(
-      (const xmlChar *)StringValuePtr(tag_name)
+      (const xmlChar *)StringValueCStr(tag_name)
   );
 
   if(NULL == description) return Qnil;

data/ext/nokogiri/html_entity_lookup.c

@@ -9,7 +9,7 @@
 static VALUE get(VALUE self, VALUE key)
 {
   const htmlEntityDesc * desc =
-    htmlEntityLookup((const xmlChar *)StringValuePtr(key));
+    htmlEntityLookup((const xmlChar *)StringValueCStr(key));
   VALUE klass, args[3];
 
   if(NULL == desc) return Qnil;

data/ext/nokogiri/html_sax_parser_context.c

@@ -31,12 +31,12 @@ parse_memory(VALUE klass, VALUE data, VALUE encoding)
     }
 
     if (RTEST(encoding)) {
-	xmlCharEncodingHandlerPtr enc = xmlFindCharEncodingHandler(StringValuePtr(encoding));
+	xmlCharEncodingHandlerPtr enc = xmlFindCharEncodingHandler(StringValueCStr(encoding));
 	if (enc != NULL) {
 	    xmlSwitchToEncoding(ctxt, enc);
 	    if (ctxt->errNo == XML_ERR_UNSUPPORTED_ENCODING) {
 		rb_raise(rb_eRuntimeError, "Unsupported encoding %s",
-			 StringValuePtr(encoding));
+			 StringValueCStr(encoding));
 	    }
 	}
     }
@@ -47,8 +47,8 @@ parse_memory(VALUE klass, VALUE data, VALUE encoding)
 static VALUE parse_file(VALUE klass, VALUE filename, VALUE encoding)
 {
   htmlParserCtxtPtr ctxt = htmlCreateFileParserCtxt(
-      StringValuePtr(filename),
-      StringValuePtr(encoding)
+      StringValueCStr(filename),
+      StringValueCStr(encoding)
   );
   return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
 }

data/ext/nokogiri/html_sax_push_parser.c

@@ -46,10 +46,10 @@ static VALUE initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename,
 
   Data_Get_Struct(_xml_sax, xmlSAXHandler, sax);
 
-  if(_filename != Qnil) filename = StringValuePtr(_filename);
+  if(_filename != Qnil) filename = StringValueCStr(_filename);
 
   if (!NIL_P(encoding)) {
-    enc = xmlParseCharEncoding(StringValuePtr(encoding));
+    enc = xmlParseCharEncoding(StringValueCStr(encoding));
     if (enc == XML_CHAR_ENCODING_ERROR)
       rb_raise(rb_eArgError, "Unsupported Encoding");
   }

data/ext/nokogiri/xml_attr.c

@@ -20,7 +20,7 @@ static VALUE set_value(VALUE self, VALUE content)
     xmlNode *tmp;
 
     /* Encode our content */
-    buffer = xmlEncodeEntitiesReentrant(attr->doc, (unsigned char *)StringValuePtr(content));
+    buffer = xmlEncodeEntitiesReentrant(attr->doc, (unsigned char *)StringValueCStr(content));
 
     attr->children = xmlStringGetNodeList(attr->doc, buffer);
     attr->last = NULL;
@@ -61,7 +61,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   node = xmlNewDocProp(
       xml_doc,
-      (const xmlChar *)StringValuePtr(name),
+      (const xmlChar *)StringValueCStr(name),
       NULL
   );
 

data/ext/nokogiri/xml_comment.c

@@ -34,7 +34,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   node = xmlNewDocComment(
       xml_doc,
-      (const xmlChar *)StringValuePtr(content)
+      (const xmlChar *)StringValueCStr(content)
   );
 
   rb_node = Nokogiri_wrap_xml_node(klass, node);

data/ext/nokogiri/xml_document.c

@@ -181,7 +181,7 @@ static VALUE set_encoding(VALUE self, VALUE encoding)
   if (doc->encoding)
       free((char *) doc->encoding); /* this may produce a gcc cast warning */
 
-  doc->encoding = xmlStrdup((xmlChar *)StringValuePtr(encoding));
+  doc->encoding = xmlStrdup((xmlChar *)StringValueCStr(encoding));
 
   return encoding;
 }
@@ -228,8 +228,8 @@ static VALUE read_io( VALUE klass,
                       VALUE encoding,
                       VALUE options )
 {
-  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
-  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValueCStr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValueCStr(encoding);
   VALUE error_list      = rb_ary_new();
   VALUE document;
   xmlDocPtr doc;
@@ -279,8 +279,8 @@ static VALUE read_memory( VALUE klass,
                           VALUE options )
 {
   const char * c_buffer = StringValuePtr(string);
-  const char * c_url    = NIL_P(url)      ? NULL : StringValuePtr(url);
-  const char * c_enc    = NIL_P(encoding) ? NULL : StringValuePtr(encoding);
+  const char * c_url    = NIL_P(url)      ? NULL : StringValueCStr(url);
+  const char * c_enc    = NIL_P(encoding) ? NULL : StringValueCStr(encoding);
   int len               = (int)RSTRING_LEN(string);
   VALUE error_list      = rb_ary_new();
   VALUE document;
@@ -355,7 +355,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   version = rb_ary_entry(rest, (long)0);
   if (NIL_P(version)) version = rb_str_new2("1.0");
 
-  doc = xmlNewDoc((xmlChar *)StringValuePtr(version));
+  doc = xmlNewDoc((xmlChar *)StringValueCStr(version));
   rb_doc = Nokogiri_wrap_xml_document(klass, doc);
   rb_obj_call_init(rb_doc, argc, argv);
   return rb_doc ;
@@ -383,13 +383,13 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
  *         </bicycle>
  *       </root>
  *       EOXML
- *    
+ *
  *    doc.xpath("//tire").to_s # => ""
  *    doc.xpath("//part:tire", "part" => "http://general-motors.com/").to_s # => "<part:tire>Michelin Model XGV</part:tire>"
  *    doc.xpath("//part:tire", "part" => "http://schwinn.com/").to_s # => "<part:tire>I'm a bicycle tire!</part:tire>"
- *    
+ *
  *    doc.remove_namespaces!
- *    
+ *
  *    doc.xpath("//tire").to_s # => "<tire>Michelin Model XGV</tire><tire>I'm a bicycle tire!</tire>"
  *    doc.xpath("//part:tire", "part" => "http://general-motors.com/").to_s # => ""
  *    doc.xpath("//part:tire", "part" => "http://schwinn.com/").to_s # => ""
@@ -436,11 +436,11 @@ static VALUE create_entity(int argc, VALUE *argv, VALUE self)
   xmlResetLastError();
   ptr = xmlAddDocEntity(
       doc,
-      (xmlChar *)(NIL_P(name)        ? NULL                        : StringValuePtr(name)),
+      (xmlChar *)(NIL_P(name)        ? NULL                        : StringValueCStr(name)),
       (int)      (NIL_P(type)        ? XML_INTERNAL_GENERAL_ENTITY : NUM2INT(type)),
-      (xmlChar *)(NIL_P(external_id) ? NULL                        : StringValuePtr(external_id)),
-      (xmlChar *)(NIL_P(system_id)   ? NULL                        : StringValuePtr(system_id)),
-      (xmlChar *)(NIL_P(content)     ? NULL                        : StringValuePtr(content))
+      (xmlChar *)(NIL_P(external_id) ? NULL                        : StringValueCStr(external_id)),
+      (xmlChar *)(NIL_P(system_id)   ? NULL                        : StringValueCStr(system_id)),
+      (xmlChar *)(NIL_P(content)     ? NULL                        : StringValueCStr(content))
     );
 
   if(NULL == ptr) {
@@ -484,9 +484,9 @@ static int block_caller(void * ctx, xmlNodePtr _node, xmlNodePtr _parent)
  *  doc.canonicalize { |obj, parent| ... }
  *
  * Canonicalize a document and return the results.  Takes an optional block
- * that takes two parameters: the +obj+ and that node's +parent+.  
+ * that takes two parameters: the +obj+ and that node's +parent+.
  * The  +obj+ will be either a Nokogiri::XML::Node, or a Nokogiri::XML::Namespace
- * The block must return a non-nil, non-false value if the +obj+ passed in 
+ * The block must return a non-nil, non-false value if the +obj+ passed in
  * should be included in the canonicalized document.
  */
 static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
@@ -531,14 +531,14 @@ static VALUE canonicalize(int argc, VALUE* argv, VALUE self)
     ns = calloc((size_t)ns_len+1, sizeof(xmlChar *));
     for (i = 0 ; i < ns_len ; i++) {
       VALUE entry = rb_ary_entry(incl_ns, i);
-      const char * ptr = StringValuePtr(entry);
+      const char * ptr = StringValueCStr(entry);
       ns[i] = (xmlChar*) ptr;
     }
   }
 
 
-  xmlC14NExecute(doc, cb, ctx, 
-    (int)      (NIL_P(mode)        ? 0 : NUM2INT(mode)), 
+  xmlC14NExecute(doc, cb, ctx,
+    (int)      (NIL_P(mode)        ? 0 : NUM2INT(mode)),
     ns,
     (int)      RTEST(with_comments),
     buf);

data/ext/nokogiri/xml_encoding_handler.c

@@ -9,7 +9,7 @@ static VALUE get(VALUE klass, VALUE key)
 {
   xmlCharEncodingHandlerPtr handler;
 
-  handler = xmlFindCharEncodingHandler(StringValuePtr(key));
+  handler = xmlFindCharEncodingHandler(StringValueCStr(key));
   if(handler)
     return Data_Wrap_Struct(klass, NULL, NULL, handler);
 
@@ -23,7 +23,7 @@ static VALUE get(VALUE klass, VALUE key)
  */
 static VALUE delete(VALUE klass, VALUE name)
 {
-  if(xmlDelEncodingAlias(StringValuePtr(name))) return Qnil;
+  if(xmlDelEncodingAlias(StringValueCStr(name))) return Qnil;
 
   return Qtrue;
 }
@@ -35,7 +35,7 @@ static VALUE delete(VALUE klass, VALUE name)
  */
 static VALUE alias(VALUE klass, VALUE from, VALUE to)
 {
-  xmlAddEncodingAlias(StringValuePtr(from), StringValuePtr(to));
+  xmlAddEncodingAlias(StringValueCStr(from), StringValueCStr(to));
 
   return to;
 }

data/ext/nokogiri/xml_entity_reference.c

@@ -21,7 +21,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   node = xmlNewReference(
       xml_doc,
-      (const xmlChar *)StringValuePtr(name)
+      (const xmlChar *)StringValueCStr(name)
   );
 
   nokogiri_root_node(node);

data/ext/nokogiri/xml_node.c

@@ -331,7 +331,7 @@ static VALUE encode_special_chars(VALUE self, VALUE string)
   Data_Get_Struct(self, xmlNode, node);
   encoded = xmlEncodeSpecialChars(
       node->doc,
-      (const xmlChar *)StringValuePtr(string)
+      (const xmlChar *)StringValueCStr(string)
   );
 
   encoded_str = NOKOGIRI_STR_NEW2(encoded);
@@ -367,9 +367,9 @@ static VALUE create_internal_subset(VALUE self, VALUE name, VALUE external_id, V
 
   dtd = xmlCreateIntSubset(
       doc,
-      NIL_P(name)        ? NULL : (const xmlChar *)StringValuePtr(name),
-      NIL_P(external_id) ? NULL : (const xmlChar *)StringValuePtr(external_id),
-      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValuePtr(system_id)
+      NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
+      NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
+      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
   );
 
   if(!dtd) return Qnil;
@@ -398,9 +398,9 @@ static VALUE create_external_subset(VALUE self, VALUE name, VALUE external_id, V
 
   dtd = xmlNewDtd(
       doc,
-      NIL_P(name)        ? NULL : (const xmlChar *)StringValuePtr(name),
-      NIL_P(external_id) ? NULL : (const xmlChar *)StringValuePtr(external_id),
-      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValuePtr(system_id)
+      NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
+      NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
+      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
   );
 
   if(!dtd) return Qnil;
@@ -737,7 +737,7 @@ static VALUE key_eh(VALUE self, VALUE attribute)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  if(xmlHasProp(node, (xmlChar *)StringValuePtr(attribute)))
+  if(xmlHasProp(node, (xmlChar *)StringValueCStr(attribute)))
     return Qtrue;
   return Qfalse;
 }
@@ -752,8 +752,8 @@ static VALUE namespaced_key_eh(VALUE self, VALUE attribute, VALUE namespace)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  if(xmlHasNsProp(node, (xmlChar *)StringValuePtr(attribute),
-        NIL_P(namespace) ? NULL : (xmlChar *)StringValuePtr(namespace)))
+  if(xmlHasNsProp(node, (xmlChar *)StringValueCStr(attribute),
+        NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace)))
     return Qtrue;
   return Qfalse;
 }
@@ -778,7 +778,7 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
    */
   if (node->type != XML_ELEMENT_NODE)
     return(Qnil);
-  prop = xmlHasProp(node, (xmlChar *)StringValuePtr(property));
+  prop = xmlHasProp(node, (xmlChar *)StringValueCStr(property));
   if (prop && prop->children) {
     for (cur = prop->children; cur; cur = cur->next) {
       if (cur->_private) {
@@ -788,8 +788,8 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
     }
   }
 
-  xmlSetProp(node, (xmlChar *)StringValuePtr(property),
-      (xmlChar *)StringValuePtr(value));
+  xmlSetProp(node, (xmlChar *)StringValueCStr(property),
+      (xmlChar *)StringValueCStr(value));
 
   return value;
 }
@@ -812,7 +812,7 @@ static VALUE get(VALUE self, VALUE rattribute)
   if (NIL_P(rattribute)) return Qnil;
 
   Data_Get_Struct(self, xmlNode, node);
-  attribute = strdup(StringValuePtr(rattribute));
+  attribute = strdup(StringValueCStr(rattribute));
 
   colon = strchr(attribute, ':');
   if (colon) {
@@ -823,7 +823,7 @@ static VALUE get(VALUE self, VALUE rattribute)
     if (ns) {
       value = xmlGetNsProp(node, (xmlChar*)(attr_name), ns->href);
     } else {
-      value = xmlGetProp(node, (xmlChar*)StringValuePtr(rattribute));
+      value = xmlGetProp(node, (xmlChar*)StringValueCStr(rattribute));
     }
   } else {
     value = xmlGetNoNsProp(node, (xmlChar*)attribute);
@@ -870,7 +870,7 @@ static VALUE attr(VALUE self, VALUE name)
   xmlNodePtr node;
   xmlAttrPtr prop;
   Data_Get_Struct(self, xmlNode, node);
-  prop = xmlHasProp(node, (xmlChar *)StringValuePtr(name));
+  prop = xmlHasProp(node, (xmlChar *)StringValueCStr(name));
 
   if(! prop) return Qnil;
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)prop);
@@ -887,8 +887,8 @@ static VALUE attribute_with_ns(VALUE self, VALUE name, VALUE namespace)
   xmlNodePtr node;
   xmlAttrPtr prop;
   Data_Get_Struct(self, xmlNode, node);
-  prop = xmlHasNsProp(node, (xmlChar *)StringValuePtr(name),
-      NIL_P(namespace) ? NULL : (xmlChar *)StringValuePtr(namespace));
+  prop = xmlHasNsProp(node, (xmlChar *)StringValueCStr(name),
+      NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace));
 
   if(! prop) return Qnil;
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)prop);
@@ -1025,7 +1025,7 @@ static VALUE set_native_content(VALUE self, VALUE content)
     child = next ;
   }
 
-  xmlNodeSetContent(node, (xmlChar *)StringValuePtr(content));
+  xmlNodeSetContent(node, (xmlChar *)StringValueCStr(content));
   return content;
 }
 
@@ -1063,7 +1063,7 @@ static VALUE set_lang(VALUE self_rb, VALUE lang_rb)
   xmlChar* lang ;
 
   Data_Get_Struct(self_rb, xmlNode, self);
-  lang = (xmlChar*)StringValuePtr(lang_rb);
+  lang = (xmlChar*)StringValueCStr(lang_rb);
 
   xmlNodeSetLang(self, lang);
 
@@ -1128,7 +1128,7 @@ static VALUE set_name(VALUE self, VALUE new_name)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  xmlNodeSetName(node, (xmlChar*)StringValuePtr(new_name));
+  xmlNodeSetName(node, (xmlChar*)StringValueCStr(new_name));
   return new_name;
 }
 
@@ -1202,13 +1202,13 @@ static VALUE native_write_to(
 
   before_indent = xmlTreeIndentString;
 
-  xmlTreeIndentString = StringValuePtr(indent_string);
+  xmlTreeIndentString = StringValueCStr(indent_string);
 
   savectx = xmlSaveToIO(
       (xmlOutputWriteCallback)io_write_callback,
       (xmlOutputCloseCallback)io_close_callback,
       (void *)io,
-      RTEST(encoding) ? StringValuePtr(encoding) : NULL,
+      RTEST(encoding) ? StringValueCStr(encoding) : NULL,
       (int)NUM2INT(options)
   );
 
@@ -1255,7 +1255,7 @@ static VALUE add_namespace_definition(VALUE self, VALUE prefix, VALUE href)
   ns = xmlSearchNs(
       node->doc,
       node,
-      (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
+      (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
   );
 
   if(!ns) {
@@ -1264,8 +1264,8 @@ static VALUE add_namespace_definition(VALUE self, VALUE prefix, VALUE href)
     }
     ns = xmlNewNs(
         namespacee,
-        (const xmlChar *)StringValuePtr(href),
-        (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
+        (const xmlChar *)StringValueCStr(href),
+        (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
     );
   }
 
@@ -1295,7 +1295,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   Data_Get_Struct(document, xmlDoc, doc);
 
-  node = xmlNewNode(NULL, (xmlChar *)StringValuePtr(name));
+  node = xmlNewNode(NULL, (xmlChar *)StringValueCStr(name));
   node->doc = doc->doc;
   nokogiri_root_node(node);