svn commit: samba r7126 - in branches/SAMBA_3_0/source/pam_smbpass: .

[jerry at samba.org]

Author: jerry
Date: 2005-05-31 01:44:44 +0000 (Tue, 31 May 2005)
New Revision: 7126

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

Log:
fixing paranoid malloc checker failures
Modified:
   branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
   branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c
   branches/SAMBA_3_0/source/pam_smbpass/support.c


Changeset:
Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c	2005-05-31 01:20:49 UTC (rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_auth.c	2005-05-31 01:44:44 UTC (rev 7126)
@@ -82,7 +82,7 @@
 
     /* Get a few bytes so we can pass our return value to
        pam_sm_setcred(). */
-    ret_data = malloc(sizeof(int));
+    ret_data = SMB_MALLOC_P(int);
 
     /* get the username */
     retval = pam_get_user( pamh, &name, "Username: " );

Modified: branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c	2005-05-31 01:20:49 UTC (rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/pam_smb_passwd.c	2005-05-31 01:44:44 UTC (rev 7126)
@@ -169,7 +169,7 @@
 
             /* tell user what is happening */
 #define greeting "Changing password for "
-            Announce = (char *) malloc(sizeof(greeting)+strlen(user));
+            Announce = SMB_MALLOC_ARRAY(char, sizeof(greeting)+strlen(user));
             if (Announce == NULL) {
                 _log_err(LOG_CRIT, "password: out of memory");
                 pdb_free_sam(&sampass);

Modified: branches/SAMBA_3_0/source/pam_smbpass/support.c
===================================================================
--- branches/SAMBA_3_0/source/pam_smbpass/support.c	2005-05-31 01:20:49 UTC (rev 7125)
+++ branches/SAMBA_3_0/source/pam_smbpass/support.c	2005-05-31 01:44:44 UTC (rev 7126)
@@ -238,7 +238,7 @@
         register int i;
 
         for (i = 0; x[i]; ++i); /* length of string */
-        if ((new = malloc(++i)) == NULL) {
+        if ((new = SMB_MALLOC_ARRAY(char, ++i)) == NULL) {
             i = 0;
             _log_err( LOG_CRIT, "out of memory in smbpXstrDup" );
         } else {
@@ -344,7 +344,7 @@
         }
     }
 
-    data_name = (char *) malloc( sizeof(FAIL_PREFIX) + strlen( name ));
+    data_name = SMB_MALLOC_ARRAY(char, sizeof(FAIL_PREFIX) + strlen( name ));
     if (data_name == NULL) {
         _log_err( LOG_CRIT, "no memory for data-name" );
     }
@@ -379,8 +379,7 @@
 
             /* get a failure recorder */
 
-            new = (struct _pam_failed_auth *)
-                      malloc( sizeof(struct _pam_failed_auth) );
+            new = SMB_MALLOC_P( struct _pam_failed_auth );
 
             if (new != NULL) {