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

Return ONIGERR_MEMORY if it fails to allocate memory for cache_match_opt

Browse Source
This commit is contained in:
Yusuke Endoh 2022-11-08 18:09:57 +09:00
parent a1c1fc558a
commit ff5dba8319
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
regexec.c
View File

@ -3833,20 +3833,22 @@ match_at(regex_t* reg, const UChar* str, const UChar* end,
if (msa->cache_index_table == NULL) { if (msa->cache_index_table == NULL) {
OnigCacheIndex *table = (OnigCacheIndex *)xmalloc(table_size * sizeof(OnigCacheIndex)); OnigCacheIndex *table = (OnigCacheIndex *)xmalloc(table_size * sizeof(OnigCacheIndex));
if (table == NULL) { if (table == NULL) {
msa->enable_cache_match_opt = 0; return ONIGERR_MEMORY;
goto fail_match_cache_opt;
} }
init_cache_index_table(reg, table); init_cache_index_table(reg, table);
msa->cache_index_table = table; msa->cache_index_table = table;
msa->num_cache_table = table_size; msa->num_cache_table = table_size;
} }
// TODO: check arithemetic overflow. size_t len = (end - str) + 1;
int match_cache_size8 = msa->num_cache_opcode * ((int)(end - str) + 1); size_t match_cache_size8 = (size_t)msa->num_cache_opcode * len;
int match_cache_size = (match_cache_size8 >> 3) + (match_cache_size8 & 7 ? 1 : 0); /* overflow check */
if (match_cache_size8 / len != (size_t)msa->num_cache_opcode) {
return ONIGERR_MEMORY;
}
size_t match_cache_size = (match_cache_size8 >> 3) + (match_cache_size8 & 7 ? 1 : 0);
msa->match_cache = (uint8_t*)xmalloc(match_cache_size * sizeof(uint8_t)); msa->match_cache = (uint8_t*)xmalloc(match_cache_size * sizeof(uint8_t));
if (msa->match_cache == NULL) { if (msa->match_cache == NULL) {
msa->enable_cache_match_opt = 0; return ONIGERR_MEMORY;
goto fail_match_cache_opt;
} }
xmemset(msa->match_cache, 0, match_cache_size * sizeof(uint8_t)); xmemset(msa->match_cache, 0, match_cache_size * sizeof(uint8_t));
} }