Skip to content

Commit e838040

Browse files
committed
Use int arguments in VM syscalls instead of size_t to improve safety
1 parent 002ed3c commit e838040

5 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/qcommon/q_shared.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ R_RemapShader exploit
7070
http://ioqsrc.vampireducks.com/d8/dbe/q__shared_8c-source.html#l00061
7171
============
7272
*/
73-
void COM_StripExtension(const char *in, char *out, size_t destsize) {
73+
void COM_StripExtension(const char *in, char *out, int destsize) {
7474
int length;
7575
assert(out != in);
7676
Q_strncpyz(out, in, destsize);

src/qcommon/q_shared.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ void PerpendicularVector( vec3_t dst, const vec3_t src );
975975
//=============================================
976976

977977
char *COM_SkipPath( char *pathname );
978-
void COM_StripExtension(const char *in, char *out, size_t destsize);
978+
void COM_StripExtension(const char *in, char *out, int destsize);
979979
void COM_DefaultExtension( char *path, size_t maxSize, const char *extension );
980980
void COM_SanitizeExtension(char *path, size_t maxSize, const char *extension);
981981

src/server/server.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void SV_RemoveOperatorCommands (void);
280280
void SV_MasterHeartbeat (void);
281281
void SV_MasterShutdown (void);
282282

283-
qboolean MVAPI_GetConnectionlessPacket(mvaddr_t *addr, char *buf, unsigned int bufsize);
283+
qboolean MVAPI_GetConnectionlessPacket(mvaddr_t *addr, char *buf, int bufsize);
284284
qboolean MVAPI_SendConnectionlessPacket(const mvaddr_t *addr, const char *message);
285285
qboolean MVAPI_DisableStructConversion(qboolean disable);
286286
extern qboolean mvStructConversionDisabled;

src/server/sv_game.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ intptr_t SV_GameSystemCalls( intptr_t *args ) {
10801080
return ret;
10811081
}
10821082
case G_MVAPI_GET_CONNECTIONLESSPACKET:
1083-
return (int)MVAPI_GetConnectionlessPacket(VMAV(1, mvaddr_t), VMAP(2, char, (unsigned int)args[3]), (unsigned int)args[3]);
1083+
return (int)MVAPI_GetConnectionlessPacket(VMAV(1, mvaddr_t), VMAP(2, char, args[3]), args[3]);
10841084
case G_MVAPI_SEND_CONNECTIONLESSPACKET:
10851085
return (int)MVAPI_SendConnectionlessPacket(VMAV(1, const mvaddr_t), VMAS(2));
10861086
case MVAPI_CONTROL_FIXES:

src/server/sv_main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ MVAPI_GetConnectionlessPacket
574574
*/
575575
mvaddr_t curraddr;
576576
char currmessage[MAX_STRING_CHARS];
577-
qboolean MVAPI_GetConnectionlessPacket(mvaddr_t *addr, char *buf, unsigned int bufsize) {
577+
qboolean MVAPI_GetConnectionlessPacket(mvaddr_t *addr, char *buf, int bufsize) {
578578
if (!mv_apiConnectionless->integer) {
579579
return qtrue;
580580
}

0 commit comments

Comments
 (0)