Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0

libmysql/libmysql.c:
  Auto merged

1 files changed, 2 insertions, 1 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index b3624ef3e94..e3e896615d5 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -1863,7 +1863,8 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
 	sprintf(net->last_error, ER(CR_UNKNOWN_HOST), host, tmp_errno);
 	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);