From 3f7fdd738b1941c9b074438e175eaacc889ab9df Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 4 Jul 2013 20:06:27 +0000 Subject: (svn r25558) -Fix [FS#5568]: [Squirrel] Infinite recursion loop in freeing data via a looping set of references --- src/3rdparty/squirrel/squirrel/squtils.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/squirrel/squirrel/squtils.h b/src/3rdparty/squirrel/squirrel/squtils.h index 5f7e2e239..111a1c383 100644 --- a/src/3rdparty/squirrel/squirrel/squtils.h +++ b/src/3rdparty/squirrel/squirrel/squtils.h @@ -37,9 +37,13 @@ public: ~sqvector() { if(_allocated) { + /* Break freeing loops, if this vector (indirectly) links to itself. */ + size_t allocated_size = _allocated * sizeof(T); + _allocated = 0; + for(SQUnsignedInteger i = 0; i < _size; i++) _vals[i].~T(); - SQ_FREE(_vals, (_allocated * sizeof(T))); + SQ_FREE(_vals, allocated_size); } } void reserve(SQUnsignedInteger newsize) { _realloc(newsize); } -- cgit v1.2.3-70-g09d2