clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.0'

Browse Source 
* PHP-8.0:
  sockets: Fix variable/macro name collision on AIX
This commit is contained in:
Nikita Popov 2020-11-25 11:55:05 +01:00
commit 2b7d5eddfc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/sockets/sendrecvmsg.c
View File

@ -295,8 +295,9 @@ PHP_FUNCTION(socket_cmsg_space)
}
if (entry->var_el_size > 0) {
size_t rem_size = ZEND_LONG_MAX - entry->size;
size_t n_max = rem_size / entry->var_el_size;
/* Leading underscore to avoid symbol collision on AIX. */
size_t _rem_size = ZEND_LONG_MAX - entry->size;
size_t n_max = _rem_size / entry->var_el_size;
size_t size = entry->size + n * entry->var_el_size;
size_t total_size = CMSG_SPACE(size);
if (n > n_max /* zend_long overflow */