Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #10846: [Squirrel] Ensure sqvector size does not overflow #10848

Merged
merged 1 commit into from May 20, 2023
Merged

Fix #10846: [Squirrel] Ensure sqvector size does not overflow #10848

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/3rdparty/squirrel/squirrel/squtils.h
View file
Open in desktop
Expand Up @@ -2,6 +2,9 @@
#ifndef _SQUTILS_H_
#define _SQUTILS_H_

#include "../../fmt/format.h"
#include "../../../script/script_fatalerror.hpp"

void *sq_vm_malloc(SQUnsignedInteger size);
void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
void sq_vm_free(void *p,SQUnsignedInteger size);
Expand Down Expand Up @@ -102,6 +105,10 @@ template<typename T> class sqvector
void _realloc(SQUnsignedInteger newsize)
{
newsize = (newsize > 0)?newsize:4;
if (newsize > SIZE_MAX / sizeof(T)) {
std::string msg = fmt::format("cannot resize to {}", newsize);
throw Script_FatalError(msg);
}
_vals = (T*)SQ_REALLOC(_vals, _allocated * sizeof(T), newsize * sizeof(T));
_allocated = (size_t)newsize;
}
Expand Down