hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assert that buffers are non-null in mysql.h

Browse Source 
The functions assume that the buffer is never null and thus should be
asserted.
This commit is contained in:
Markus Mäkelä
2019-05-31 06:53:19 +03:00
parent a4ee390fe5
commit d5e8315290
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/maxscale/protocol/mysql.h
View File

@ -379,6 +379,7 @@ static inline uint32_t MYSQL_GET_PAYLOAD_LEN(const uint8_t* header)
static inline uint32_t MYSQL_GET_PACKET_LEN(const GWBUF* buffer) static inline uint32_t MYSQL_GET_PACKET_LEN(const GWBUF* buffer)
{ {
mxb_assert(buffer);
return MYSQL_GET_PAYLOAD_LEN(GWBUF_DATA(buffer)) + MYSQL_HEADER_LEN; return MYSQL_GET_PAYLOAD_LEN(GWBUF_DATA(buffer)) + MYSQL_HEADER_LEN;
} }
@ -629,6 +630,7 @@ void mxs_mysql_set_current_db(MXS_SESSION* session, const char* db);
*/ */
static inline uint8_t mxs_mysql_get_command(GWBUF* buffer) static inline uint8_t mxs_mysql_get_command(GWBUF* buffer)
{ {
mxb_assert(buffer);
if (GWBUF_LENGTH(buffer) > MYSQL_HEADER_LEN) if (GWBUF_LENGTH(buffer) > MYSQL_HEADER_LEN)
{ {
return GWBUF_DATA(buffer)[4]; return GWBUF_DATA(buffer)[4];
@ -652,6 +654,7 @@ static inline uint8_t mxs_mysql_get_command(GWBUF* buffer)
*/ */
static inline uint32_t mxs_mysql_get_packet_len(GWBUF* buffer) static inline uint32_t mxs_mysql_get_packet_len(GWBUF* buffer)
{ {
mxb_assert(buffer);
// The first three bytes of the packet header contain its length // The first three bytes of the packet header contain its length
uint8_t buf[3]; uint8_t buf[3];
gwbuf_copy_data(buffer, 0, 3, buf); gwbuf_copy_data(buffer, 0, 3, buf);