From c21558315b7d67f9a9b727c8576df5192490c9bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 17 May 2019 16:12:24 +0300 Subject: [PATCH] Fix debug assertion with SSL connections The code assumed gwbuf_length would accept null buffers. --- server/core/dcb.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core/dcb.cc b/server/core/dcb.cc index 40254978d..a032788c2 100644 --- a/server/core/dcb.cc +++ b/server/core/dcb.cc @@ -697,7 +697,7 @@ static int dcb_read_SSL(DCB* dcb, GWBUF** head) { GWBUF* buffer; int nsingleread = 0, nreadtotal = 0; - int start_length = gwbuf_length(*head); + int start_length = *head ? gwbuf_length(*head) : 0; if (dcb->fd == DCBFD_CLOSED) { @@ -730,7 +730,7 @@ static int dcb_read_SSL(DCB* dcb, GWBUF** head) } } - mxb_assert(gwbuf_length(*head) == (size_t)(start_length + nreadtotal)); + mxb_assert((*head ? gwbuf_length(*head) : 0) == (size_t)(start_length + nreadtotal)); return nsingleread < 0 ? nsingleread : nreadtotal; }