Ticket #2036: redundant.diff

lib/vfs/mc-vfs/ftpfs.c

@@ -597 +597 @@
             np->domain = g_strdup (s);
             np->next   = NULL;
             if (no_proxy)
-                current->next = np;
+                current->next = np; /* FIXME: potential null derefence */
             else
                 no_proxy = np;
             current = np;

lib/vfs/mc-vfs/samba/lib/charset.c

@@ -315 +315 @@
 
   if(fp != NULL)
     fclose(fp);
-  if(cp_p)
-    free((char *)cp_p);
+
+  free((char *)cp_p);
   return NULL;
 }
 

lib/vfs/mc-vfs/samba/lib/util.c

@@ -1642 +1642 @@
   void *ret=NULL;
 
   if (size == 0) {
-    if (p) free(p);
+    free(p);
     DEBUG(5,("Realloc asked for 0 bytes\n"));
     return NULL;
   }
 
-  if (!p)
+  if (!p)
     ret = (void *)malloc(size);
   else
     ret = (void *)realloc(p,size);

lib/vfs/mc-vfs/samba/lib/util_str.c

@@ -980 +980 @@
   if (!s || !(*s)) return;
   if (*s == null_string)
     *s = NULL;
-  if (*s) free(*s);
+  free(*s);
   *s = NULL;
 }
 

lib/vfs/mc-vfs/samba/libsmb/clientgen.c

@@ -591 +591 @@
               DEBUG(4,("NetShareEnum failed\n"));
     }
   
-  if (rparam)
-    free(rparam);
-  if (rdata)
-    free(rdata);
+  free(rparam);
+  free(rdata);
 
   return count;
 }
@@ -664 +662 @@
                 }
         }
   
-        if (rparam)
       free(rparam);
-        if (rdata)
       free(rdata);
         
         return(count > 0);
@@ -1884 +1880 @@
                 *ino = IVAL(rdata, 64);
         }
 
-        if (rdata) free(rdata);
-        if (rparam) free(rparam);
+        free(rdata);
+        free(rparam);
         return True;
 }
 
@@ -2141 +2137 @@
 
                 total_received += ff_searchcount;
 
-                if (rdata) free(rdata); rdata = NULL;
-                if (rparam) free(rparam); rparam = NULL;
+                free(rdata); rdata = NULL;
+                free(rparam); rparam = NULL;
                 
                 DEBUG(3,("received %d entries (eos=%d resume=%d)\n",
                          ff_searchcount,ff_eos,ff_resume_key));
@@ -2156 +2152 @@
         }
 
         /* free up the dirlist buffer */
-        if (dirlist) free(dirlist);
+        free(dirlist);
         return(total_received);
 }
 
@@ -2403 +2399 @@
 ****************************************************************************/
 void cli_shutdown(struct cli_state *cli)
 {
-        if (cli->outbuf)
-        {
-                free(cli->outbuf);
-        }
-        if (cli->inbuf)
-        {
-                free(cli->inbuf);
-        }
+        free(cli->outbuf);
+        free(cli->inbuf);
 #ifdef WITH_SSL
     if (cli->fd != -1)
       sslutil_disconnect(cli->fd);

lib/vfs/mc-vfs/samba/libsmb/nmblib.c

@@ -620 +620 @@
   ******************************************************************/
 static void free_nmb_packet(struct nmb_packet *nmb)
 {  
-  if (nmb->answers) free(nmb->answers);
-  if (nmb->nsrecs) free(nmb->nsrecs);
-  if (nmb->additional) free(nmb->additional);
+  free(nmb->answers);
+  free(nmb->nsrecs);
+  free(nmb->additional);
 }
 
 /*******************************************************************

lib/vfs/mc-vfs/samba/param/loadparm.c

@@ -1319 +1319 @@
 static void free_service(service *pservice)
 {
   int i;
+
   if (!pservice)
      return;
 
@@ -1326 +1327 @@
     DEBUG(5,("free_service: Freeing service %s\n", pservice->szService));
 
   string_free(&pservice->szService);
-  if (pservice->copymap)
-  {
-    free(pservice->copymap);
-    pservice->copymap = NULL;
-  }
+
+  free(pservice->copymap);
+  pservice->copymap = NULL;
  
   for (i=0;parm_table[i].label;i++)
     if ((parm_table[i].type == P_STRING ||
@@ -1849 +1848 @@
 static void init_copymap(service *pservice)
 {
   size_t i;
-  if (pservice->copymap) free(pservice->copymap);
+
+  free(pservice->copymap);
+
   pservice->copymap = (BOOL *)malloc(sizeof(BOOL)*NUMPARAMETERS);
   if (!pservice->copymap)
     DEBUG(0,("Couldn't allocate copymap!! (size %d)\n",(int)NUMPARAMETERS));

lib/vfs/mc-vfs/tar.c

@@ -644 +644 @@
             while (tar_get_next_record (archive, tard)->ext_hdr.
                    isextended);
             inode->data_offset = current_tar_position;
+            /* FIXME: potential null derefence 'inode' */
         }
         return STATUS_SUCCESS;
     }

src/man2hlp.c

@@ -838 +838 @@
         fprintf (f_out, "\n");
 
         free (cnode->node);
-        if (cnode->lname)
             free (cnode->lname);
         if (cnode != &nodes)
             free (cnode);

src/mountlist.c

@@ -155 +155 @@
 {
     if (!me)
         return;
-    if (me->me_devname)
+
         free (me->me_devname);
-    if (me->me_mountdir)
         free (me->me_mountdir);
-    if (me->me_type)
         free (me->me_type);
     free (me);
 }

src/viewer/display.c

@@ -129 +129 @@
     const screen_dimen width = view->status_area.width;
     const screen_dimen height = view->status_area.height;
     const char *file_label;
-    screen_dimen file_label_width, i = 0;
+    screen_dimen file_label_width;
 
     if (height < 1)
         return;