aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-22 08:34:29 -04:00
Code Activity

patch 8.2.4255: theoretical computation overflow

Browse Source 
Problem:    Theoretical computation overflow.
Solution:   Perform multiplication in a wider type. (closes #9657)
This commit is contained in:
=?UTF-8?q?Dundar=20G=C3=B6c?=
2022-01-29 15:19:23 +00:00
committed by Bram Moolenaar
parent f12b7815f6
commit d5cec1f1f0
11 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/memfile.c
View File

@@ -249,7 +249,7 @@ mf_close(memfile_T *mfp, int del_file)
// free entries in used list
for (hp = mfp->mf_used_first; hp != NULL; hp = nextp)
{
total_mem_used -= hp->bh_page_count * mfp->mf_page_size;
total_mem_used -= (long_u)hp->bh_page_count * mfp->mf_page_size;
nextp = hp->bh_next;
mf_free_bhdr(hp);
}
@@ -359,7 +359,7 @@ mf_new(memfile_T *mfp, int negative, int page_count)
}
else if (hp == NULL) // need to allocate memory for this block
{
if ((p = alloc(mfp->mf_page_size * page_count)) == NULL)
if ((p = alloc((size_t)mfp->mf_page_size * page_count)) == NULL)
return NULL;
hp = mf_rem_free(mfp);
hp->bh_data = p;
@@ -718,7 +718,7 @@ mf_ins_used(memfile_T *mfp, bhdr_T *hp)
else
hp->bh_next->bh_prev = hp;
mfp->mf_used_count += hp->bh_page_count;
total_mem_used += hp->bh_page_count * mfp->mf_page_size;
total_mem_used += (long_u)hp->bh_page_count * mfp->mf_page_size;
}
/*
@@ -736,7 +736,7 @@ mf_rem_used(memfile_T *mfp, bhdr_T *hp)
else
hp->bh_prev->bh_next = hp->bh_next;
mfp->mf_used_count -= hp->bh_page_count;
total_mem_used -= hp->bh_page_count * mfp->mf_page_size;
total_mem_used -= (long_u)hp->bh_page_count * mfp->mf_page_size;
}
/*
@@ -814,7 +814,8 @@ mf_release(memfile_T *mfp, int page_count)
if (hp->bh_page_count != page_count)
{
vim_free(hp->bh_data);
if ((hp->bh_data = alloc(mfp->mf_page_size * page_count)) == NULL)
if ((hp->bh_data = alloc((size_t)mfp->mf_page_size * page_count))
== NULL)
{
vim_free(hp);
return NULL;
@@ -881,7 +882,8 @@ mf_alloc_bhdr(memfile_T *mfp, int page_count)
if ((hp = ALLOC_ONE(bhdr_T)) != NULL)
{
if ((hp->bh_data = alloc(mfp->mf_page_size * page_count)) == NULL)
if ((hp->bh_data = alloc((size_t)mfp->mf_page_size * page_count))
== NULL)
{
vim_free(hp); // not enough memory
return NULL;