r4306: Couple more MALLOC fixes from albert chin (china@thewrittenword.com).

Jeremy.

diff --git a/source/lib/util_smbd.c b/source/lib/util_smbd.c
index 58e7d9c6275d1fb40a551cf02f1d2e4eade789e5..586362c1e4cfe147fd46df2fc877548ba78f878b 100644 (file)
--- a/source/lib/util_smbd.c
+++ b/source/lib/util_smbd.c
@@ -45,7 +45,7 @@ BOOL getgroups_user(const char *user, gid_t primary_gid, gid_t **ret_groups, int
        int i;
 
        max_grp = groups_max();
-       temp_groups = SMB_MALLOC_P(gid_t, max_grp);
+       temp_groups = SMB_MALLOC_ARRAY(gid_t, max_grp);
        if (! temp_groups) {
                return False;
        }

diff --git a/source/printing/print_svid.c b/source/printing/print_svid.c
index c7a8c9413d53e601bb5ea1fb8ce8d05ff17c87e1..d9db500425e5c1fe6ef67450d7930e531558d710 100644 (file)
--- a/source/printing/print_svid.c
+++ b/source/printing/print_svid.c
@@ -88,7 +88,7 @@ static void populate_printers(void)
                        *tmp = '\0';
                
                /* add it to the cache */
-               if ((ptmp = malloc(sizeof (*ptmp))) != NULL) {
+               if ((ptmp = SMB_MALLOC_P(printer_t)) != NULL) {
                        ZERO_STRUCTP(ptmp);
                        if((ptmp->name = SMB_STRDUP(name)) == NULL)
                                DEBUG(0,("populate_printers: malloc fail in strdup !\n"));