diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 18:13:31 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 18:13:31 +0200 |
| commit | 0f56110615d9773f1a23df8fca4cb090899cabef (patch) | |
| tree | caffcb9400932ee25e650cf646a06fa0231ed069 /ext/sockets | |
| parent | 48892e6d24be12499141dbf6c54bbaeaa6a87208 (diff) | |
| parent | f5b9cc4bcf0eb0bc05726d0cdb000563475d65f1 (diff) | |
| download | php-git-0f56110615d9773f1a23df8fca4cb090899cabef.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix length of key passed to zend_hash_str_find_ptr
Diffstat (limited to 'ext/sockets')
| -rw-r--r-- | ext/sockets/sendrecvmsg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/sockets/sendrecvmsg.c b/ext/sockets/sendrecvmsg.c index ce3cb79605..86556a308f 100644 --- a/ext/sockets/sendrecvmsg.c +++ b/ext/sockets/sendrecvmsg.c @@ -106,7 +106,7 @@ static void init_ancillary_registry(void) entry.to_array = to; \ key.cmsg_level = level; \ key.cmsg_type = type; \ - zend_hash_str_update_mem(&ancillary_registry.ht, (char*)&key, sizeof(key) - 1, (void*)&entry, sizeof(entry)) + zend_hash_str_update_mem(&ancillary_registry.ht, (char*)&key, sizeof(key), (void*)&entry, sizeof(entry)) #if defined(IPV6_PKTINFO) && HAVE_IPV6 PUT_ENTRY(sizeof(struct in6_pktinfo), 0, 0, from_zval_write_in6_pktinfo, @@ -156,7 +156,7 @@ ancillary_reg_entry *get_ancillary_reg_entry(int cmsg_level, int msg_type) tsrm_mutex_unlock(ancillary_mutex); #endif - if ((entry = zend_hash_str_find_ptr(&ancillary_registry.ht, (char*)&key, sizeof(key) - 1)) != NULL) { + if ((entry = zend_hash_str_find_ptr(&ancillary_registry.ht, (char*)&key, sizeof(key))) != NULL) { return entry; } else { return NULL; |