From 219dbbd4afc0eed61521369c5e4a5316c78e591e Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Tue, 9 Aug 2022 12:39:27 +0300 Subject: [PATCH] Fix crash of "assimp info" with no parameters --- tools/assimp_cmd/Info.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/assimp_cmd/Info.cpp b/tools/assimp_cmd/Info.cpp index 4703713c8..ef6554619 100644 --- a/tools/assimp_cmd/Info.cpp +++ b/tools/assimp_cmd/Info.cpp @@ -286,12 +286,6 @@ void PrintHierarchy( // ----------------------------------------------------------------------------------- // Implementation of the assimp info utility to print basic file info int Assimp_Info(const char *const *params, unsigned int num) { - // --help - if (!strcmp(params[0], "-h") || !strcmp(params[0], "--help") || !strcmp(params[0], "-?")) { - printf("%s", AICMD_MSG_INFO_HELP_E); - return AssimpCmdError::Success; - } - // asssimp info [-r] if (num < 1) { printf("assimp info: Invalid number of arguments. " @@ -299,6 +293,12 @@ int Assimp_Info(const char *const *params, unsigned int num) { return AssimpCmdError::InvalidNumberOfArguments; } + // --help + if (!strcmp(params[0], "-h") || !strcmp(params[0], "--help") || !strcmp(params[0], "-?")) { + printf("%s", AICMD_MSG_INFO_HELP_E); + return AssimpCmdError::Success; + } + const std::string in = std::string(params[0]); // get -r and -v arguments