diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2013-08-11 06:44:01 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2013-08-11 06:44:01 +0900 |
| commit | 0959475e11e58f69e58352ffe8dc54fc2d003f3c (patch) | |
| tree | 390e4f4fa4c8b037bdfa4eca15b13db40f97ea65 /ext/session/session.c | |
| parent | 771b06f5858954d708a1dca19d8272df15f4c3b9 (diff) | |
| parent | 2df95b135477965832ec9214eb8d58607f734c94 (diff) | |
| download | php-git-0959475e11e58f69e58352ffe8dc54fc2d003f3c.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed possible buffer overflow under Windows. Note: Not a security fix.
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 753d2c7573..606c334161 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -346,7 +346,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */ unsigned char rbuf[2048]; size_t toread = PS(entropy_length); - if (php_win32_get_random_bytes(rbuf, (size_t) toread) == SUCCESS){ + if (php_win32_get_random_bytes(rbuf, MIN(toread, sizeof(rbuf))) == SUCCESS){ switch (PS(hash_func)) { case PS_HASH_FUNC_MD5: |