path: root/libpam_misc/misc_conv.c
diff options
authorDmitry V. Levin <>2014-01-22 02:34:03 +0000
committerDmitry V. Levin <>2014-01-22 22:54:12 +0000
commitf760a6dc5853869d21051c7ed6015117941c1155 (patch)
treeab7f6587a4e9f8c6fa28a57eced604c51f32ac4f /libpam_misc/misc_conv.c
parent6b7558c8f88851ab954174e62d3b1e46cd2664b1 (diff)
libpam_misc: fix an inconsistency in handling memory allocation errors
When misc_conv fails to allocate memory for pam_response array, it returns PAM_CONV_ERR. However, when read_string fails to allocate memory for a response string, it loses the response string and silently ignores the error, with net result as if EOF has been read. * libpam_misc/misc_conv.c (read_string): Use strdup instead of x_strdup, the latter is of no benefit in this case. Do not ignore potential memory allocation errors returned by strdup, forward them to misc_conv.
Diffstat (limited to 'libpam_misc/misc_conv.c')
1 files changed, 5 insertions, 1 deletions
diff --git a/libpam_misc/misc_conv.c b/libpam_misc/misc_conv.c
index 3f74eeae..be53f343 100644
--- a/libpam_misc/misc_conv.c
+++ b/libpam_misc/misc_conv.c
@@ -210,8 +210,12 @@ static int read_string(int echo, const char *prompt, char **retstr)
line[nc] = '\0';
- *retstr = x_strdup(line);
+ *retstr = strdup(line);
+ if (!*retstr) {
+ D(("no memory for response string"));
+ nc = -1;
+ }
goto cleanexit; /* return malloc()ed string */