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

Fixed empty reads causing a debug assert with large packets.

Browse Source
This commit is contained in:
Markus Makela
2015-06-05 19:37:33 +03:00
parent 61b1f34671
commit 1989a1482c
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/core/dcb.c
View File

@ -966,6 +966,13 @@ int dcb_read_SSL(
n = 0;
goto return_n;
}
#ifdef SS_DEBUG
else
{
skygw_log_write_flush(LD,"Total: %d Socket: %d Pending: %d",
nread,b,pending);
}
#endif
dcb->last_read = hkheartbeat;
@ -993,7 +1000,7 @@ int dcb_read_SSL(
n = SSL_read(dcb->ssl, GWBUF_DATA(buffer), bufsize);
dcb->stats.n_reads++;
if (n <= 0)
if (n < 0)
{
ssl_errno = SSL_get_error(dcb->ssl,n);
@ -1016,12 +1023,17 @@ int dcb_read_SSL(
gwbuf_free(buffer);
goto return_n;
}
}
}
else if(n == 0)
{
gwbuf_free(buffer);
goto return_n;
}
gwbuf_rtrim(buffer,bufsize - n);
#ifdef SS_DEBUG
skygw_log_write(LD,"[%lu] SSL: Truncated buffer from %d to %d bytes. "
"Read %d bytes, %d bytes waiting.\n",
"Read %d bytes, %d bytes waiting.\n",pthread_self(),
bufsize,GWBUF_LENGTH(buffer),n,b);
if(GWBUF_LENGTH(buffer) != n){
@ -1029,7 +1041,7 @@ int dcb_read_SSL(
}
ss_info_dassert((buffer->start <= buffer->end),"Buffer start has passed end.");
ss_dassert(GWBUF_LENGTH(buffer) == n);
ss_info_dassert(GWBUF_LENGTH(buffer) == n,"Buffer size not equal to read bytes.");
#endif
nread += n;