Fix crash when creating nodes with no available SIMD level

Auburn · Nov 19, 2022 · 3a2efcd · 3a2efcd
1 parent 11072bc
commit 3a2efcd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/include/FastNoise/SmartNode.h b/include/FastNoise/SmartNode.h
@@ -233,10 +233,13 @@ namespace FastNoise
         friend class SmartNode;
 
         explicit SmartNode( T* ptr ) :
-            mReferenceId( SmartNodeManager::GetReference( ptr ) ),
+            mReferenceId( ptr ? SmartNodeManager::GetReference( ptr ) : SmartNodeManager::kInvalidReferenceId ),
             mPtr( ptr )
         {
-            SmartNodeManager::IncReference( mReferenceId );
+            if( mReferenceId != SmartNodeManager::kInvalidReferenceId )
+            {
+                SmartNodeManager::IncReference( mReferenceId );
+            }
         }
 
         void Release()

diff --git a/src/FastNoise/Metadata.cpp b/src/FastNoise/Metadata.cpp
@@ -232,6 +232,11 @@ SmartNode<> DeserialiseSmartNodeInternal( const std::vector<uint8_t>& serialised
 
     SmartNode<> generator = metadata->CreateNode( level );
 
+    if( !generator )
+    {
+        return nullptr;
+    }
+
     // Member variables
     for( const auto& var : metadata->memberVariables )
     {