svn commit: samba r14742 - in trunk/source/utils: .

[jra]

Author: jra
Date: 2006-03-27 02:51:16 +0000 (Mon, 27 Mar 2006)
New Revision: 14742

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14742

Log:
Fix coverity bug #227. Possible deref of null pointer
in error code path.
Jeremy.

Modified:
   trunk/source/utils/net_rpc_samsync.c


Changeset:
Modified: trunk/source/utils/net_rpc_samsync.c
===================================================================
--- trunk/source/utils/net_rpc_samsync.c        2006-03-27 02:45:11 UTC (rev 
14741)
+++ trunk/source/utils/net_rpc_samsync.c        2006-03-27 02:51:16 UTC (rev 
14742)
@@ -1982,22 +1982,27 @@
 
   done:
        /* Close and delete the ldif files */
-       if (add_file)
+       if (add_file) {
                fclose(add_file);
-       if (strcmp(add_name, add_template) && (unlink(add_name))) {
+       }
+
+       if ((add_name != NULL) && strcmp(add_name, add_template) && 
(unlink(add_name))) {
                DEBUG(1,("unlink(%s) failed, error was (%s)\n",
                         add_name, strerror(errno)));
        }
 
-       if (mod_file)
+       if (mod_file) {
                fclose(mod_file);
-       if (strcmp(mod_name, mod_template) && (unlink(mod_name))) {
+       }
+
+       if ((mod_name != NULL) && strcmp(mod_name, mod_template) && 
(unlink(mod_name))) {
                DEBUG(1,("unlink(%s) failed, error was (%s)\n",
                         mod_name, strerror(errno)));
        }
        
-       if (ldif_file && (ldif_file != stdout))
+       if (ldif_file && (ldif_file != stdout)) {
                fclose(ldif_file);
+       }
 
        /* Deallocate memory for the mapping arrays */
        SAFE_FREE(groupmap);