Jump to content

  • Log In with Google      Sign In   
  • Create Account

- - - - -

Script array memory allocation


Old topic!
Guest, the last post of this topic is over 60 days old and at this point you may not reply in this topic. If you wish to continue this conversation start a new topic.

  • You cannot reply to this topic
4 replies to this topic

#1 cvet   Members   -  Reputation: 178

Like
0Likes
Like

Posted 14 June 2014 - 06:59 AM

AngelScript 2.29.0.

Add-on: scriptarray.cpp.

For default allocator used asAllocMem, which is not zeroing memory.

And after resizing array with pod types we have uninitialized data in array.

 



Sponsor:

#2 cvet   Members   -  Reputation: 178

Like
0Likes
Like

Posted 14 June 2014 - 07:14 AM

I think better rework Construct method from this:

void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
{
	if( subTypeId & asTYPEID_OBJHANDLE )
	{
		// Set all object handles to null
		void *d = (void*)(buf->data + start * sizeof(void*));
		memset(d, 0, (end-start)*sizeof(void*));
	}
	else if( subTypeId & asTYPEID_MASK_OBJECT )
	{
		void **max = (void**)(buf->data + end * sizeof(void*));
		void **d = (void**)(buf->data + start * sizeof(void*));

		asIScriptEngine *engine = objType->GetEngine();
		asIObjectType *subType = objType->GetSubType();

		for( ; d < max; d++ )
		{
			*d = (void*)engine->CreateScriptObject(subType);
			if( *d == 0 )
			{
				// Set the remaining entries to null so the destructor 
				// won't attempt to destroy invalid objects later
				memset(d, 0, sizeof(void*)*(max-d));

				// There is no need to set an exception on the context,
				// as CreateScriptObject has already done that
				return;
			}
		}
	}
}

to this:

void CScriptArray::Construct(SArrayBuffer *buf, asUINT start, asUINT end)
{
	if( subTypeId & asTYPEID_MASK_OBJECT )
	{
		void **max = (void**)(buf->data + end * sizeof(void*));
		void **d = (void**)(buf->data + start * sizeof(void*));

		asIScriptEngine *engine = objType->GetEngine();
		asIObjectType *subType = objType->GetSubType();

		for( ; d < max; d++ )
		{
			*d = (void*)engine->CreateScriptObject(subType);
			if( *d == 0 )
			{
				// Set the remaining entries to null so the destructor 
				// won't attempt to destroy invalid objects later
				memset(d, 0, sizeof(void*)*(max-d));

				// There is no need to set an exception on the context,
				// as CreateScriptObject has already done that
				return;
			}
		}
	}
	else
	{
		// Set all to zero
		void *d = (void*)(buf->data + start * sizeof(void*));
		memset(d, 0, (end-start)*sizeof(void*));
	}
}


#3 Andreas Jonsson   Moderators   -  Reputation: 3444

Like
0Likes
Like

Posted 15 June 2014 - 08:22 AM

Done in revision 1962. Thanks.


AngelCode.com - game development and more - Reference DB - game developer references
AngelScript - free scripting library - BMFont - free bitmap font generator - Tower - free puzzle game

#4 cvet   Members   -  Reputation: 178

Like
0Likes
Like

Posted 16 June 2014 - 01:32 AM

Hello, also need remove

if( subTypeId & asTYPEID_MASK_OBJECT ) // this check
  Construct( newBuffer, at, at + delta );


Edited by cvet, 16 June 2014 - 01:32 AM.


#5 Andreas Jonsson   Moderators   -  Reputation: 3444

Like
0Likes
Like

Posted 16 June 2014 - 07:28 PM

Thanks. Corrected in revision 1963


AngelCode.com - game development and more - Reference DB - game developer references
AngelScript - free scripting library - BMFont - free bitmap font generator - Tower - free puzzle game




Old topic!
Guest, the last post of this topic is over 60 days old and at this point you may not reply in this topic. If you wish to continue this conversation start a new topic.



PARTNERS