fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix cluster.c inet_ntop use of sizeof(n->ip).

Browse Source 
Using sizeof with an array will only return expected results if the
array is created in the scope of the function where sizeof is used. This
commit changes the inet_ntop calls so that they use the fixed buffer
value as defined in redis.h which is 16.
This commit is contained in:
Geoff Garside 2011-06-18 18:59:07 +01:00 committed by antirez
parent 693b640510
commit 6e894f02cf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cluster.c
View File

@ -758,7 +758,7 @@ void nodeIp2String(char *buf, clusterLink *link) {
if (getpeername(link->fd, (struct sockaddr*) &sa, &salen) == -1) if (getpeername(link->fd, (struct sockaddr*) &sa, &salen) == -1)
redisPanic("getpeername() failed."); redisPanic("getpeername() failed.");
inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),buf,sizeof(link->node->ip)); inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),buf,16);
} }
@ -2084,7 +2084,7 @@ void clusterCommand(redisClient *c) {
/* Finally add the node to the cluster with a random name, this /* Finally add the node to the cluster with a random name, this
* will get fixed in the first handshake (ping/pong). */ * will get fixed in the first handshake (ping/pong). */
n = createClusterNode(NULL,REDIS_NODE_HANDSHAKE|REDIS_NODE_MEET); n = createClusterNode(NULL,REDIS_NODE_HANDSHAKE|REDIS_NODE_MEET);
inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),n->ip,sizeof(n->ip)); inet_ntop(sa.sin_family,(void*)&(sa.sin_addr),n->ip,16);
n->port = port; n->port = port;
clusterAddNode(n); clusterAddNode(n);
addReply(c,shared.ok); addReply(c,shared.ok);