thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00
Code Releases Activity

Fix sqlite3_snprintf not having a room for a null terminator in the buffer.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2021-09-12 15:12:35 +03:00
parent 9235cb5069
commit f1ef37bdf3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
module/Library/SQLite.cpp
View File

@ -451,11 +451,15 @@ LightObj EscapeString(StackStrF & str)
} }
// Allocate a memory buffer // Allocate a memory buffer
std::vector< SQChar > b; std::vector< SQChar > b;
b.reserve(static_cast< size_t >(str.mLen)); // Allocate extra space to make sure there's room for a null terminator since we need it
// This is a f* up from SQLite devs not returning the number of written characters from snprintf
// So we can figure out if we actually had room for the null terminator or not
b.reserve(static_cast< size_t >(str.mLen * 2));
// Attempt to escape the specified string // Attempt to escape the specified string
sqlite3_snprintf(static_cast<int>(b.capacity()), b.data(), "%q", str.mPtr); sqlite3_snprintf(static_cast<int>(b.capacity()), b.data(), "%q", str.mPtr);
// Return the resulted string // Return the resulted string
return LightObj(b.data()); LightObj o(b.data(), -1);
return o;
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
@ -477,7 +481,8 @@ LightObj EscapeStringEx(SQChar spec, StackStrF & str)
fs[1] = spec; fs[1] = spec;
// Allocate a memory buffer // Allocate a memory buffer
std::vector< SQChar > b; std::vector< SQChar > b;
b.reserve(static_cast< size_t >(str.mLen)); // Allocate extra space to make sure there's room for a null terminator since we need it (see above)
b.reserve(static_cast< size_t >(str.mLen * 2));
// Attempt to escape the specified string // Attempt to escape the specified string
sqlite3_snprintf(static_cast<int>(b.capacity()), b.data(), fs, str.mPtr); sqlite3_snprintf(static_cast<int>(b.capacity()), b.data(), fs, str.mPtr);
// Return the resulted string // Return the resulted string