summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-09-12 17:50:42 +0000
committerStanislav Malyshev <stas@php.net>2011-09-12 17:50:42 +0000
commitba04ba9c8293c740ea3f536e80dc37b7118e181b (patch)
tree8c2c000b154bf9e85e068a90bce5ca9cb8ce2bac
parent1fbf9119050aee0867d0b276c3ed634e26c43b66 (diff)
downloadphp-git-ba04ba9c8293c740ea3f536e80dc37b7118e181b.tar.gz
MFB crypt fix
-rw-r--r--ext/standard/crypt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index 3bac50f9e4..700811b9e6 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -179,6 +179,8 @@ PHP_FUNCTION(crypt)
salt[2] = '\0';
#endif
salt_in_len = strlen(salt);
+ } else {
+ salt_in_len = MIN(PHP_MAX_SALT_LEN, salt_in_len);
}
/* Windows (win32/crypt) has a stripped down version of libxcrypt and