Fix for BUG#4017 "mysql_real_connect buffer overflow"

69bea44b · guilhem@mysql.com · 2e04da08 · 69bea44b
Commit 69bea44b authored Jun 17, 2004 by guilhem@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

libmysql/libmysql.c libmysql/libmysql.c +2 -1

No files found.
--- 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);