diff --git a/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp b/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp index 23e628b9b..cdf8256c1 100644 --- a/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp +++ b/3rdparty/libprojectm/MilkdropPresetFactory/Parser.cpp @@ -1373,6 +1373,8 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std::istream & fs, char * pa PerFrameEqn * per_frame_eqn; GenExpr * gen_expr; + if (fs == NULL) + return NULL; if (param_string == NULL) return NULL; if (preset == NULL) @@ -1526,6 +1528,8 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream & fs, MilkdropPreset * if (preset == NULL) return NULL; + if (fs == NULL) + return NULL; if ((token = parseToken(fs, name)) != tEq) return NULL; @@ -1838,6 +1842,8 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p /* Null argument checks */ if (preset == NULL) return PROJECTM_FAILURE; + if (fs == NULL) + return PROJECTM_FAILURE; if (token == NULL) return PROJECTM_FAILURE; @@ -2127,6 +2133,8 @@ int Parser::parse_wave(char * token, std::istream & fs, MilkdropPreset * preset if (token == NULL) return PROJECTM_FAILURE; + if (fs == NULL) + return PROJECTM_FAILURE; if (preset == NULL) return PROJECTM_FAILURE; @@ -2306,6 +2314,8 @@ int Parser::parse_shape(char * token, std::istream & fs, MilkdropPreset * prese if (token == NULL) + return PROJECTM_FAILURE; + if (fs == NULL) return PROJECTM_FAILURE; if (preset == NULL) return PROJECTM_FAILURE;