8ed967266
Denys Vlasenko
2014-02-09
Subject
libbb: don't die if crypt() returns NULL
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/pw_encrypt.c+8 -1
| @@ -142,7 +142,14 @@ char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup) | |
| char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup) | |
| { | |
| - | return xstrdup(crypt(clear, salt)); |
| + | char *s; |
| + | |
| + | s = crypt(clear, salt); |
| + | /* |
| + | * glibc used to return "" on malformed salts (for example, ""), |
| + | * but since 2.17 it returns NULL. |
| + | */ |
| + | return xstrdup(s ? s : ""); |
| } | |
| #endif | |