Changeset 462 for trunk/src

Timestamp:

Jan 16, 2015, 8:45:20 PM (10 years ago)

Author:

katerina

Message:

Fix for ticket #362 (Buffer for getgrnam_r too small).

File:

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

trunk/src/sh_unix.c

@@ -1012 +1012 @@
   struct group     grp;
   char           * buffer;
+  static size_t    gbufsize = SH_GRBUF_SIZE;       
 #endif
 
@@ -1035 +1036 @@
 
 #if defined(HAVE_PTHREAD) && defined (_POSIX_THREAD_SAFE_FUNCTIONS) && defined(HAVE_GETPWNAM_R)
-      buffer = SH_ALLOC(SH_GRBUF_SIZE);
-      status = sh_getgrnam_r(g, &grp, buffer, SH_GRBUF_SIZE, &w);
+
+      buffer = SH_ALLOC(gbufsize);
+      status = sh_getgrnam_r(g, &grp, buffer, gbufsize, &w);
+
+      if ((status == ERANGE) && (w == NULL)) 
+        {
+          if (SL_TRUE ==  sl_ok_adds( gbufsize, SH_GRBUF_SIZE ))
+            {
+              SH_FREE(buffer);
+              gbufsize += SH_GRBUF_SIZE;
+              goto is_a_name;
+            }
+        }
+
 #else
+
       errno = 0;
       w = sh_getgrnam(g);
       status = errno;
+
 #endif