From 2b5673786824f21bd1cec0770dce2ca934b82ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 13 Dec 2019 07:07:41 +0200 Subject: [PATCH] Fix debug assertion The GWBUF_IS_CONTIGUOUS macro changed in 2.4 and it no longer allows null arguments. --- server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc index e6747c9b6..b18bdafaf 100644 --- a/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc +++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.cc @@ -1021,7 +1021,7 @@ static int gw_read_and_write(DCB* dcb) { stmt = modutil_get_next_MySQL_packet(&read_buffer); - if (!GWBUF_IS_CONTIGUOUS(stmt)) + if (stmt && !GWBUF_IS_CONTIGUOUS(stmt)) { // Make sure the buffer is contiguous stmt = gwbuf_make_contiguous(stmt);