diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2014-02-09 14:38:03 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2014-02-09 14:38:03 +0100 |
| commit | 8ed96726603a59969b99e4ea30dbd9b06955084b (patch) | |
| tree | 6e9a14154a4ee84e41d195dcd636a1e65e651b9d /libbb | |
| parent | 4e03d4134202b117a29ecf5933a7a55e2a8532a4 (diff) | |
| download | busybox-8ed96726603a59969b99e4ea30dbd9b06955084b.tar.gz | |
libbb: don't die if crypt() returns NULL
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/pw_encrypt.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c index 39ffa084f..bfc7030a8 100644 --- a/libbb/pw_encrypt.c +++ b/libbb/pw_encrypt.c @@ -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 |