Comments about security of slave-read-only in redis.coinf.

[redis.git] / src / redis-cli.c

diff --git a/src/redis-cli.c b/src/redis-cli.c
index c631aa79143c4098711d634b8c533b5c06beb2c9..bdaa3964217d26fbeea21207c0ece2098f5d7868 100644 (file)
--- a/src/redis-cli.c
+++ b/src/redis-cli.c
@@ -478,7 +478,7 @@ static sds cliFormatReplyCSV(redisReply *r) {
 static int cliReadReply(int output_raw_strings) {
     void *_reply;
     redisReply *reply;
 static int cliReadReply(int output_raw_strings) {
     void *_reply;
     redisReply *reply;

-    sds out;
+    sds out = NULL;

     int output = 1;
 
     if (redisGetReply(context,&_reply) != REDIS_OK) {
     int output = 1;
 
     if (redisGetReply(context,&_reply) != REDIS_OK) {


@@ -498,7 +498,8 @@ static int cliReadReply(int output_raw_strings) {
 
     reply = (redisReply*)_reply;
 
 
     reply = (redisReply*)_reply;
 

-    /* Check if we need to connect to a different node and reissue the request. */
+    /* Check if we need to connect to a different node and reissue the
+     * request. */

     if (config.cluster_mode && reply->type == REDIS_REPLY_ERROR &&
         (!strncmp(reply->str,"MOVED",5) || !strcmp(reply->str,"ASK")))
     {
     if (config.cluster_mode && reply->type == REDIS_REPLY_ERROR &&
         (!strncmp(reply->str,"MOVED",5) || !strcmp(reply->str,"ASK")))
     {


@@ -926,7 +927,10 @@ static void slaveMode(void) {
     unsigned long long payload;
 
     /* Send the SYNC command. */
     unsigned long long payload;
 
     /* Send the SYNC command. */

-    write(fd,"SYNC\r\n",6);
+    if (write(fd,"SYNC\r\n",6) != 6) {
+        fprintf(stderr,"Error writing to master\n");
+        exit(1);
+    }

 
     /* Read $<payload>\r\n, making sure to read just up to "\n" */
     p = buf;
 
     /* Read $<payload>\r\n, making sure to read just up to "\n" */
     p = buf;