From 836963428eeadea57753b63789cbbbeb7b77d6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Wed, 1 Dec 2021 11:16:48 +0100 Subject: [PATCH] Fix file-extension check for X3D-files using the pre-existing and well-tested GetExtension() (which happens to also normalize the extension), rather than attempting our own buggy one... Closes: https://github.com/assimp/assimp/issues/4177 --- code/AssetLib/X3D/X3DImporter.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/AssetLib/X3D/X3DImporter.cpp b/code/AssetLib/X3D/X3DImporter.cpp index e33782785..b8b9d250e 100644 --- a/code/AssetLib/X3D/X3DImporter.cpp +++ b/code/AssetLib/X3D/X3DImporter.cpp @@ -235,10 +235,8 @@ void X3DImporter::ParseFile(const std::string &file, IOSystem *pIOHandler) { bool X3DImporter::CanRead(const std::string &pFile, IOSystem * /*pIOHandler*/, bool checkSig) const { if (checkSig) { - std::string::size_type pos = pFile.find_last_of(".x3d"); - if (pos != std::string::npos) { + if (GetExtension(pFile) == "x3d") return true; - } } return false;