From 81f85a6f938f8c7bfd6155639589ae2aee0331d1 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@draeger.com>
Date: Mon, 5 Dec 2022 13:07:52 +0100
Subject: [PATCH 1/3] Avoid undefined-shift in
 Assimp::ASE::Parser::ParseLV4MeshFace.

---
 code/AssetLib/ASE/ASEParser.cpp | 8 +++++++-
 code/AssetLib/ASE/ASEParser.h   | 9 +++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/AssetLib/ASE/ASEParser.cpp b/code/AssetLib/ASE/ASEParser.cpp
index 96346bdcb..839d308de 100644
--- a/code/AssetLib/ASE/ASEParser.cpp
+++ b/code/AssetLib/ASE/ASEParser.cpp
@@ -1774,7 +1774,13 @@ void Parser::ParseLV4MeshFace(ASE::Face &out) {
         // FIX: There needn't always be a value, sad but true
         while (true) {
             if (*filePtr < '9' && *filePtr >= '0') {
-                out.iSmoothGroup |= (1 << strtoul10(filePtr, &filePtr));
+                uint32_t value = strtoul10(filePtr, &filePtr);
+                if (value < 32) {
+                    out.iSmoothGroup |= (1 << strtoul10(filePtr, &filePtr));
+                } else {
+                    const std::string message = std::string("Unable to set smooth group, value with ") + ai_to_string(value) + std::string(" out of range");
+                    LogWarning(message.c_str());
+                }
             }
             SkipSpaces(&filePtr);
             if (',' != *filePtr) {
diff --git a/code/AssetLib/ASE/ASEParser.h b/code/AssetLib/ASE/ASEParser.h
index 8cda32f24..79cb43f89 100644
--- a/code/AssetLib/ASE/ASEParser.h
+++ b/code/AssetLib/ASE/ASEParser.h
@@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
 
 Copyright (c) 2006-2022, assimp team
 
-
 All rights reserved.
 
 Redistribution and use of this software in source and binary forms,
@@ -385,12 +384,10 @@ struct Dummy : public BaseNode {
 /** \brief Class to parse ASE files
  */
 class Parser {
-private:
-    Parser() AI_NO_EXCEPT {
-        // empty
-    }
-
 public:
+    /// @brief No default constructor.
+    Parser() AI_NO_EXCEPT = delete
+
     // -------------------------------------------------------------------
     //! Construct a parser from a given input file which is
     //! guaranteed to be terminated with zero.

From 9d57ac9cc5cde97b01b5c0afb7d07835c3af946c Mon Sep 17 00:00:00 2001
From: Kim Kulling <kim.kulling@draeger.com>
Date: Mon, 5 Dec 2022 13:15:42 +0100
Subject: [PATCH 2/3] Fix:Add missing semicolon.

---
 code/AssetLib/ASE/ASELoader.cpp | 4 ----
 code/AssetLib/ASE/ASELoader.h   | 2 +-
 code/AssetLib/ASE/ASEParser.h   | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/AssetLib/ASE/ASELoader.cpp b/code/AssetLib/ASE/ASELoader.cpp
index abf4fb9cf..951e8539d 100644
--- a/code/AssetLib/ASE/ASELoader.cpp
+++ b/code/AssetLib/ASE/ASELoader.cpp
@@ -87,10 +87,6 @@ ASEImporter::ASEImporter() :
     // empty
 }
 
-// ------------------------------------------------------------------------------------------------
-// Destructor, private as well
-ASEImporter::~ASEImporter() = default;
-
 // ------------------------------------------------------------------------------------------------
 // Returns whether the class can handle the format of the given file.
 bool ASEImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool /*checkSig*/) const {
diff --git a/code/AssetLib/ASE/ASELoader.h b/code/AssetLib/ASE/ASELoader.h
index cd9123556..2509671ef 100644
--- a/code/AssetLib/ASE/ASELoader.h
+++ b/code/AssetLib/ASE/ASELoader.h
@@ -62,7 +62,7 @@ namespace Assimp {
 class ASEImporter : public BaseImporter {
 public:
     ASEImporter();
-    ~ASEImporter() override;
+    ~ASEImporter() override = default;
 
     // -------------------------------------------------------------------
     /** Returns whether the class can handle the format of the given file.
diff --git a/code/AssetLib/ASE/ASEParser.h b/code/AssetLib/ASE/ASEParser.h
index 79cb43f89..c41cd59d3 100644
--- a/code/AssetLib/ASE/ASEParser.h
+++ b/code/AssetLib/ASE/ASEParser.h
@@ -386,7 +386,7 @@ struct Dummy : public BaseNode {
 class Parser {
 public:
     /// @brief No default constructor.
-    Parser() AI_NO_EXCEPT = delete
+    Parser() = delete;
 
     // -------------------------------------------------------------------
     //! Construct a parser from a given input file which is

From 769b47ed0ea1fd5c480a24b85637e4ba5022a707 Mon Sep 17 00:00:00 2001
From: Kim Kulling <kimkulling@users.noreply.github.com>
Date: Thu, 8 Dec 2022 09:35:11 +0100
Subject: [PATCH 3/3] Ensure face pointer is not nullptr

- closes https://github.com/assimp/assimp/issues/4831
---
 code/Common/ScenePreprocessor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/Common/ScenePreprocessor.cpp b/code/Common/ScenePreprocessor.cpp
index c769ec30c..95c63ae1c 100644
--- a/code/Common/ScenePreprocessor.cpp
+++ b/code/Common/ScenePreprocessor.cpp
@@ -142,6 +142,7 @@ void ScenePreprocessor::ProcessMesh(aiMesh *mesh) {
     // If the information which primitive types are there in the
     // mesh is currently not available, compute it.
     if (!mesh->mPrimitiveTypes) {
+        ai_assert(mesh->mFaces != nullptr);
         for (unsigned int a = 0; a < mesh->mNumFaces; ++a) {
             aiFace &face = mesh->mFaces[a];
             switch (face.mNumIndices) {