str can be free'd outside readString

[redis.git] / redis-check-aof.c

diff --git a/redis-check-aof.c b/redis-check-aof.c
index 53472032110d9fd0b6041988e772dbb0bfcb38d9..8d72e6b21addee68d7ec2f35f24a7f46c38c0d6d 100644 (file)
--- a/redis-check-aof.c
+++ b/redis-check-aof.c
@@ -58,13 +58,9 @@ int readString(FILE *fp, char** target) {
     len += 2;
     *target = (char*)malloc(len);
     if (!readBytes(fp,*target,len)) {
     len += 2;
     *target = (char*)malloc(len);
     if (!readBytes(fp,*target,len)) {

-        free(*target);
-        *target = NULL;

         return 0;
     }
     if (!consumeNewline(*target+len-2)) {
         return 0;
     }
     if (!consumeNewline(*target+len-2)) {

-        free(*target);
-        *target = NULL;

         return 0;
     }
     (*target)[len-2] = '\0';
         return 0;
     }
     (*target)[len-2] = '\0';


@@ -82,14 +78,10 @@ long process(FILE *fp) {
 
     while(1) {
         if (!multi) pos = ftell(fp);
 
     while(1) {
         if (!multi) pos = ftell(fp);

-        if (!readArgc(fp, &argc)) {
-            break;
-        }
+        if (!readArgc(fp, &argc)) break;

 
         for (i = 0; i < argc; i++) {
 
         for (i = 0; i < argc; i++) {

-            if (!readString(fp,&str)) {
-                break;
-            }
+            if (!readString(fp,&str)) break;

             if (i == 0) {
                 if (strcasecmp(str, "multi") == 0) {
                     if (multi++) {
             if (i == 0) {
                 if (strcasecmp(str, "multi") == 0) {
                     if (multi++) {


@@ -106,7 +98,7 @@ long process(FILE *fp) {
             free(str);
         }
 
             free(str);
         }
 

-        /* Check if loop was finished */
+        /* Stop if the loop did not finish */

         if (i < argc) {
             if (str) free(str);
             break;
         if (i < argc) {
             if (str) free(str);
             break;


@@ -116,11 +108,9 @@ long process(FILE *fp) {
     if (feof(fp) && multi && strlen(error) == 0) {
         ERROR("Reached EOF before reading EXEC for MULTI");
     }
     if (feof(fp) && multi && strlen(error) == 0) {
         ERROR("Reached EOF before reading EXEC for MULTI");
     }

-

     if (strlen(error) > 0) {
         printf("%s\n", error);
     }
     if (strlen(error) > 0) {
         printf("%s\n", error);
     }

-

     return pos;
 }
 
     return pos;
 }