Skip to content

wrap std::stod in try/catch to prevent crashes when garbage is parsed #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
assertivist merged 1 commit into from
Dec 4, 2025
Merged

wrap std::stod in try/catch to prevent crashes when garbage is parsed #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/level/Parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@

typedef short tokentype;

std::string currentlyRunning = "";

ParserVariables parserVar = {0, 0, 0, 0, {0}, 0, 0};
long lastKeyword = 0;
long lastVariable = 0;
Expand Down Expand Up @@ -515,7 +517,14 @@ void LexRead(LexSymbol *theSymbol) {
if (matchCount > 0) {
std::string s((char *)parserVar.input, matchCount);
theSymbol->kind = kLexConstant;
theSymbol->value.floating = std::stod(s);
double floatResult = 0;
try {
floatResult = std::stod(s);
} catch (...) {
SDL_Log("Parser error: Invalid floating point value: %s", s.c_str());
SDL_Log("In script: '%s'", currentlyRunning.c_str());
}
theSymbol->value.floating = floatResult;
// SDL_Log("\natof(%s) --> %f\n", tempString, theSymbol->value.floating);
parserVar.input += matchCount;
}
Expand Down Expand Up @@ -825,6 +834,7 @@ void ParseStatement(LexSymbol *statement) {
}
}


void SetupCompiler(unsigned char *theInput) {
parserVar.input = theInput;
parserVar.output = NewHandle(1024);
Expand Down Expand Up @@ -970,6 +980,7 @@ char *fixedString(unsigned char *s) {
}

void RunThis(std::string script) {
currentlyRunning = script;
LexSymbol statement;

//char *scriptPtr = (StringPtr)script.c_str();
Expand Down
Loading