Changeset 1597 for trunk/server

Timestamp:

Aug 21, 2010, 3:00:19 AM (14 years ago)

Author:

geofft

Message:

admof: Be a bit more paranoid about memory

File:

• trunk/server/common/oursrc/accountadm/admof.c (modified) (2 diffs)

trunk/server/common/oursrc/accountadm/admof.c

@@ -62 +62 @@
                    .idlist_val = NULL};
 
+    if (trights == NULL || tnames.namelist_val == NULL)
+        die("internal error: malloc failed: %m");
+
     for (i = 0; i < n; ++i) {
         int off;
@@ -72 +75 @@
     if (pr_NameToId(&tnames, &tids) != 0)
         die("internal error: pr_NameToId failed");
-    if (tids.idlist_len != n)
-        die("internal error: pr_NameToId did not return as many ids as names");
+    if (tids.idlist_len < n)
+        die("internal error: pr_NameToId did not return enough ids");
 
     for (i = 0; i < n; ++i) {