fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #180 from fhomolka/plug_bullet_build_fix

Browse source 
[Minor] Fix plugin.c failing when building Bullet Plugin
This commit is contained in:
Marco Cawthorne 2023-06-02 09:31:31 -07:00 committed by GitHub
commit 7604e8e655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/plugin.c
View file

@ -264,19 +264,31 @@ qboolean ZF_ReallocElements(void **ptr, size_t *elements, size_t newelements, si
//protect against malicious overflows //protect against malicious overflows
if (newelements > SIZE_MAX / elementsize) if (newelements > SIZE_MAX / elementsize)
#ifdef __cplusplus
return qfalse;
#else
return false; return false;
#endif
oldsize = *elements * elementsize; oldsize = *elements * elementsize;
newsize = newelements * elementsize; newsize = newelements * elementsize;
n = plugfuncs->Realloc(*ptr, newsize); n = plugfuncs->Realloc(*ptr, newsize);
if (!n) if (!n)
#ifdef __cplusplus
return qfalse;
#else
return false; return false;
#endif
if (newsize > oldsize) if (newsize > oldsize)
memset((char*)n+oldsize, 0, newsize - oldsize); memset((char*)n+oldsize, 0, newsize - oldsize);
*elements = newelements; *elements = newelements;
*ptr = n; *ptr = n;
#ifdef __cplusplus
return qtrue;
#else
return true; return true;
#endif
} }