1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Bug#30593 No cipher list returned for "SHOW STATUS LIKE 'Ssl_cipher_list'"

- Move increment of "i" to "increment section" of for loop
 - Protect against writing after end of "buff"(backport from 5.1)
This commit is contained in:
msvensson@pilot.(none)
2007-08-23 20:24:48 +02:00
parent f773863767
commit e1b9e55a5a

View File

@@ -1739,12 +1739,13 @@ static bool show_status_array(THD *thd, const char *wild,
if (thd->net.vio->ssl_arg)
{
char *to= buff;
for (int i=0 ; i++ ;)
char *buff_end= buff + sizeof(buff);
for (int i= 0; to < buff_end; i++)
{
const char *p= SSL_get_cipher_list((SSL*) thd->net.vio->ssl_arg,i);
if (p == NULL)
break;
to= strmov(to, p);
to= strnmov(to, p, buff_end-to-1);
*to++= ':';
}
if (to != buff)