From 69bea44bc905d30a545d817b5a8f1fd22206b5e0 Mon Sep 17 00:00:00 2001 From: "guilhem@mysql.com" <> Date: Thu, 17 Jun 2004 15:40:13 +0200 Subject: [PATCH] Fix for BUG#4017 "mysql_real_connect buffer overflow" --- libmysql/libmysql.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index c50193c5e2c..a0a4a26d971 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1358,7 +1358,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user, my_gethostbyname_r_free(); goto error; } - memcpy(&sock_addr.sin_addr,hp->h_addr, (size_t) hp->h_length); + memcpy(&sock_addr.sin_addr, hp->h_addr, + min(sizeof(sock_addr.sin_addr), (size_t) hp->h_length)); my_gethostbyname_r_free(); } sock_addr.sin_port = (ushort) htons((ushort) port);