From ba16b8ca1c41a1797a8307cde134703b3417c38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 30 Jan 2017 12:48:21 +0200 Subject: [PATCH] Fix memory leak in dbusers.c The MySQL connection was created twice. --- server/modules/authenticator/MySQLAuth/dbusers.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/modules/authenticator/MySQLAuth/dbusers.c b/server/modules/authenticator/MySQLAuth/dbusers.c index 42e228730..7ae3717a3 100644 --- a/server/modules/authenticator/MySQLAuth/dbusers.c +++ b/server/modules/authenticator/MySQLAuth/dbusers.c @@ -1953,12 +1953,11 @@ int get_users_from_server(MYSQL *con, SERVER_REF *server, SERVICE *service, SERV */ static int get_users(SERV_LISTENER *listener, USERS *users) { - MYSQL *con = gw_mysql_init(); char *service_user = NULL; char *service_passwd = NULL; SERVICE *service = listener->service; - if (con == NULL || serviceGetUser(service, &service_user, &service_passwd) == 0) + if (serviceGetUser(service, &service_user, &service_passwd) == 0) { return -1; } @@ -1975,7 +1974,7 @@ static int get_users(SERV_LISTENER *listener, USERS *users) for (server = service->dbref; !service->svc_do_shutdown && server; server = server->next) { - con = gw_mysql_init(); + MYSQL *con = gw_mysql_init(); if (con) { if (mxs_mysql_real_connect(con, server->server, service_user, dpwd) == NULL)