psych 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec86c3f6651b1fada82948d0eedf7b90e793b5009000cd1339f59625bea67099
-  data.tar.gz: 21add9c5d592cef7b4e2c1510d7f73ef038dd67d96aada5b42c689e1b70bf343
+  metadata.gz: 289d2a9532c36be34f187b80d36eb98ebac368da3539a44e8e6e291bc7f184eb
+  data.tar.gz: d717de45e2a5519d4a2c27a26a2e1aed7269e1c80b5213a19c070f1d56712a03
 SHA512:
-  metadata.gz: 5a72478d1e959e4d226dbee171299753064d3714b0d07f222b1aba87d0dc45de82c8f88b3c70e70c55da64017313bc143676a76f64ffd30423d5740396bbed46
-  data.tar.gz: fd64458ae3b633ac079bec30a94bef77bca75b694f93f4d3dae37da35ec49911e46de7d1ce871e1665e3da8570fa01f5616722a5b064a649d7186d8d74305380
+  metadata.gz: d00bc06b2fd173ea66dbb8f7b5a5ad75ad6074eff6f011d9d9774ef33662a0c0e642f0dd4daa67776b1a89fdb54854932809351b12052eea00c69b9499792639
+  data.tar.gz: 27428cdb1bce30907b2654310632967274e1bb2dd43a5a7e634577cf797911b4931b4165e57c8e6545e08f1e9c9979be18600ed3d9a589e52d7df5360b7689f3

data/README.md

@@ -26,8 +26,8 @@ Psych.dump("foo")     # => "--- foo\n...\n"
 
 ## Installation
 
-Psych has been included with MRI since 1.9.2, and is the default YAML parser
-in 1.9.3.
+Psych has been included with MRI since 1.9.2, and has been the default YAML parser
+since 1.9.3.
 
 If you want a newer gem release of Psych, you can use RubyGems:
 

data/ext/psych/psych_parser.c

@@ -32,9 +32,20 @@ static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
     *read = 0;
 
     if(! NIL_P(string)) {
-        void * str = (void *)StringValuePtr(string);
-        *read = (size_t)RSTRING_LEN(string);
-        memcpy(buf, str, *read);
+        char * str = StringValuePtr(string);
+        size_t len = (size_t)RSTRING_LEN(string);
+
+        /* IO#read(size) is documented to return at most `size` bytes, but a
+         * misbehaving IO-like object may return more. Clamp the copy to the
+         * buffer libyaml gave us to avoid writing past its end, rounding down
+         * to a character boundary so a multibyte character is never split. */
+        if(len > size) {
+            rb_encoding * enc = rb_enc_get(string);
+            len = (size_t)(rb_enc_left_char_head(str, str + size, str + len, enc) - str);
+        }
+
+        *read = len;
+        memcpy(buf, str, len);
     }
 
     return 1;

data/lib/psych/versions.rb

@@ -2,7 +2,7 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.3.1'
+  VERSION = '5.4.0'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '2.10'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Aaron Patterson