From f0a76f6295ce1ac2cbc7f3152949301afa95d42e Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Mon, 13 Oct 2025 22:06:11 +0900 Subject: [PATCH 1/2] ruby_defint.m4: variable names must not contain spaces --- tool/m4/ruby_defint.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tool/m4/ruby_defint.m4 b/tool/m4/ruby_defint.m4 index e9ed68e5b83abb..7f262a73fc62c2 100644 --- a/tool/m4/ruby_defint.m4 +++ b/tool/m4/ruby_defint.m4 @@ -17,7 +17,8 @@ typedef $1 t; int s = sizeof(t) == 42;])], ["${ac_cv_sizeof___int128@%:@*:}"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"], [ rb_cv_type_$1=no])])]) AS_IF([test "${rb_cv_type_$1}" != no], [ - type="${rb_cv_type_$1@%:@@%:@unsigned }" + type="${rb_cv_type_$1@%:@@%:@*signed }" + AS_IF([test "$type" = "long long"], [type=long_long]) AS_IF([test "$type" != yes && eval 'test -n "${ac_cv_sizeof_'$type'+set}"'], [ eval cond='"${ac_cv_sizeof_'$type'}"' AS_CASE([$cond], [*:*], [ From d11df4172ef203425fd7ee773b1e328b14da43c8 Mon Sep 17 00:00:00 2001 From: Sharon Rosner Date: Mon, 13 Oct 2025 16:48:31 +0200 Subject: [PATCH 2/2] [ruby/erb] html_escape: refactor redundant if (https://github.com/ruby/erb/pull/88) https://github.com/ruby/erb/commit/c231ced3f4 --- ext/erb/escape/escape.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ext/erb/escape/escape.c b/ext/erb/escape/escape.c index 9437e9694eda5f..1794fc30ebdce7 100644 --- a/ext/erb/escape/escape.c +++ b/ext/erb/escape/escape.c @@ -63,16 +63,13 @@ optimized_escape_html(VALUE str) dest += len; } } + VALUE escaped = str; if (buf) { size_t segment_len = cstr - segment_start; if (segment_len) { memcpy(dest, segment_start, segment_len); dest += segment_len; } - } - - VALUE escaped = str; - if (buf) { escaped = rb_str_new(buf, dest - buf); preserve_original_state(str, escaped); ALLOCV_END(vbuf);