diff options
| author | des <des@FreeBSD.org> | 2003-11-20 07:55:08 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-11-20 07:55:08 +0000 |
| commit | 309ac786af61b444cb6e18370b17c1a5bb8bc45f (patch) | |
| tree | 6bf5a1ffa69aeb4e556773d0c7ef8f52e829b75f | |
| parent | 66b982e44c2d50ce68f7b35a7471a939bd16b03c (diff) | |
| download | FreeBSD-src-309ac786af61b444cb6e18370b17c1a5bb8bc45f.zip FreeBSD-src-309ac786af61b444cb6e18370b17c1a5bb8bc45f.tar.gz | |
MFP4: fix confusion about the layout of resp (#42758)
Approved by: re (rwatson)
| -rw-r--r-- | contrib/openpam/lib/openpam_ttyconv.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/contrib/openpam/lib/openpam_ttyconv.c b/contrib/openpam/lib/openpam_ttyconv.c index 48fe70a..1b91f16 100644 --- a/contrib/openpam/lib/openpam_ttyconv.c +++ b/contrib/openpam/lib/openpam_ttyconv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#22 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#23 $ */ #include <sys/types.h> @@ -179,13 +179,13 @@ openpam_ttyconv(int n, resp[i]->resp = NULL; switch (msg[i]->msg_style) { case PAM_PROMPT_ECHO_OFF: - resp[i]->resp = prompt_echo_off(msg[i]->msg); - if (resp[i]->resp == NULL) + (*resp[i]).resp = prompt_echo_off(msg[i]->msg); + if ((*resp[i]).resp == NULL) goto fail; break; case PAM_PROMPT_ECHO_ON: - resp[i]->resp = prompt(msg[i]->msg); - if (resp[i]->resp == NULL) + (*resp[i]).resp = prompt(msg[i]->msg); + if ((*resp[i]).resp == NULL) goto fail; break; case PAM_ERROR_MSG: @@ -206,11 +206,13 @@ openpam_ttyconv(int n, } RETURNC(PAM_SUCCESS); fail: - while (i) - if (resp[--i]->resp) { - memset(resp[i]->resp, 0, strlen(resp[i]->resp)); - FREE(resp[i]->resp); + for (i = 0; i < n; ++i) { + if ((*resp[i]).resp != NULL) { + memset((*resp[i]).resp, 0, strlen((*resp[i]).resp)); + FREE((*resp[i]).resp); } + } + memset(*resp, 0, n * sizeof **resp); FREE(*resp); RETURNC(PAM_CONV_ERR); } |
