move to SAFE_FREE()
authorSimo Sorce <idra@samba.org>
Mon, 17 Sep 2001 00:52:47 +0000 (00:52 +0000)
committerSimo Sorce <idra@samba.org>
Mon, 17 Sep 2001 00:52:47 +0000 (00:52 +0000)
source/client/clitar.c
source/client/smbmount.c

index 49ea5edf479b8f3b61567c66974636870b0de1e0..39c31625b4171d587fbabd7493f4cfb4559c1976 100644 (file)
@@ -193,7 +193,7 @@ static void writetarheader(int f,  char *aname, int size, time_t mtime,
          i = strlen(b)+1;
          DEBUG(5, ("File name in tar file: %s, size=%d, \n", b, (int)strlen(b)));
          dotarbuf(f, b, TBLOCK*(((i-1)/TBLOCK)+1));
-         free(b);
+         SAFE_FREE(b);
   }
 
   /* use l + 1 to do the null too */
@@ -1190,7 +1190,7 @@ static void do_tarput(void)
 
     if (longfilename != NULL) {
 
-      free(finfo.name);   /* Free the space already allocated */
+      SAFE_FREE(finfo.name);   /* Free the space already allocated */
       finfo.name = longfilename;
       longfilename = NULL;
 
@@ -1416,7 +1416,7 @@ void cmd_tar(void)
 
   process_tar();
 
-  free(argl);
+  SAFE_FREE(argl);
 }
 
 /****************************************************************************
@@ -1433,7 +1433,7 @@ int process_tar(void)
 #else
     do_tarput();
 #endif
-    free(tarbuf);
+    SAFE_FREE(tarbuf);
     close(tarhandle);
     break;
   case 'r':
@@ -1483,7 +1483,7 @@ int process_tar(void)
     
     if (ntarf) dotareof(tarhandle);
     close(tarhandle);
-    free(tarbuf);
+    SAFE_FREE(tarbuf);
     
     DEBUG(0, ("tar: dumped %d files and directories\n", ntarf));
     DEBUG(0, ("Total bytes written: %.0f\n", (double)ttarf));
@@ -1493,9 +1493,9 @@ int process_tar(void)
   if (must_free_cliplist) {
     int i;
     for (i = 0; i < clipn; ++i) {
-      free(cliplist[i]);
+      SAFE_FREE(cliplist[i]);
     }
-    free(cliplist);
+    SAFE_FREE(cliplist);
     cliplist = NULL;
     clipn = 0;
     must_free_cliplist = False;
@@ -1615,17 +1615,15 @@ static int read_inclusion_file(char *filename)
     }
   }
 
-  if (inclusion_buffer) {
-    free(inclusion_buffer);
-  }
+  SAFE_FREE(inclusion_buffer);
   if (error) {
     if (cliplist) {
       char **pp;
       /* We know cliplist is always null-terminated */
       for (pp = cliplist; *pp; ++pp) {
-        free(*pp);
+        SAFE_FREE(*pp);
       }
-      free(cliplist);
+      SAFE_FREE(cliplist);
       cliplist = NULL;
       must_free_cliplist = False;
     }
index a87eb789ef76d185d535787f712911c3c727af5b..8650152faf35be1e83838440025437ee82368768 100644 (file)
@@ -153,7 +153,7 @@ static struct cli_state *do_connection(char *service)
                DEBUG(0,("%d: Connection to %s failed\n", getpid(), server_n));
                if (c) {
                        cli_shutdown(c);
-                       free(c);
+                       SAFE_FREE(c);
                }
                return NULL;
        }
@@ -163,7 +163,7 @@ static struct cli_state *do_connection(char *service)
                DEBUG(0,("%d: session request to %s failed (%s)\n", 
                         getpid(), called.name, cli_errstr(c)));
                cli_shutdown(c);
-               free(c);
+               SAFE_FREE(c);
                if ((p=strchr_m(called.name, '.'))) {
                        *p = 0;
                        goto again;
@@ -180,7 +180,7 @@ static struct cli_state *do_connection(char *service)
        if (!cli_negprot(c)) {
                DEBUG(0,("%d: protocol negotiation failed\n", getpid()));
                cli_shutdown(c);
-               free(c);
+               SAFE_FREE(c);
                return NULL;
        }
 
@@ -198,7 +198,7 @@ static struct cli_state *do_connection(char *service)
                DEBUG(0,("%d: session setup failed: %s\n",
                         getpid(), cli_errstr(c)));
                cli_shutdown(c);
-               free(c);
+               SAFE_FREE(c);
                return NULL;
        }
 
@@ -209,7 +209,7 @@ static struct cli_state *do_connection(char *service)
                DEBUG(0,("%d: tree connect failed: %s\n",
                         getpid(), cli_errstr(c)));
                cli_shutdown(c);
-               free(c);
+               SAFE_FREE(c);
                return NULL;
        }
 
@@ -358,8 +358,7 @@ static void send_fs_socket(char *service, char *mount_point, struct cli_state *c
                   If we don't do this we will "leak" sockets and memory on
                   each reconnection we have to make. */
                cli_shutdown(c);
-               free(c);
-               c = NULL;
+               SAFE_FREE(c);
 
                if (!closed) {
                        /* redirect stdout & stderr since we can't know that