thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-04-04 19:37:14 +02:00
Code Releases Activity

Improve the handle validation in pure squirrel methods of the Connection class from the SQLite module.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-07-10 17:34:12 +03:00
parent 75f8f43696
commit ac850f407d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
modules/sqlite/Connection.cpp
View File

@ -370,10 +370,15 @@ SQInteger Connection::ExecF(HSQUIRRELVM vm)
{ {
return sq_throwerror(vm, "Invalid SQLite connection instance"); return sq_throwerror(vm, "Invalid SQLite connection instance");
} }
// Do we have a valid connection identifier? // Validate the connection info
else if (!(conn->m_Handle)) try
{ {
return sq_throwerror(vm, "Invalid SQLite connection reference"); SQMOD_VALIDATE_CREATED(*conn);
}
catch (const Sqrat::Exception & e)
{
// Propagate the error
return sq_throwerror(vm, e.what());
} }
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2); StackStrF val(vm, 2);
@ -421,10 +426,15 @@ SQInteger Connection::QueueF(HSQUIRRELVM vm)
{ {
return sq_throwerror(vm, "Invalid SQLite connection instance"); return sq_throwerror(vm, "Invalid SQLite connection instance");
} }
// Do we have a valid connection identifier? // Validate the connection info
else if (!(conn->m_Handle)) try
{ {
return sq_throwerror(vm, "Invalid SQLite connection reference"); SQMOD_VALIDATE_CREATED(*conn);
}
catch (const Sqrat::Exception & e)
{
// Propagate the error
return sq_throwerror(vm, e.what());
} }
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2); StackStrF val(vm, 2);
@ -465,10 +475,15 @@ SQInteger Connection::QueryF(HSQUIRRELVM vm)
{ {
return sq_throwerror(vm, "Invalid SQLite connection instance"); return sq_throwerror(vm, "Invalid SQLite connection instance");
} }
// Do we have a valid connection identifier? // Validate the connection info
else if (!(conn->m_Handle)) try
{ {
return sq_throwerror(vm, "Invalid SQLite connection reference"); SQMOD_VALIDATE_CREATED(*conn);
}
catch (const Sqrat::Exception & e)
{
// Propagate the error
return sq_throwerror(vm, e.what());
} }
// Attempt to retrieve the value from the stack as a string // Attempt to retrieve the value from the stack as a string
StackStrF val(vm, 2); StackStrF val(vm, 2);