archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 75aaeb35b8: [Backport #20239]

Browse source 
[Bug #20239] Fix overflow at down-casting
This commit is contained in:
nagachika 2024-07-06 15:55:04 +09:00
parent a67b43d99e
commit 2b35d80834
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
regenc.c
View file

@ -57,7 +57,7 @@ onigenc_mbclen(const OnigUChar* p,const OnigUChar* e, OnigEncoding enc)
int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc, p, e); int ret = ONIGENC_PRECISE_MBC_ENC_LEN(enc, p, e);
if (ONIGENC_MBCLEN_CHARFOUND_P(ret)) { if (ONIGENC_MBCLEN_CHARFOUND_P(ret)) {
ret = ONIGENC_MBCLEN_CHARFOUND_LEN(ret); ret = ONIGENC_MBCLEN_CHARFOUND_LEN(ret);
if (ret > (int)(e - p)) ret = (int)(e - p); // just for case if (p + ret > e) ret = (int)(e - p); // just for case
return ret; return ret;
} }
else if (ONIGENC_MBCLEN_NEEDMORE_P(ret)) { else if (ONIGENC_MBCLEN_NEEDMORE_P(ret)) {

2
regexec.c
View file

@ -3293,7 +3293,7 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
n = pend - pstart; n = pend - pstart;
DATA_ENSURE(n); DATA_ENSURE(n);
sprev = s; sprev = s;
STRING_CMP_IC(case_fold_flag, pstart, &s, (int)n, end); STRING_CMP_IC(case_fold_flag, pstart, &s, n, end);
while (sprev + (len = enclen_approx(encode, sprev, end)) < s) while (sprev + (len = enclen_approx(encode, sprev, end)) < s)
sprev += len; sprev += len;

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4 #define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 182 #define RUBY_PATCHLEVEL 183
#include "ruby/version.h" #include "ruby/version.h"
#include "ruby/internal/abi.h" #include "ruby/internal/abi.h"