one-byte overflow with old passwords

532d9c30 · Sergei Golubchik · f8f2cdf2 · 532d9c30
Commit 532d9c30 authored Dec 11, 2012 by Sergei Golubchik
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql-common/client.c sql-common/client.c +2 -2

No files found.
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3934,8 +3934,8 @@ static int old_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql)
        return CR_SERVER_HANDSHAKE_ERR;

    /* save it in MYSQL */
-    memcpy(mysql->scramble, pkt, pkt_len);
-    mysql->scramble[pkt_len] = 0;
+    memcpy(mysql->scramble, pkt, pkt_len - 1);
+    mysql->scramble[pkt_len - 1] = 0;
  }

  if (mysql->passwd[0])