238075 2022-03-18 07:37:55 -0700 Avoid extra pointer dereference in EventListenerMap::m_entries 2022-03-18 13:11:29 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez darin esprehn+autocc ews-watchlist ggaren kangil.han webkit-bug-importer ysuzuki oldest_to_newest 1852713 0 cdumez 2022-03-18 07:37:55 -0700 Avoid extra pointer dereference in EventListenerMap::m_entries. 1852714 1 455094 cdumez 2022-03-18 07:39:17 -0700 Created attachment 455094 Patch 1852727 2 455094 ggaren 2022-03-18 08:43:54 -0700 Comment on attachment 455094 Patch R=me 1852812 3 ews-feeder 2022-03-18 13:10:17 -0700 Committed r291495 (248607@main): <https://commits.webkit.org/248607@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 455094. 1852814 4 webkit-bug-importer 2022-03-18 13:11:29 -0700 <rdar://problem/90501022> 455094 2022-03-18 07:39:17 -0700 2022-03-18 13:10:20 -0700 Patch bug-238075-20220318073916.patch text/plain 6187 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxNDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTgxYjU3MjNlOTllYTZm Yjg1NjViZGUwZDkzMzkyNjliMzQyNzU1Ni4uYjUzOGJkOTJjM2JmZjgyMmJjZTdhODA4NTlkY2Rl MmUwNmNkMWMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIyLTAzLTE4ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQXZvaWQgZXh0cmEgcG9pbnRl ciBkZXJlZmVyZW5jZSBpbiBFdmVudExpc3RlbmVyTWFwOjptX2VudHJpZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzODA3NQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgYSBjb25maXJtZWQg MC41LTAuOCUgcHJvZ3Jlc3Npb24gb24gU3BlZWRvbWV0ZXIgYWNjb3JkaW5nIHRvIEEvQgorICAg ICAgICBib3RzLgorCisgICAgICAgICogZG9tL0V2ZW50TGlzdGVuZXJNYXAuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5lck1hcDo6Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6 RXZlbnRMaXN0ZW5lck1hcDo6YWRkKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50TGlzdGVuZXJN YXA6OnJlbW92ZSk6CisgICAgICAgIChXZWJDb3JlOjpFdmVudExpc3RlbmVyTWFwOjpmaW5kKToK KyAgICAgICAgKFdlYkNvcmU6OkV2ZW50TGlzdGVuZXJNYXA6OnJlbW92ZUZpcnN0RXZlbnRMaXN0 ZW5lckNyZWF0ZWRGcm9tTWFya3VwKToKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50TGlzdGVuZXJN YXA6OmNvcHlFdmVudExpc3RlbmVyc05vdENyZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQpOgorICAg ICAgICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5lckl0ZXJhdG9yOjpuZXh0TGlzdGVuZXIpOgorICAg ICAgICAoV2ViQ29yZTo6RXZlbnRMaXN0ZW5lck1hcDo6ZmluZCBjb25zdCk6IERlbGV0ZWQuCisg ICAgICAgICogZG9tL0V2ZW50TGlzdGVuZXJNYXAuaDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50 TGlzdGVuZXJNYXA6OmZpbmQgY29uc3QpOgorCiAyMDIyLTAzLTE4ICBBbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbSUZDXVtJbnRlZ3JhdGlvbl0gUmVuYW1lIElubGlu ZUl0ZXJhdG9yOjpMaW5lOjpjbG9zZXN0UnVuKiB0byBjbG9zZXN0Qm94Rm9yKgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0V2ZW50TGlzdGVuZXJNYXAuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL0V2ZW50TGlzdGVuZXJNYXAuY3BwCmluZGV4IDYwYjFkYTc2M2YzYjBhNzBjZjFlYWRl NDMzNGQ4Zjk1MzM2YTRlZjMuLjNmN2EwNGMwYzVhZTJmOGQ0OTdiNWEwMGI4NTI0M2Q2ODY3MjI4 NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudExpc3RlbmVyTWFwLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0ZW5lck1hcC5jcHAKQEAgLTg4LDcgKzg4 LDcgQEAgdm9pZCBFdmVudExpc3RlbmVyTWFwOjpjbGVhcigpCiAgICAgYXNzZXJ0Tm9BY3RpdmVJ dGVyYXRvcnMoKTsKIAogICAgIGZvciAoYXV0byYgZW50cnkgOiBtX2VudHJpZXMpIHsKLSAgICAg ICAgZm9yIChhdXRvJiBsaXN0ZW5lciA6ICplbnRyeS5zZWNvbmQpCisgICAgICAgIGZvciAoYXV0 byYgbGlzdGVuZXIgOiBlbnRyeS5zZWNvbmQpCiAgICAgICAgICAgICBsaXN0ZW5lci0+bWFya0Fz UmVtb3ZlZCgpOwogICAgIH0KIApAQCAtMTQwLDkgKzE0MCw3IEBAIGJvb2wgRXZlbnRMaXN0ZW5l ck1hcDo6YWRkKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwgUmVmPEV2ZW50TGlzdGVuZXI+ JiYgbGlzCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KIAotICAgIGF1dG8gbGlzdGVuZXJz ID0gbWFrZVVuaXF1ZTxFdmVudExpc3RlbmVyVmVjdG9yPigpOwotICAgIGxpc3RlbmVycy0+dW5j aGVja2VkQXBwZW5kKFJlZ2lzdGVyZWRFdmVudExpc3RlbmVyOjpjcmVhdGUoV1RGTW92ZShsaXN0 ZW5lciksIG9wdGlvbnMpKTsKLSAgICBtX2VudHJpZXMuYXBwZW5kKHsgZXZlbnRUeXBlLCBXVEZN b3ZlKGxpc3RlbmVycykgfSk7CisgICAgbV9lbnRyaWVzLmFwcGVuZCh7IGV2ZW50VHlwZSwgRXZl bnRMaXN0ZW5lclZlY3RvciB7IFJlZ2lzdGVyZWRFdmVudExpc3RlbmVyOjpjcmVhdGUoV1RGTW92 ZShsaXN0ZW5lciksIG9wdGlvbnMpIH0gfSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAgLTE2 NSw4ICsxNjMsOCBAQCBib29sIEV2ZW50TGlzdGVuZXJNYXA6OnJlbW92ZShjb25zdCBBdG9tU3Ry aW5nJiBldmVudFR5cGUsIEV2ZW50TGlzdGVuZXImIGxpc3RlbgogCiAgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IG1fZW50cmllcy5zaXplKCk7ICsraSkgewogICAgICAgICBpZiAobV9lbnRy aWVzW2ldLmZpcnN0ID09IGV2ZW50VHlwZSkgewotICAgICAgICAgICAgYm9vbCB3YXNSZW1vdmVk ID0gcmVtb3ZlTGlzdGVuZXJGcm9tVmVjdG9yKCptX2VudHJpZXNbaV0uc2Vjb25kLCBsaXN0ZW5l ciwgdXNlQ2FwdHVyZSk7Ci0gICAgICAgICAgICBpZiAobV9lbnRyaWVzW2ldLnNlY29uZC0+aXNF bXB0eSgpKQorICAgICAgICAgICAgYm9vbCB3YXNSZW1vdmVkID0gcmVtb3ZlTGlzdGVuZXJGcm9t VmVjdG9yKG1fZW50cmllc1tpXS5zZWNvbmQsIGxpc3RlbmVyLCB1c2VDYXB0dXJlKTsKKyAgICAg ICAgICAgIGlmIChtX2VudHJpZXNbaV0uc2Vjb25kLmlzRW1wdHkoKSkKICAgICAgICAgICAgICAg ICBtX2VudHJpZXMucmVtb3ZlKGkpOwogICAgICAgICAgICAgcmV0dXJuIHdhc1JlbW92ZWQ7CiAg ICAgICAgIH0KQEAgLTE3NSwxMSArMTczLDExIEBAIGJvb2wgRXZlbnRMaXN0ZW5lck1hcDo6cmVt b3ZlKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwgRXZlbnRMaXN0ZW5lciYgbGlzdGVuCiAg ICAgcmV0dXJuIGZhbHNlOwogfQogCi1FdmVudExpc3RlbmVyVmVjdG9yKiBFdmVudExpc3RlbmVy TWFwOjpmaW5kKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSkgY29uc3QKK0V2ZW50TGlzdGVu ZXJWZWN0b3IqIEV2ZW50TGlzdGVuZXJNYXA6OmZpbmQoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRU eXBlKQogewogICAgIGZvciAoYXV0byYgZW50cnkgOiBtX2VudHJpZXMpIHsKICAgICAgICAgaWYg KGVudHJ5LmZpcnN0ID09IGV2ZW50VHlwZSkKLSAgICAgICAgICAgIHJldHVybiBlbnRyeS5zZWNv bmQuZ2V0KCk7CisgICAgICAgICAgICByZXR1cm4gJmVudHJ5LnNlY29uZDsKICAgICB9CiAKICAg ICByZXR1cm4gbnVsbHB0cjsKQEAgLTIwNSw4ICsyMDMsOCBAQCB2b2lkIEV2ZW50TGlzdGVuZXJN YXA6OnJlbW92ZUZpcnN0RXZlbnRMaXN0ZW5lckNyZWF0ZWRGcm9tTWFya3VwKGNvbnN0IEF0b21T dHJpbgogCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZW50cmllcy5zaXplKCk7ICsr aSkgewogICAgICAgICBpZiAobV9lbnRyaWVzW2ldLmZpcnN0ID09IGV2ZW50VHlwZSkgewotICAg ICAgICAgICAgcmVtb3ZlRmlyc3RMaXN0ZW5lckNyZWF0ZWRGcm9tTWFya3VwKCptX2VudHJpZXNb aV0uc2Vjb25kKTsKLSAgICAgICAgICAgIGlmIChtX2VudHJpZXNbaV0uc2Vjb25kLT5pc0VtcHR5 KCkpCisgICAgICAgICAgICByZW1vdmVGaXJzdExpc3RlbmVyQ3JlYXRlZEZyb21NYXJrdXAobV9l bnRyaWVzW2ldLnNlY29uZCk7CisgICAgICAgICAgICBpZiAobV9lbnRyaWVzW2ldLnNlY29uZC5p c0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgbV9lbnRyaWVzLnJlbW92ZShpKTsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMjI2LDcgKzIyNCw3IEBAIHN0YXRpYyB2b2lkIGNv cHlMaXN0ZW5lcnNOb3RDcmVhdGVkRnJvbU1hcmt1cFRvVGFyZ2V0KGNvbnN0IEF0b21TdHJpbmcm IGV2ZW50VHlwCiB2b2lkIEV2ZW50TGlzdGVuZXJNYXA6OmNvcHlFdmVudExpc3RlbmVyc05vdENy ZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQoRXZlbnRUYXJnZXQqIHRhcmdldCkKIHsKICAgICBmb3Ig KGF1dG8mIGVudHJ5IDogbV9lbnRyaWVzKQotICAgICAgICBjb3B5TGlzdGVuZXJzTm90Q3JlYXRl ZEZyb21NYXJrdXBUb1RhcmdldChlbnRyeS5maXJzdCwgKmVudHJ5LnNlY29uZCwgdGFyZ2V0KTsK KyAgICAgICAgY29weUxpc3RlbmVyc05vdENyZWF0ZWRGcm9tTWFya3VwVG9UYXJnZXQoZW50cnku Zmlyc3QsIGVudHJ5LnNlY29uZCwgdGFyZ2V0KTsKIH0KIAogRXZlbnRMaXN0ZW5lckl0ZXJhdG9y OjpFdmVudExpc3RlbmVySXRlcmF0b3IoRXZlbnRUYXJnZXQqIHRhcmdldCkKQEAgLTI2Nyw3ICsy NjUsNyBAQCBFdmVudExpc3RlbmVyKiBFdmVudExpc3RlbmVySXRlcmF0b3I6Om5leHRMaXN0ZW5l cigpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgZm9yICg7IG1fZW50cnlJbmRleCA8 IG1fbWFwLT5tX2VudHJpZXMuc2l6ZSgpOyArK21fZW50cnlJbmRleCkgewotICAgICAgICBFdmVu dExpc3RlbmVyVmVjdG9yJiBsaXN0ZW5lcnMgPSAqbV9tYXAtPm1fZW50cmllc1ttX2VudHJ5SW5k ZXhdLnNlY29uZDsKKyAgICAgICAgRXZlbnRMaXN0ZW5lclZlY3RvciYgbGlzdGVuZXJzID0gbV9t YXAtPm1fZW50cmllc1ttX2VudHJ5SW5kZXhdLnNlY29uZDsKICAgICAgICAgaWYgKG1faW5kZXgg PCBsaXN0ZW5lcnMuc2l6ZSgpKQogICAgICAgICAgICAgcmV0dXJuICZsaXN0ZW5lcnNbbV9pbmRl eCsrXS0+Y2FsbGJhY2soKTsKICAgICAgICAgbV9pbmRleCA9IDA7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0ZW5lck1hcC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0V2 ZW50TGlzdGVuZXJNYXAuaAppbmRleCBhYzQ0NzYwZDZlN2NhYTM0MTAzYjc5YWNjNzI1MGYwNmYw Yjk2YzM5Li40OGExOGM3MDY1NGVhYzMyZmQ5ZDc4NDVjMmZmYTJhYTI2ZDIyZjdmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnRMaXN0ZW5lck1hcC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9FdmVudExpc3RlbmVyTWFwLmgKQEAgLTU5LDcgKzU5LDggQEAgcHVibGljOgog ICAgIHZvaWQgcmVwbGFjZShjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUsIEV2ZW50TGlzdGVu ZXImIG9sZExpc3RlbmVyLCBSZWY8RXZlbnRMaXN0ZW5lcj4mJiBuZXdMaXN0ZW5lciwgY29uc3Qg UmVnaXN0ZXJlZEV2ZW50TGlzdGVuZXI6Ok9wdGlvbnMmKTsKICAgICBib29sIGFkZChjb25zdCBB dG9tU3RyaW5nJiBldmVudFR5cGUsIFJlZjxFdmVudExpc3RlbmVyPiYmLCBjb25zdCBSZWdpc3Rl cmVkRXZlbnRMaXN0ZW5lcjo6T3B0aW9ucyYpOwogICAgIGJvb2wgcmVtb3ZlKGNvbnN0IEF0b21T dHJpbmcmIGV2ZW50VHlwZSwgRXZlbnRMaXN0ZW5lciYsIGJvb2wgdXNlQ2FwdHVyZSk7Ci0gICAg V0VCQ09SRV9FWFBPUlQgRXZlbnRMaXN0ZW5lclZlY3RvciogZmluZChjb25zdCBBdG9tU3RyaW5n JiBldmVudFR5cGUpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIEV2ZW50TGlzdGVuZXJWZWN0 b3IqIGZpbmQoY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlKTsKKyAgICBjb25zdCBFdmVudExp c3RlbmVyVmVjdG9yKiBmaW5kKGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSkgY29uc3QgeyBy ZXR1cm4gY29uc3RfY2FzdDxFdmVudExpc3RlbmVyTWFwKj4odGhpcyktPmZpbmQoZXZlbnRUeXBl KTsgfQogICAgIFZlY3RvcjxBdG9tU3RyaW5nPiBldmVudFR5cGVzKCkgY29uc3Q7CiAKICAgICB2 b2lkIHJlbW92ZUZpcnN0RXZlbnRMaXN0ZW5lckNyZWF0ZWRGcm9tTWFya3VwKGNvbnN0IEF0b21T dHJpbmcmIGV2ZW50VHlwZSk7CkBAIC03Miw3ICs3Myw3IEBAIHByaXZhdGU6CiAKICAgICB2b2lk IGFzc2VydE5vQWN0aXZlSXRlcmF0b3JzKCkgY29uc3Q7CiAKLSAgICBWZWN0b3I8c3RkOjpwYWly PEF0b21TdHJpbmcsIHN0ZDo6dW5pcXVlX3B0cjxFdmVudExpc3RlbmVyVmVjdG9yPj4sIDI+IG1f ZW50cmllczsKKyAgICBWZWN0b3I8c3RkOjpwYWlyPEF0b21TdHJpbmcsIEV2ZW50TGlzdGVuZXJW ZWN0b3I+PiBtX2VudHJpZXM7CiAKICNpZm5kZWYgTkRFQlVHCiAgICAgc3RkOjphdG9taWM8aW50 PiBtX2FjdGl2ZUl0ZXJhdG9yQ291bnQgeyAwIH07Cg==