Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Change strresGetString to return its string as const (to prevent potential double-free problems) 

* Instead use strdup() where a non-const reference to these strings is used
  * NOTE: This may introduce memory leaks, but I'd rather have memory leaks than double-frees, of which I'm frankly surprised that they don't occur ''much'' more often
 * Change FindDroidTemplate to take its parameter as const
 * Don't multi-purpose the parameters of FindDroidTemplate as local variables
 * Store string variables in getName as const
 * scrvGetString:
  * Directly return the string it retrieved and use NULL to indicate failure
  * Return the string as `const'

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5658 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-07-24 18:18:07 +00:00
parent da3c28efa2
commit 47d02a31da
9 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/framework/strres.c
View File

@ -334,7 +334,7 @@ BOOL strresStoreString(STR_RES *psRes, char *pID, const char *pString)
/* Get the string from an ID number */
char *strresGetString(STR_RES *psRes, UDWORD id)
const char* strresGetString(const STR_RES * psRes, UDWORD id)
{
STR_BLOCK *psBlock;

2
lib/framework/strres.h
View File

@ -42,7 +42,7 @@ extern BOOL strresGetIDNum(struct STR_RES *psRes, const char *pIDStr, UDWORD *pI
extern const char* strresGetIDString(struct STR_RES *psRes, const char *pIDStr);
/* Get the string from an ID number */
extern char *strresGetString(struct STR_RES *psRes, UDWORD id);
extern const char* strresGetString(const struct STR_RES *psRes, UDWORD id);
/* Load a string resource file */
extern BOOL strresLoad(struct STR_RES* psRes, const char* fileName);

13
src/game.c
View File

@ -2146,7 +2146,7 @@ static bool writeMapFile(const char* fileName);
static BOOL loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity);
static BOOL loadSaveDroidInit(char *pFileData, UDWORD filesize);
static DROID_TEMPLATE *FindDroidTemplate(char *name,UDWORD player);
static DROID_TEMPLATE *FindDroidTemplate(const char * const name);
static BOOL loadSaveDroid(char *pFileData, UDWORD filesize, DROID **ppsCurrentDroidLists);
static BOOL loadSaveDroidV11(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD version, DROID **ppsCurrentDroidLists);
@ -5118,7 +5118,7 @@ BOOL loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity)
}
psTemplate = (DROID_TEMPLATE *)FindDroidTemplate(pDroidInit->name,pDroidInit->player);
psTemplate = (DROID_TEMPLATE *)FindDroidTemplate(pDroidInit->name);
if(psTemplate==NULL)
{
@ -5160,11 +5160,12 @@ BOOL loadSaveDroidInitV2(char *pFileData, UDWORD filesize,UDWORD quantity)
// -----------------------------------------------------------------------------------------
DROID_TEMPLATE *FindDroidTemplate(char *name,UDWORD player)
DROID_TEMPLATE *FindDroidTemplate(const char * const name)
{
UDWORD TempPlayer;
DROID_TEMPLATE *Template;
UDWORD id;
const char* nameStr;
//get the name from the resource associated with it
if (!strresGetIDNum(psStringRes, name, &id))
@ -5174,15 +5175,15 @@ DROID_TEMPLATE *FindDroidTemplate(char *name,UDWORD player)
return NULL;
}
//get the string from the id
name = strresGetString(psStringRes, id);
nameStr = strresGetString(psStringRes, id);
for(TempPlayer=0; TempPlayer<MAX_PLAYERS; TempPlayer++) {
Template = apsDroidTemplates[TempPlayer];
while(Template) {
//if(strcmp(name,Template->pName)==0) {
if(strcmp(name,Template->aName)==0) {
//if(strcmp(nameStr,Template->pName)==0) {
if(strcmp(nameStr,Template->aName)==0) {
return Template;
}
Template = Template->psNext;

4
src/message.c
View File

@ -551,7 +551,7 @@ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize)
return NULL;
}
//get the string from the id
psViewData->ppTextMsg[dataInc] = strresGetString(psStringRes, id);
psViewData->ppTextMsg[dataInc] = strdup(strresGetString(psStringRes, id));
}
sscanf(pViewMsgData, ",%d%n", &readint, &cnt);
@ -704,7 +704,7 @@ VIEWDATA *loadViewData(const char *pViewMsgData, UDWORD bufferSize)
}
//get the string from the id
psViewReplay->pSeqList[dataInc].ppTextMsg[seqInc] = strresGetString(psStringRes, id);
psViewReplay->pSeqList[dataInc].ppTextMsg[seqInc] = strdup(strresGetString(psStringRes, id));
}
//get the audio text string
sscanf(pViewMsgData,",%[^','],%d%n", audioName, &count,&cnt);

16
src/scriptobj.c
View File

@ -1189,7 +1189,21 @@ BOOL scrValDefLoad(SDWORD version, INTERP_VAL *psVal, char *pBuffer, UDWORD size
}
else
{
psVal->v.sval = strresGetString(psStringRes, id);
const char * const str = strresGetString(psStringRes, id);
if (!str)
{
debug(LOG_ERROR, "Couldn't find string with id %u", id);
abort();
return false;
}
psVal->v.sval = strdup(str);
if (!psVal->v.sval)
{
debug(LOG_ERROR, "Out of memory");
abort();
return false;
}
}
break;
case ST_LEVEL:

12
src/scriptvals.c
View File

@ -238,20 +238,18 @@ BOOL scrvGetContext(char *pID, SCRIPT_CONTEXT **ppsContext)
// Find a string from it's (string)id
BOOL scrvGetString(const char *pStringID, char **ppString)
const char* scrvGetString(const char* stringID)
{
UDWORD id;
//get the ID for the string
if (!strresGetIDNum(psStringRes, pStringID, &id))
if (!strresGetIDNum(psStringRes, stringID, &id))
{
debug( LOG_ERROR, "Cannot find the string id %s ", pStringID );
debug(LOG_ERROR, "Cannot find the string for id \"%s\"", stringID);
abort();
return false;
return NULL;
}
//get the string from the id
*ppString = strresGetString(psStringRes, id);
return true;
return strresGetString(psStringRes, id);
}

2
src/scriptvals.h
View File

@ -109,6 +109,6 @@ extern BOOL scrvLoad(PHYSFS_file* fileHandle);
//extern BOOL scrvLinkValues(void);
// Find a string from it's (string)id
extern BOOL scrvGetString(const char *pStringID, char **ppString);
extern const char* scrvGetString(const char* stringID);
#endif // __INCLUDED_SRC_SCRIPTVALS_H__

16
src/scriptvals_parser.y
View File

@ -231,7 +231,6 @@ var_init: var_entry TYPE var_value
{
INTERP_VAL data; /* structure to to hold all types */
BASE_OBJECT *psObj;
char *pString;
SDWORD compIndex;
/* set type */
@ -618,23 +617,34 @@ var_init: var_entry TYPE var_value
}
break;
case ST_TEXTSTRING:
{
const char* pString;
if ($3.type != IT_STRING)
{
yyerror("Typemismatch for variable %d", $1);
YYABORT;
}
if (!scrvGetString($3.pString, &pString))
pString = scrvGetString($3.pString);
if (!pString)
{
yyerror("String %s not found", $3.pString);
YYABORT;
}
data.v.sval = pString;
data.v.sval = strdup(pString);
if (!data.v.sval)
{
debug(LOG_ERROR, "Out of memory");
abort();
YYABORT;
}
if (!eventSetContextVar(psCurrContext, $1, &data))
{
yyerror("Set Value Failed for %u", $1);
YYABORT;
}
break;
}
case ST_LEVEL:
{
LEVEL_DATASET *psLevel;

4
src/stats.c
View File

@ -2613,8 +2613,8 @@ BOOL getResourceName(const char *pName)
const char* getName(const char *pNameID)
{
UDWORD id;
char *pName;
static char Unknown[] = "Name Unknown";
const char* pName;
static const char Unknown[] = "Name Unknown";
/*see if the name has a resource associated with it by trying to get
the ID for the string*/