-
Notifications
You must be signed in to change notification settings - Fork 137
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Prevent return of dangling Vector/QAngle to VScript #321
base: develop
Are you sure you want to change the base?
Conversation
When a Vector or QAngle rvalue reference is returned from a VScript function, the constructed ScriptVariant_t must not store the pointer to it since it is, per convention, a temporary reference. Only do that for lvalue-references, but do a copy when constructing from or assigning a rvalue reference.
Also, specifically addressing #104 (comment)
I didn't see any crashes calling |
That comment was poorly worded. It was more about being explicit that the only effect of
I'm curious what were the problematic functions that required this. |
I don't know about 'HSCRIPT
I didn't even check that.
Specifically I noticed it on
That still uses the |
f9d4f33
to
0551292
Compare
I think it makes more sense to change
Stack allocating a |
I could
Oh sorry, it it
I don't know what branch you've linked in #321 (comment), but there is different code in both master and develop, which does return a |
I'm using # 260, but it's my mistake. I incorrectly put |
I think I have been chasing some ghost bugs due to corrupted object files or something. |
Instead of temporary allocating dynamic memory, which subsequently is copied into another dynamically allocated piece of memory, provide a temporary buffer on the stack. The script value inserted into the VM still needs to allocate dynamically though... A few sites are adapted to not create a ScriptVariant_t from a temporary Vector to avoid dynamic allocation there too. cf. mapbase-source#321
0551292
to
a88fc1e
Compare
I've had a family emergency and some stuff got left by the wayside. |
a88fc1e
to
11167f6
Compare
Instead of temporary allocating dynamic memory, which subsequently is copied into another dynamically allocated piece of memory, provide a temporary buffer on the stack. The script value inserted into the VM still needs to allocate dynamically though... A few sites are adapted to not create a ScriptVariant_t from a temporary Vector to avoid dynamic allocation there too. cf. mapbase-source#321
11167f6
to
11232d9
Compare
Hm, I attempted to fix some sort of syntax error MSVC has with the placement new, but it still complains. gcc accepts both versions. I don't know what its problem is, nor how else I could attempt to fix it :/ |
Type FIELD_HSCRIPT is removed, it never sets SV_FREE. All dynamic memory is now free`d via free(). For strdup(), this would be the conformant way in standard C++. It matters not in Source, since both use the same global allocator of the engine, but it is tidier. Vector and QAngle are now allocated via malloc() instead of new to provide symmetry.
When assigning a null value in getVariant(), make sure a previous SV_FREE is not carried over. In SqurrelVM::ReleaseValue(), make sure SV_FREE is not kept after Free()ing a value.
Instead of temporary allocating dynamic memory, which subsequently is copied into another dynamically allocated piece of memory, provide a temporary buffer on the stack. The script value inserted into the VM still needs to allocate dynamically though... A few sites are adapted to not create a ScriptVariant_t from a temporary Vector to avoid dynamic allocation there too. cf. mapbase-source#321
11232d9
to
7ef11da
Compare
Instead of temporary allocating dynamic memory, which subsequently is copied into another dynamically allocated piece of memory, provide a temporary buffer on the stack. The script value inserted into the VM still needs to allocate dynamically though... A few sites are adapted to not create a ScriptVariant_t from a temporary Vector to avoid dynamic allocation there too. cf. mapbase-source#321
They wouldn't even work.
Free values before assignment.
7ef11da
to
45c0490
Compare
Well, why would I expect |
I built
|
Conceptually yes (unless
Perhaps another change in the commit is responsible? I don't have time to do more testing today; Instead of reverting the whole commit I manually inserted the intermediary diff --git a/sp/src/public/vscript/vscript_templates.h b/sp/src/public/vscript/vscript_templates.h
index 9f2054cc3..4edf38002 100644
--- a/sp/src/public/vscript/vscript_templates.h
+++ b/sp/src/public/vscript/vscript_templates.h
@@ -374,8 +374,10 @@ inline FUNCPTR_TYPE ScriptConvertFuncPtrFromVoid( void *p )
{ \
return false; \
} \
- new ( &temporaryReturnStorage.m_vec ) Vector( ((FUNC_TYPE)pFunction)( SCRIPT_BINDING_ARGS_##N ) ); \
- *pReturn = temporaryReturnStorage.m_vec; \
+ Vector *vec = (Vector*)malloc( sizeof( Vector ) ); \
+ new ( vec ) Vector( ((FUNC_TYPE)pFunction)( SCRIPT_BINDING_ARGS_##N ) ); \
+ *pReturn = vec; \
+ pReturn->m_flags |= SV_FREE; \
return true; \
} \
}; \
@@ -394,8 +396,10 @@ inline FUNCPTR_TYPE ScriptConvertFuncPtrFromVoid( void *p )
{ \
return false; \
} \
- new ( &temporaryReturnStorage.m_ang ) QAngle( ((FUNC_TYPE)pFunction)( SCRIPT_BINDING_ARGS_##N ) ); \
- *pReturn = temporaryReturnStorage.m_ang; \
+ QAngle *ang = (QAngle*)malloc( sizeof( QAngle ) ); \
+ new ( ang ) QAngle( ((FUNC_TYPE)pFunction)( SCRIPT_BINDING_ARGS_##N ) ); \
+ *pReturn = ang; \
+ pReturn->m_flags |= SV_FREE; \
return true; \
} \
}; \
@@ -452,8 +456,10 @@ inline FUNCPTR_TYPE ScriptConvertFuncPtrFromVoid( void *p )
{ \
return false; \
} \
- new ( &temporaryReturnStorage.m_vec ) Vector( (((OBJECT_TYPE_PTR)(pContext))->*ScriptConvertFuncPtrFromVoid<FUNC_TYPE>(pFunction))( SCRIPT_BINDING_ARGS_##N ) ); \
- *pReturn = temporaryReturnStorage.m_vec; \
+ Vector *vec = (Vector*)malloc( sizeof( Vector ) ); \
+ new ( vec ) Vector( (((OBJECT_TYPE_PTR)(pContext))->*ScriptConvertFuncPtrFromVoid<FUNC_TYPE>(pFunction))( SCRIPT_BINDING_ARGS_##N ) ); \
+ *pReturn = vec; \
+ pReturn->m_flags |= SV_FREE; \
return true; \
} \
}; \
@@ -472,8 +478,10 @@ inline FUNCPTR_TYPE ScriptConvertFuncPtrFromVoid( void *p )
{ \
return false; \
} \
- new ( &temporaryReturnStorage.m_ang ) QAngle( (((OBJECT_TYPE_PTR)(pContext))->*ScriptConvertFuncPtrFromVoid<FUNC_TYPE>(pFunction))( SCRIPT_BINDING_ARGS_##N ) ); \
- *pReturn = temporaryReturnStorage.m_ang; \
+ QAngle *ang = (QAngle*)malloc( sizeof( QAngle ) ); \
+ new ( ang ) QAngle( (((OBJECT_TYPE_PTR)(pContext))->*ScriptConvertFuncPtrFromVoid<FUNC_TYPE>(pFunction))( SCRIPT_BINDING_ARGS_##N ) ); \
+ *pReturn = ang; \
+ pReturn->m_flags |= SV_FREE; \
return true; \
} \
}; \
diff --git a/sp/src/vscript/vscript_squirrel.cpp b/sp/src/vscript/vscript_squirrel.cpp
index 47364e007..153dbe2a4 100644
--- a/sp/src/vscript/vscript_squirrel.cpp
+++ b/sp/src/vscript/vscript_squirrel.cpp
@@ -1428,7 +1428,6 @@ SQInteger function_stub(HSQUIRRELVM vm)
PushVariant(vm, retval);
- Assert(!(retval.m_flags & SV_FREE));
retval.Free();
return pFunc->m_desc.m_ReturnType != FIELD_VOID; Could you test this on your system? Also, just making sure, you are profiling a release-mode build? My results look like
(I assume t2 and t3 are the same loop, just more iterations.) I'll test with fully reverting 7efec77 tomorrow. The only sensible explanation I can come up with would be that passing the |
That malloc patch is slower in the same way as yours. Even removing the unused I am of course testing on release with no (native) debugger attached, and t2, t3 are more iterations of the same loop.
|
When a Vector or QAngle rvalue reference is returned from a VScript function, the constructed ScriptVariant_t must not store the pointer to it since it is, per convention, a temporary reference. Only do that for lvalue-references, but do a copy when constructing from or assigning a rvalue reference.
I'm not sure
ScriptVairant_t
really needs to try and prevent copies ofVector
andQAngle
. They're pretty small and trivial classes, so are cheap to copy. When a copy must be made it surely beats a dynamic allocation & deallocation.Free()
refers toFIELD_HSCRIPT
, although it will never setSV_FREE
. Perhaps this is just outdated?Strings will need to be copied (
strdup()
ed) due to their dynamic length, but it could try to do a small-string optimization.The types of
new
anddelete
are misaligned, sinceFree()
only ever doesdelete m_pszString
. SinceHSCRIPT
,Vector
andQAngle
are all trivial to destruct this shouldn't have any ill effects.At most I'm worried about
strdup()
being paired withdelete
instead offree()
.Anyway, I wanted to hear your thoughts on this before I change more stuff. This change alone sufficiently fixes issues I've observed in return-values playing a Mapbase-based mod that uses VScripts (https://www.moddb.com/mods/sourceworld).
Does this PR close any issues?
PR Checklist
develop
branch OR targets another branch with a specific goal in mind