From e183ea0495feed73b478f211aa60398578d397b9 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 6 Dec 2010 13:50:51 +0000 Subject: [PATCH] don't crash if the API is used incorrectly --- ext/mysqlnd/mysqlnd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index bb7967c093..6405de905a 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1994,15 +1994,19 @@ MYSQLND_METHOD(mysqlnd_conn, change_user)(MYSQLND * const conn, } } if (ret == PASS) { + char * tmp = NULL; + /* if we get conn->user as parameter and then we first free it, then estrndup it, we will crash */ + tmp = mnd_pestrndup(user, user_len, conn->persistent); if (conn->user) { mnd_pefree(conn->user, conn->persistent); } - conn->user = mnd_pestrndup(user, user_len, conn->persistent); + conn->user = tmp; + tmp = mnd_pestrdup(passwd, conn->persistent); if (conn->passwd) { mnd_pefree(conn->passwd, conn->persistent); } - conn->passwd = mnd_pestrdup(passwd, conn->persistent); + conn->passwd = tmp; if (conn->last_message) { mnd_pefree(conn->last_message, conn->persistent); -- 2.40.0