diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-01-31 21:50:08 -0800 |
| commit | 141b14454c499d8549067cf9ba704c96ce8d0f8c (patch) | |
| tree | 867f7284337306c6c352b2761902ce0589f666a1 /sapi/litespeed/lsapilib.c | |
| parent | 02fcbe08028361d13785fc90ed9460385af4e549 (diff) | |
| parent | 6a960b6d1b2b3cdbce7d6faf9e58087297a45887 (diff) | |
| download | php-git-141b14454c499d8549067cf9ba704c96ce8d0f8c.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Use better constant since MAXHOSTNAMELEN may mean shorter name
use right sizeof for memset
Conflicts:
ext/sockets/sockaddr_conv.c
ext/standard/dns.c
Diffstat (limited to 'sapi/litespeed/lsapilib.c')
| -rw-r--r-- | sapi/litespeed/lsapilib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index 2e60701361..41649efd2c 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -3376,7 +3376,7 @@ void lsapi_MD5Final(unsigned char digest[16], struct lsapi_MD5Context *ctx) lsapi_MD5Transform(ctx->buf, (uint32 *) ctx->in); byteReverse((unsigned char *) ctx->buf, 4); memmove(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ |