summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2011-07-31 23:14:04 +0000
committerStanislav Malyshev <stas@php.net>2011-07-31 23:14:04 +0000
commit44add6d195fdcb9d0b1896336af6296ec0caf14f (patch)
treec5ef013c0726fbcbec50019377e827f3b4c670ff /ext
parent6e246ad0d590db511480371c34606230cf521519 (diff)
downloadphp-git-44add6d195fdcb9d0b1896336af6296ec0caf14f.tar.gz
fix termination in sha-512 too
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/crypt_sha512.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/crypt_sha512.c b/ext/standard/crypt_sha512.c
index c3e4debe63..cbc97a328c 100644
--- a/ext/standard/crypt_sha512.c
+++ b/ext/standard/crypt_sha512.c
@@ -431,8 +431,8 @@ php_sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
if ((salt - (char *) 0) % __alignof__ (uint64_t) != 0) {
char *tmp = (char *) alloca(salt_len + 1 + __alignof__(uint64_t));
- tmp[salt_len] = 0;
salt = copied_salt = memcpy(tmp + __alignof__(uint64_t) - (tmp - (char *) 0) % __alignof__(uint64_t), salt, salt_len);
+ copied_salt[salt_len] = 0;
}
/* Prepare for the real work. */