Changeset 428 for trunk/src/sh_unix.c

Timestamp:

Mar 12, 2013, 9:42:07 PM (12 years ago)

Author:

katerina

Message:

Fix for ticket #335 (warn if buffer for group reading is too small).

File:

• trunk/src/sh_unix.c (modified) (3 diffs)

trunk/src/sh_unix.c

@@ -1007 +1007 @@
   struct group *           w;
   gid_t                    gid  = 0;
+  int                      status = 0;
 
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
@@ -1035 +1036 @@
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
       buffer = SH_ALLOC(SH_GRBUF_SIZE);
-      sh_getgrnam_r(g, &grp, buffer, SH_GRBUF_SIZE, &w);
+      status = sh_getgrnam_r(g, &grp, buffer, SH_GRBUF_SIZE, &w);
 #else
+      errno = 0;
       w = sh_getgrnam(g);
-#endif
-
-      if (w == NULL)
+      status = errno;
+#endif
+
+      if ((status == ERANGE) && (w == NULL)) 
+        {
+          static int seen = 0;
+          
+          if (seen == 0)
+            {
+              char errbuf[SH_ERRBUF_SIZE];
+
+              sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, EINVAL, MSG_E_GRNULL,
+                               sh_error_message(status, errbuf, sizeof(errbuf)),
+                               _("sh_group_to_gid"), (long) -1, _("line too long in group entry"));
+              ++seen;
+            }
+          *fail = -1;
+        }
+      else if (w == NULL)
         {
           char * tmp = sh_util_strdup(g);
@@ -2881 +2899 @@
 #endif
 
+  if (status == ERANGE) 
+    {
+      static int seen = 0;
+
+      if (seen == 0)
+        {
+          sh_error_handle (SH_ERR_ERR, FIL__, __LINE__, EINVAL, MSG_E_GRNULL,
+                           sh_error_message(status, errbuf, sizeof(errbuf)),
+                           _("getgrgid"), (long) gid, _("line too long in group entry"));
+          ++seen;
+        }
+      
+#if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETGRGID_R)
+      SH_FREE(buffer);
+#endif
+
+      sh_userid_add(gid, NULL, CACHE_GID);
+      SL_RETURN( NULL, _("sh_unix_getGIDname"));
+    }
+
   if (tempres == NULL) 
     {