stringio 3.1.1 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f8291051ef78bfdd817200ff02c25db3e2fa495d9b4a164c9737511d6eadb38
-  data.tar.gz: 8593995f8dbb66e6a3dc9f2755f97d0cc05e2d363e6cd027cc15a7d46deaf60f
+  metadata.gz: d32a3b9eb5ecb12a5c78c7a79418ed351272fe49a2fc1bbde837880a8e6a2a53
+  data.tar.gz: 8f965cb4f731147e7d6da44db5acbeda3a08ac51df419445d8001f35b17a1dc9
 SHA512:
-  metadata.gz: 5060643c29e66ccc88df7a7ab4c19943d89ce3779641b9be7e0cfc61ce79db7c53af06367875b1892b80f31d98be32d10da2590445cb86425b7d89f285a30b5f
-  data.tar.gz: 1a6dcf694eaa38dd0d939b8db9cb4f29cc96db93ac545f5f06d6354ad5e75f92fb9807f529f54ae6801a3f791e7139db7ad371bf8efd6b7ca34f45f61fb10429
+  metadata.gz: 6c3f11fa1dee2b8e00269cad5e99db7014ecdc7b1b7d99f5086d15fb3f04d17105dabd838887e5f87af817851e2a8a59260c7c7af26a5ea40f2ce103ad830775
+  data.tar.gz: c9e2afe1c8104c27591454cfeefdc71926c76196d3afc343f76052b9e465566f62df19ae25baaa1217839684910b0c94e4d05b7b08723f1960065f0c2d0844df

data/NEWS.md

@@ -1,5 +1,82 @@
 # News
 
+## 3.1.7 - 2025-04-21
+
+### Improvements
+
+  * CRuby: Added support for `rb_io_mode_t` that will be introduced in
+    Ruby 3.5 or later.
+    * GH-129
+    * Patch by Samuel Williams
+
+### Thanks
+
+  * Samuel Williams
+
+## 3.1.6 - 2025-03-25
+
+### Fixes
+
+  * CRuby: Fix SEGV at unget to a null device StringIO
+  * JRuby:
+    * Fix NullPointerException at unget to a null device StringIO
+    * Use proper checkEncoding signature
+    * Update strioWrite logic to match CRuby
+    * GH-124
+
+## 3.1.5 - 2025-02-21
+
+### Improvements
+
+  * JRuby: Improved compatibility with CRuby for `StringIO#seek` with
+    frozen string.
+    * GH-119
+    * GH-121
+
+## 3.1.4 - 2025-02-20
+
+### Improvements
+
+  * JRuby: Improved compatibility with CRuby.
+    * GH-116
+
+### Fixes
+
+  * CRuby: Fixed a bug that `StringIO` may mutate a shared string.
+    * GH-117
+
+## 3.1.3 - 2025-02-14
+
+### Fixes
+
+  * JRuby: Fixed a bug that JRuby may not be able to be started
+    * GH-112
+    * GH-113
+    * Reported by Karol Bucek
+
+### Thanks
+
+  * Karol Bucek
+
+## 3.1.2 - 2024-11-07
+
+### Improvements
+
+  * JRuby: Added support for detecting encoding by BOM.
+    * GH-100
+    * GH-101
+
+### Fixes
+
+  * CRuby: Fixed a bug that unknown memory may be used by
+    `StringIO#ungetc`/`StringIO#ungetbyte`.
+    * https://hackerone.com/reports/2805165
+    * Reported by manun.
+
+### Thanks
+
+  * manun
+
 ## 3.1.1 - 2024-06-13
 
 ### Improvements

data/ext/stringio/extconf.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: false
 require 'mkmf'
 if RUBY_ENGINE == 'ruby'
+  have_type("rb_io_mode_t", "ruby/io.h")
+
   create_makefile('stringio')
 else
   File.write('Makefile', dummy_makefile("").join)

data/ext/stringio/stringio.c

@@ -13,7 +13,7 @@
 **********************************************************************/
 
 static const char *const
-STRINGIO_VERSION = "3.1.1";
+STRINGIO_VERSION = "3.1.7";
 
 #include <stdbool.h>
 
@@ -35,12 +35,16 @@ STRINGIO_VERSION = "3.1.1";
 # define rb_class_new_instance_kw(argc, argv, klass, kw_splat) rb_class_new_instance(argc, argv, klass)
 #endif
 
+#ifndef HAVE_TYPE_RB_IO_MODE_T
+typedef int rb_io_mode_t;
+#endif
+
 struct StringIO {
     VALUE string;
     rb_encoding *enc;
     long pos;
     long lineno;
-    int flags;
+    rb_io_mode_t flags;
     int count;
 };
 
@@ -180,6 +184,9 @@ check_modifiable(struct StringIO *ptr)
     else if (OBJ_FROZEN_RAW(ptr->string)) {
 	rb_raise(rb_eIOError, "not modifiable string");
     }
+    else {
+	rb_str_modify(ptr->string);
+    }
 }
 
 static VALUE
@@ -930,6 +937,18 @@ strio_extend(struct StringIO *ptr, long pos, long len)
     }
 }
 
+static void
+strio_unget_string(struct StringIO *ptr, VALUE c)
+{
+    const char *cp = NULL;
+    long cl = RSTRING_LEN(c);
+    if (cl > 0) {
+	if (c != ptr->string) cp = RSTRING_PTR(c);
+	strio_unget_bytes(ptr, cp, cl);
+	RB_GC_GUARD(c);
+    }
+}
+
 /*
  * call-seq:
  *   ungetc(character) -> nil
@@ -952,19 +971,22 @@ strio_ungetc(VALUE self, VALUE c)
 
 	enc = rb_enc_get(ptr->string);
 	len = rb_enc_codelen(cc, enc);
-	if (len <= 0) rb_enc_uint_chr(cc, enc);
+	if (len <= 0) {
+	    rb_enc_uint_chr(cc, enc); /* to raise an exception */
+	    UNREACHABLE;
+	}
 	rb_enc_mbcput(cc, buf, enc);
 	return strio_unget_bytes(ptr, buf, len);
     }
     else {
-	SafeStringValue(c);
+	StringValue(c);
+	if (RSTRING_LEN(c) == 0) return Qnil;
 	enc = rb_enc_get(ptr->string);
 	enc2 = rb_enc_get(c);
 	if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
 	    c = rb_str_conv_enc(c, enc2, enc);
 	}
-	strio_unget_bytes(ptr, RSTRING_PTR(c), RSTRING_LEN(c));
-	RB_GC_GUARD(c);
+	strio_unget_string(ptr, c);
 	return Qnil;
     }
 }
@@ -991,13 +1013,8 @@ strio_ungetbyte(VALUE self, VALUE c)
 	strio_unget_bytes(ptr, &cc, 1);
     }
     else {
-	long cl;
-	SafeStringValue(c);
-	cl = RSTRING_LEN(c);
-	if (cl > 0) {
-	    strio_unget_bytes(ptr, RSTRING_PTR(c), cl);
-	    RB_GC_GUARD(c);
-	}
+	StringValue(c);
+	strio_unget_string(ptr, c);
     }
     return Qnil;
 }
@@ -1028,7 +1045,7 @@ strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
 	if (rest > cl) memset(s + len, 0, rest - cl);
 	pos -= cl;
     }
-    memcpy(s + pos, cp, cl);
+    memcpy(s + pos, (cp ? cp : s), cl);
     ptr->pos = pos;
     return Qnil;
 }
@@ -1839,7 +1856,8 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
 	enc = rb_find_encoding(ext_enc);
 	if (!enc) {
 	    rb_io_enc_t convconfig;
-	    int oflags, fmode;
+	    int oflags;
+	    rb_io_mode_t fmode;
 	    VALUE vmode = rb_str_append(rb_str_new_cstr("r:"), ext_enc);
 	    rb_io_extract_modeenc(&vmode, 0, Qnil, &oflags, &fmode, &convconfig);
 	    enc = convconfig.enc2;

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stringio
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.7
 platform: ruby
 authors:
 - Nobu Nakada
 - Charles Oliver Nutter
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies: []
 description: Pseudo `IO` class from/to `String`.
 email:
@@ -42,8 +41,8 @@ homepage: https://github.com/ruby/stringio
 licenses:
 - Ruby
 - BSD-2-Clause
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/ruby/stringio/releases/tag/v3.1.7
 rdoc_options: []
 require_paths:
 - lib
@@ -58,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Pseudo IO on String
 test_files: []