summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-11-24 13:57:49 +0400
committerunknown <gluh@gluh.mysql.r18.ru>2003-11-24 13:57:49 +0400
commitd8e425c240b01f263dd8cd8431e32e8ba9539b43 (patch)
treeb418b3c6d0800a84a441987821fab9f2dad78a4a
parentc61d96d5baf8bb1d11502552a24cfca743e41419 (diff)
downloadmariadb-git-d8e425c240b01f263dd8cd8431e32e8ba9539b43.tar.gz
Fix for bug #1855: mysqld crashes with certain SSL connections
-rw-r--r--sql/sql_acl.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 065394c87d0..03a359d44e7 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -588,6 +588,11 @@ ulong acl_getroot(THD *thd, const char *host, const char *ip, const char *user,
/* Prepare certificate (if exists) */
DBUG_PRINT("info",("checkpoint 1"));
X509* cert=SSL_get_peer_certificate(ssl);
+ if (!cert)
+ {
+ user_access=NO_ACCESS;
+ break;
+ }
DBUG_PRINT("info",("checkpoint 2"));
/* If X509 issuer is speified, we check it... */
if (acl_user->x509_issuer)