skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix leak and segfault wrt reading MP_FULLNAME

Browse Source
This commit is contained in:
Maarten Billemont 2016-11-06 11:17:02 -05:00
parent dd9e4eafbc
commit 097d240feb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MasterPassword/C/mpw-cli.c
View File

@ -96,7 +96,7 @@ static char *getline_prompt(const char *prompt) {
int main(int argc, char *const argv[]) { int main(int argc, char *const argv[]) {
// Read the environment. // Read the environment.
char *fullName = strdup( getenv( MP_env_fullname ) ); const char *fullName = NULL;
const char *masterPassword = NULL; const char *masterPassword = NULL;
const char *siteName = NULL; const char *siteName = NULL;
MPSiteType siteType = MPSiteTypeGeneratedLong; MPSiteType siteType = MPSiteTypeGeneratedLong;
@ -169,6 +169,8 @@ int main(int argc, char *const argv[]) {
siteName = strdup( argv[optind] ); siteName = strdup( argv[optind] );
// Convert and validate input. // Convert and validate input.
if (!fullName && (fullName = getenv( MP_env_fullname )))
fullName = strdup( fullName );
if (!fullName && !(fullName = getline_prompt( "Your full name:" ))) if (!fullName && !(fullName = getline_prompt( "Your full name:" )))
ftl( "Missing full name.\n" ); ftl( "Missing full name.\n" );
if (!siteName && !(siteName = getline_prompt( "Site name:" ))) if (!siteName && !(siteName = getline_prompt( "Site name:" )))