qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 08:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

add PR_StringValid and PR_EdictValid to check the validity of progs string

Browse source 
and entity values without crashing.
This commit is contained in:
Bill Currie 2002-10-29 05:07:10 +00:00
parent 4ad8ed1fc2
commit aa36b85ba6
3 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/QF/progs.h
View file

@ -107,6 +107,7 @@ int PR_AccessField (progs_t *pr, const char *name, etype_t type,
edict_t *EDICT_NUM(progs_t *pr, int n); edict_t *EDICT_NUM(progs_t *pr, int n);
int NUM_FOR_EDICT(progs_t *pr, edict_t *e); int NUM_FOR_EDICT(progs_t *pr, edict_t *e);
int NUM_FOR_BAD_EDICT(progs_t *pr, edict_t *e); int NUM_FOR_BAD_EDICT(progs_t *pr, edict_t *e);
qboolean PR_EdictValid (progs_t *pr, int e);
#define NEXT_EDICT(p,e) ((edict_t *)( (byte *)e + (p)->pr_edict_size)) #define NEXT_EDICT(p,e) ((edict_t *)( (byte *)e + (p)->pr_edict_size))
@ -204,6 +205,7 @@ void PR_InitRuntime (progs_t *pr);
// PR Strings stuff // PR Strings stuff
// //
qboolean PR_StringValid (progs_t *pr, int num);
char *PR_GetString(progs_t *pr, int num); char *PR_GetString(progs_t *pr, int num);
int PR_SetString(progs_t *pr, const char *s); int PR_SetString(progs_t *pr, const char *s);
void PR_GarbageCollect (progs_t *pr); void PR_GarbageCollect (progs_t *pr);

10
libs/gamecode/engine/pr_edict.c
View file

@ -545,3 +545,13 @@ NUM_FOR_EDICT (progs_t *pr, edict_t *e)
return b; return b;
} }
qboolean
PR_EdictValid (progs_t *pr, int e)
{
if (e < 0 || e >= pr->pr_edictareasize)
return false;
if (e % pr->pr_edict_size)
return false;
return true;
}

30
libs/gamecode/engine/pr_strings.c
View file

@ -193,24 +193,38 @@ PR_GarbageCollect (progs_t *pr)
} }
} }
char * static inline char *
PR_GetString (progs_t *pr, int num) get_string (progs_t *pr, unsigned int num)
{ {
if (num < 0) { if ((int) num < 0) {
int row = ~num / 1024; unsigned int row = ~num / 1024;
num = ~num % 1024; num = ~num % 1024;
if (row < 0 || row >= pr->dyn_str_size) if (row >= pr->dyn_str_size)
goto bad_string_offset; return 0;
return pr->dynamic_strings[row][num].string; return pr->dynamic_strings[row][num].string;
} else { } else {
if (num >= pr->pr_stringsize) if (num >= pr->pr_stringsize)
goto bad_string_offset; return 0;
return pr->pr_strings + num; return pr->pr_strings + num;
} }
}
bad_string_offset: qboolean
PR_StringValid (progs_t *pr, int num)
{
return get_string (pr, num) != 0;
}
char *
PR_GetString (progs_t *pr, int num)
{
char *str;
str = get_string (pr, num);
if (str)
return str;
PR_RunError (pr, "Invalid string offset %u", num); PR_RunError (pr, "Invalid string offset %u", num);
} }