GH-421 Fix 4.3 stack allocation crash issues with RefCounted

CraterCrash · Jun 29, 2024 · 5bc2994 · 5bc2994
1 parent d696fd1
commit 5bc2994
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/common/guid.cpp b/src/common/guid.cpp
@@ -66,12 +66,12 @@ String Guid::to_string() const
 
 Guid Guid::create_guid()
 {
-    RandomNumberGenerator rng;
+    Ref<RandomNumberGenerator> rng(memnew(RandomNumberGenerator));
 
-    uint32_t a = rng.randi();
-    uint32_t b = rng.randi();
-    uint32_t c = rng.randi();
-    uint32_t d = rng.randi();
+    uint32_t a = rng->randi();
+    uint32_t b = rng->randi();
+    uint32_t c = rng->randi();
+    uint32_t d = rng->randi();
 
     // The 4 bits of digit M indicate the GUID version, and the 1-3 most significant bits
     // of digit N indicate the UUID variant.

diff --git a/src/script/nodes/flow_control/chance.cpp b/src/script/nodes/flow_control/chance.cpp
@@ -19,13 +19,16 @@
 class OScriptNodeChanceInstance : public OScriptNodeInstance
 {
     DECLARE_SCRIPT_NODE_INSTANCE(OScriptNodeChance);
-    RandomNumberGenerator _random;
+    Ref<RandomNumberGenerator> _random;
     int _chance{ 0 };
 
 public:
     int step(OScriptExecutionContext& p_context) override
     {
-        const int _calculated_chance = _random.randi_range(0, 100);
+        if (!_random.is_valid())
+            _random.instantiate();
+
+        const int _calculated_chance = _random->randi_range(0, 100);
         return _calculated_chance <= _chance ? 0 : 1;
     }
 };

diff --git a/src/script/nodes/flow_control/random.cpp b/src/script/nodes/flow_control/random.cpp
@@ -20,7 +20,7 @@ class OScriptNodeRandomInstance : public OScriptNodeInstance
 {
     DECLARE_SCRIPT_NODE_INSTANCE(OScriptNodeRandom);
 
-    RandomNumberGenerator _random;
+    Ref<RandomNumberGenerator> _random;
     int _possibilities{ 0 };
 
 public:
@@ -29,7 +29,10 @@ class OScriptNodeRandomInstance : public OScriptNodeInstance
         if (_possibilities == 0)
             return -1;
 
-        return _random.randi_range(0, _possibilities - 1);
+        if (!_random.is_valid())
+            _random.instantiate();
+
+        return _random->randi_range(0, _possibilities - 1);
     }
 };