rooty/yubico-pam
1
0
Fork 0
mirror of https://github.com/Yubico/yubico-pam.git synced 2025-02-26 21:54:15 +01:00
Code Issues Projects Releases Wiki Activity

use malloc() instead of alloca() and free after use

Browse Source
This commit is contained in:
Klas Lindfors 2013-09-18 14:33:54 +02:00
parent 2aaf0fdc23
commit d2cda4b115
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util.c
View File

@ -37,7 +37,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <pwd.h> #include <pwd.h>
#include <unistd.h> #include <unistd.h>
#include <alloca.h>
#include "util.h" #include "util.h"
@ -201,7 +200,9 @@ get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const char *usern
*/ */
char *filename; /* not including directory */ char *filename; /* not including directory */
int filename_malloced = 0;
unsigned int serial = 0; unsigned int serial = 0;
int ret;
if (! yk_get_serial(yk, 0, 0, &serial)) { if (! yk_get_serial(yk, 0, 0, &serial)) {
D (("Failed to read serial number (serial-api-visible disabled?).")); D (("Failed to read serial number (serial-api-visible disabled?)."));
@ -214,7 +215,8 @@ get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const char *usern
int len; int len;
/* 0xffffffff == 4294967295 == 10 digits */ /* 0xffffffff == 4294967295 == 10 digits */
len = strlen(chalresp_path == NULL ? "challenge" : username) + 1 + 10 + 1; len = strlen(chalresp_path == NULL ? "challenge" : username) + 1 + 10 + 1;
if ((filename = alloca(len)) != NULL) { if ((filename = malloc(len)) != NULL) {
filename_malloced = 1;
int res = snprintf(filename, len, "%s-%i", chalresp_path == NULL ? "challenge" : username, serial); int res = snprintf(filename, len, "%s-%i", chalresp_path == NULL ? "challenge" : username, serial);
if (res < 0 || res > len) { if (res < 0 || res > len) {
/* Not enough space, strangely enough. */ /* Not enough space, strangely enough. */
@ -226,7 +228,11 @@ get_user_challenge_file(YK_KEY *yk, const char *chalresp_path, const char *usern
if (filename == NULL) if (filename == NULL)
return 0; return 0;
return get_user_cfgfile_path (chalresp_path, filename, username, fn); ret = get_user_cfgfile_path (chalresp_path, filename, username, fn);
if(filename_malloced == 1) {
free(filename);
}
return ret;
} }
int int