[前][次][番号順一覧][スレッド一覧]

ruby-changes:70773

From: Peter <ko1@a...>
Date: Fri, 7 Jan 2022 07:23:20 +0900 (JST)
Subject: [ruby-changes:70773] ae0d67d762 (master): Revert "Set encoding before concatenating to string"

https://git.ruby-lang.org/ruby.git/commit/?id=ae0d67d762

From ae0d67d762a0849cc629a004c2ae9182292b19bd Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@p...>
Date: Thu, 6 Jan 2022 17:22:11 -0500
Subject: Revert "Set encoding before concatenating to string"

This reverts commit 44368b5f8bc21e19fa06a0fc0625923fc41293e6.
---
 string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/string.c b/string.c
index 389af1e73af..a3aac2fcbf3 100644
--- a/string.c
+++ b/string.c
@@ -3187,8 +3187,8 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, https://github.com/ruby/ruby/blob/trunk/string.c#L3187
             if (len == 0)
                 return str;
             if (RSTRING_LEN(str) == 0) {
-                ENCODING_CODERANGE_SET(str, ptr_encindex, ptr_cr);
                 rb_str_buf_cat(str, ptr, len);
+                ENCODING_CODERANGE_SET(str, ptr_encindex, ptr_cr);
                 return str;
             }
             goto incompatible;
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]