From 07315d36030bd1cbe6acfeb3e8f60c49ba876a10 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 17 Apr 2013 19:42:34 +0200 Subject: strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) with a bit of lame protection against abuse. --- sql-common/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql-common') diff --git a/sql-common/client.c b/sql-common/client.c index 976c09d7a70..c81fe6a8a69 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -776,7 +776,7 @@ restart: len-=2; if (protocol_41(mysql) && (char) pos[0] == '#') { - strmake(net->sqlstate, (char*) pos+1, SQLSTATE_LENGTH); + strmake_buf(net->sqlstate, (char*) pos+1); pos+= SQLSTATE_LENGTH+1; } else @@ -3120,7 +3120,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, bzero((char*) &UNIXaddr, sizeof(UNIXaddr)); UNIXaddr.sun_family= AF_UNIX; - strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path)-1); + strmake_buf(UNIXaddr.sun_path, unix_socket); if (connect_sync_or_async(mysql, net, sock, (struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr))) { -- cgit v1.2.1