Merge pull request #1645 from Areloch/NewObjectPointerCleanup

New object pointer cleanup
GarageGames · Jun 21, 2016 · 68d44c4 · 68d44c4
2 parents b7882e7 + 810ac82
commit 68d44c4
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/Engine/source/console/compiledEval.cpp b/Engine/source/console/compiledEval.cpp
@@ -871,6 +871,7 @@ ConsoleValueRef CodeBlock::exec(U32 ip, const char *functionName, Namespace *thi
                {
                   Con::errorf(ConsoleLogEntry::General, "%s: Unable to instantiate non-SimObject class %s.", getFileLine(ip), (const char*)callArgv[1]);
                   delete object;
+                  currentNewObject = NULL;
                   ip = failJump;
                   break;
                }
@@ -902,6 +903,7 @@ ConsoleValueRef CodeBlock::exec(U32 ip, const char *functionName, Namespace *thi
 
                      // Fail to create the object.
                      delete object;
+                     currentNewObject = NULL;
                      ip = failJump;
                      break;
                   }
@@ -1016,6 +1018,7 @@ ConsoleValueRef CodeBlock::exec(U32 ip, const char *functionName, Namespace *thi
                Con::errorf(ConsoleLogEntry::General, "%s: preload failed for %s: %s.", getFileLine(ip),
                            currentNewObject->getName(), errorStr.c_str());
                dataBlock->deleteObject();
+               currentNewObject = NULL;
                ip = failJump;
 
                // Prevent stack value corruption