diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 18:12:27 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 18:12:27 +0200 |
| commit | 33e556fab4cd71de1c25bad29dcc72ae475b76dc (patch) | |
| tree | 101d803186a52072bbd1c0ba3833045e2ee698de | |
| parent | 698088ca7cda3a79555d817093ad0aff7dfd1e95 (diff) | |
| parent | 0d6c2448a7b0276c2e72249aa1efb4fcffdc96d8 (diff) | |
| download | php-git-33e556fab4cd71de1c25bad29dcc72ae475b76dc.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix length of key passed to zend_hash_str_find_ptr
| -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 7b9c4e8ad3..4cf9fcdb65 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; |