Changeset 918 in openpam for trunk/lib/libpam

Timestamp:

Feb 19, 2017, 5:46:22 PM (4 years ago)

Author:

Dag-Erling Smørgrav

Message:

Fix a bug that prevented the service name from being freed, thus
leaking a small amount of memory for every PAM session.

While there, eliminate an unnecessary variable.

File:

• trunk/lib/libpam/pam_set_item.c (modified) (3 diffs)

trunk/lib/libpam/pam_set_item.c

@@ -61 +61 @@
         const void *item)
 {
-        void **slot, *tmp;
+        void **slot;
         size_t nsize, osize;
 
@@ -70 +70 @@
         case PAM_SERVICE:
                 /* set once only, by pam_start() */
-                if (*slot != NULL)
+                if (*slot != NULL && item != NULL)
                         RETURNC(PAM_SYSTEM_ERR);
                 /* fall through */
@@ -102 +102 @@
         }
         if (item != NULL) {
-                if ((tmp = malloc(nsize)) == NULL)
+                if ((*slot = malloc(nsize)) == NULL)
                         RETURNC(PAM_BUF_ERR);
-                memcpy(tmp, item, nsize);
+                memcpy(*slot, item, nsize);
         } else {
-                tmp = NULL;
+                *slot = NULL;
         }
-        *slot = tmp;
         RETURNC(PAM_SUCCESS);
 }