Changeset 227 for trunk/src/slib.c

Timestamp:

Apr 20, 2009, 5:59:31 PM (16 years ago)

Author:

katerina

Message:

Fix warnings with -fstack-check

File:

• trunk/src/slib.c (modified) (4 diffs)

trunk/src/slib.c

@@ -1473 +1473 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
       struct passwd    pwd;
-      char             buffer[SH_PWBUF_SIZE];
+      char          *  buffer;
       struct passwd *  tempres;
-      sh_getpwnam_r(user, &pwd, buffer, sizeof(buffer), &tempres);
+      buffer = malloc(SH_PWBUF_SIZE);
+      SL_REQUIRE (buffer != NULL, _("buffer != NULL"));
+      sh_getpwnam_r(user, &pwd, buffer, SH_PWBUF_SIZE, &tempres);
 #else
       struct passwd * tempres = sh_getpwnam(user);
@@ -1484 +1486 @@
       rgid_orig = tempres->pw_gid;
       ruid_orig = tempres->pw_uid;
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      free(buffer);
+#endif
     }
   else
@@ -1516 +1521 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
       struct passwd    pwd;
-      char             buffer[SH_PWBUF_SIZE];
+      char          *  buffer;
       struct passwd *  tempres;
-      sh_getpwnam_r(user, &pwd, buffer, sizeof(buffer), &tempres);
+      buffer = malloc(SH_PWBUF_SIZE);
+      SL_REQUIRE (buffer != NULL, _("buffer != NULL"));
+      sh_getpwnam_r(user, &pwd, buffer, SH_PWBUF_SIZE, &tempres);
 #else
       struct passwd * tempres = sh_getpwnam(user);
@@ -1527 +1534 @@
       SL_REQUIRE (sl_drop_privileges() == SL_ENONE,
                   _("sl_drop_privileges() == SL_ENONE"));
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
+      free(buffer);
+#endif
     }
   SL_IRETURN(SL_ENONE, _("sl_policy_get_user"));