Changeset 428 for trunk/src/sh_static.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_static.c (modified) (5 diffs)

trunk/src/sh_static.c

@@ -76 +76 @@
 
 #define PWD_BUFFER_SIZE 256
-#define GRP_BUFFER_SIZE 256
+#define GRP_BUFFER_SIZE 3584
+#define GRP_BUFFER_SIZE_MALLOC 32768
 
 /**********************************************************************/
@@ -467 +468 @@
         char **m;
         struct group group;
-        char buff[PWD_BUFFER_SIZE];
+
+        char * buff = malloc(GRP_BUFFER_SIZE_MALLOC);
 
         rv = -1;
@@ -481 +483 @@
                 num_groups = 1;
 
-                while (!__pgsreader(__parsegrent, &group, buff, sizeof(buff), grf)) {
+                while (!__pgsreader(__parsegrent, &group, buff, GRP_BUFFER_SIZE_MALLOC, grf)) {
                         assert(group.gr_mem); /* Must have at least a NULL terminator. */
                         if (group.gr_gid != gid) {
@@ -511 +513 @@
          * warnings from various malloc debuggers. */
         free(group_list);
+        free(buff);
         return rv;
 }
@@ -699 +702 @@
                                 line_buff[line_len] = 0;
                         } else if (line_len + 2 == buflen) { /* line too long */
+                                rv = ERANGE;
+                                break;
+                                /*
                                 ++skip;
                                 continue;
+                                */
                         }