teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 23:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix botlib parser for negative int/float values, thanks to Makro for reporting (#4227).

Browse source
This commit is contained in:
Thilo Schulz 2009-10-19 23:29:44 +00:00
parent 5663ff1362
commit ba31be1736
3 changed files with 48 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
code/botlib/be_ai_weight.c
View file

@ -64,13 +64,20 @@ int ReadValue(source_t *source, float *value)
if (!strcmp(token.string, "-")) if (!strcmp(token.string, "-"))
{ {
SourceWarning(source, "negative value set to zero\n"); SourceWarning(source, "negative value set to zero\n");
if (!PC_ExpectTokenType(source, TT_NUMBER, 0, &token)) return qfalse;
} //end if if(!PC_ExpectAnyToken(source, &token))
{
SourceError(source, "Missing return value\n");
return qfalse;
}
}
if (token.type != TT_NUMBER) if (token.type != TT_NUMBER)
{ {
SourceError(source, "invalid return value %s\n", token.string); SourceError(source, "invalid return value %s\n", token.string);
return qfalse; return qfalse;
} //end if }
*value = token.floatvalue; *value = token.floatvalue;
return qtrue; return qtrue;
} //end of the function ReadValue } //end of the function ReadValue

20
code/botlib/l_precomp.c
View file

@ -2561,12 +2561,16 @@ int PC_DollarDirective_evalint(source_t *source)
sprintf(token.string, "%d", abs(value)); sprintf(token.string, "%d", abs(value));
token.type = TT_NUMBER; token.type = TT_NUMBER;
token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL; token.subtype = TT_INTEGER|TT_LONG|TT_DECIMAL;
#ifdef NUMBERVALUE #ifdef NUMBERVALUE
token.intvalue = value; token.intvalue = abs(value);
token.floatvalue = value; token.floatvalue = token.intvalue;
#endif //NUMBERVALUE #endif //NUMBERVALUE
PC_UnreadSourceToken(source, &token); PC_UnreadSourceToken(source, &token);
if (value < 0) UnreadSignToken(source); if (value < 0)
UnreadSignToken(source);
return qtrue; return qtrue;
} //end of the function PC_DollarDirective_evalint } //end of the function PC_DollarDirective_evalint
//============================================================================ //============================================================================
@ -2588,12 +2592,16 @@ int PC_DollarDirective_evalfloat(source_t *source)
sprintf(token.string, "%1.2f", fabs(value)); sprintf(token.string, "%1.2f", fabs(value));
token.type = TT_NUMBER; token.type = TT_NUMBER;
token.subtype = TT_FLOAT|TT_LONG|TT_DECIMAL; token.subtype = TT_FLOAT|TT_LONG|TT_DECIMAL;
#ifdef NUMBERVALUE #ifdef NUMBERVALUE
token.intvalue = (unsigned long) value; token.floatvalue = fabs(value);
token.floatvalue = value; token.intvalue = (unsigned long) token.floatvalue;
#endif //NUMBERVALUE #endif //NUMBERVALUE
PC_UnreadSourceToken(source, &token); PC_UnreadSourceToken(source, &token);
if (value < 0) UnreadSignToken(source); if (value < 0)
UnreadSignToken(source);
return qtrue; return qtrue;
} //end of the function PC_DollarDirective_evalfloat } //end of the function PC_DollarDirective_evalfloat
//============================================================================ //============================================================================

32
code/botlib/l_script.c
View file

@ -1156,13 +1156,21 @@ float ReadSignedFloat(script_t *script)
PS_ExpectAnyToken(script, &token); PS_ExpectAnyToken(script, &token);
if (!strcmp(token.string, "-")) if (!strcmp(token.string, "-"))
{ {
if(!PS_ExpectAnyToken(script, &token))
{
ScriptError(script, "Missing float value\n", token.string);
return 0;
}
sign = -1.0; sign = -1.0;
PS_ExpectTokenType(script, TT_NUMBER, 0, &token); }
} //end if
else if (token.type != TT_NUMBER) if (token.type != TT_NUMBER)
{ {
ScriptError(script, "expected float value, found %s\n", token.string); ScriptError(script, "expected float value, found %s\n", token.string);
} //end else if return 0;
}
return sign * token.floatvalue; return sign * token.floatvalue;
} //end of the function ReadSignedFloat } //end of the function ReadSignedFloat
//============================================================================ //============================================================================
@ -1179,13 +1187,21 @@ signed long int ReadSignedInt(script_t *script)
PS_ExpectAnyToken(script, &token); PS_ExpectAnyToken(script, &token);
if (!strcmp(token.string, "-")) if (!strcmp(token.string, "-"))
{ {
if(!PS_ExpectAnyToken(script, &token))
{
ScriptError(script, "Missing integer value\n", token.string);
return 0;
}
sign = -1; sign = -1;
PS_ExpectTokenType(script, TT_NUMBER, TT_INTEGER, &token); }
} //end if
else if (token.type != TT_NUMBER || token.subtype == TT_FLOAT) if (token.type != TT_NUMBER || token.subtype == TT_FLOAT)
{ {
ScriptError(script, "expected integer value, found %s\n", token.string); ScriptError(script, "expected integer value, found %s\n", token.string);
} //end else if return 0;
}
return sign * token.intvalue; return sign * token.intvalue;
} //end of the function ReadSignedInt } //end of the function ReadSignedInt
//============================================================================ //============================================================================