diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:19:55 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-08-27 18:19:55 -0600 |
| commit | d54f42c16c972590a9f944229b80771e2e31e20d (patch) | |
| tree | f02066cfab8ed4d919018ea1c48f2a065fa105d5 /sql/sql_show.cc | |
| parent | 7388ea3c56a268387e60fc28b671d664ecfa8ad4 (diff) | |
| parent | 6fdcb4c7b3a095bcfb2f8ce257da302007b62ad9 (diff) | |
| download | mariadb-git-d54f42c16c972590a9f944229b80771e2e31e20d.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index bba5eeefc73..1ad94c12b99 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -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) |