Hiding the vector that holds delayed release hooks, add a function to add delayed release hooks, add a flag to prevent loops when actually doing the delayed release hooks calls.

squirrel/sqclass.h

@@ -134,11 +134,7 @@ public:
 	void Release() {
 		_uiRef++;
 		if (_hook) {
-		    SQDelayedReleseHook dh;
-		    dh.hook = _hook;
-		    dh.ptr = _userpointer;
-		    dh.size = 0;
-		    _sharedstate->_delayed_release_hook.push_back(dh);
+		    _sharedstate->AddDelayedReleaseHook(_hook, _userpointer, 0);
 		    //_hook(_userpointer,0);
         }
 		_uiRef--;

squirrel/sqstate.cpp

@@ -25,6 +25,7 @@ SQSharedState::SQSharedState()
 	_errorfunc = NULL;
 	_debuginfo = false;
 	_notifyallexceptions = false;
+	_already_in_CallDelayedReleaseHooks = false;
 }
 
 #define newsysstring(s) {	\
@@ -227,15 +228,27 @@ SQInteger SQSharedState::GetMetaMethodIdxByName(const SQObjectPtr &name)
 	return -1;
 }
 
+void SQSharedState::AddDelayedReleaseHook(SQRELEASEHOOK hook, SQUserPointer ptr, SQInteger size)
+{
+    SQDelayedReleseHook dh;
+    dh.hook = hook;
+    dh.ptr = ptr;
+    dh.size = size;
+    _delayed_release_hook.push_back(dh);
+}
+
 void SQSharedState::CallDelayedReleaseHooks(SQVM *vm, int count)
 {
+    if(_already_in_CallDelayedReleaseHooks) return;
     if(_delayed_release_hook.size()){
+        _already_in_CallDelayedReleaseHooks = true;
         if(count == 0) count =  _delayed_release_hook.size();
         for(SQInteger i=0; i < count; ++i){
             SQDelayedReleseHook &dh = _delayed_release_hook[i];
             dh.hook(dh.ptr, dh.size, vm);
         }
         _delayed_release_hook.removeFromBegining(count);
+        _already_in_CallDelayedReleaseHooks = false;
     }
 }
 

squirrel/sqstate.h

@@ -92,7 +92,7 @@ public:
 #ifndef NO_GARBAGE_COLLECTOR
 	SQCollectable *_gc_chain;
 #endif
-    sqvector<SQDelayedReleseHook> _delayed_release_hook;
+    void AddDelayedReleaseHook(SQRELEASEHOOK hook, SQUserPointer ptr, SQInteger size);
     void CallDelayedReleaseHooks(SQVM *vm, int count=0);
 	SQObjectPtr _root_vm;
 	SQObjectPtr _table_default_delegate;
@@ -122,6 +122,8 @@ public:
 	bool _debuginfo;
 	bool _notifyallexceptions;
 private:
+    bool _already_in_CallDelayedReleaseHooks;
+    sqvector<SQDelayedReleseHook> _delayed_release_hook;
 	SQChar *_scratchpad;
 	SQInteger _scratchpadsize;
 };

squirrel/squserdata.h

@@ -25,11 +25,7 @@ struct SQUserData : SQDelegable
 #endif
 	void Release() {
 		if (_hook) {
-		    SQDelayedReleseHook dh;
-		    dh.hook = _hook;
-		    dh.ptr = (SQUserPointer)sq_aligning(this + 1);
-		    dh.size = _size;
-		    _sharedstate->_delayed_release_hook.push_back(dh);
+		    _sharedstate->AddDelayedReleaseHook(_hook, (SQUserPointer)sq_aligning(this + 1), _size);
 		    //_hook((SQUserPointer)sq_aligning(this + 1),_size, 0);
 		}
 		SQInteger tsize = _size;