1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #20239] Fix overflow at down-casting

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-02-07 11:00:47 +09:00
parent 8bd83bb133
commit 75aaeb35b8
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
2 changed files with 2 additions and 2 deletions
Show Stats 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

@ -3521,7 +3521,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(encode, sprev, end)) < s) while (sprev + (len = enclen(encode, sprev, end)) < s)
sprev += len; sprev += len;