173792 2017-06-23 14:56:46 -0700 Add release assertion to make sure callbackIdentifier is not 0 in DocumentLoader::finishedLoadingIcon() 2017-06-23 16:24:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez beidson buildbot commit-queue dbates ggaren japhet rniwa oldest_to_newest 1322449 0 cdumez 2017-06-23 14:56:46 -0700 Add release assertion to make sure callbackIdentifier is not 0 in DocumentLoader::finishedLoadingIcon() as this could cause HashTable corruption on WebPageProxy side. 1322451 1 313749 cdumez 2017-06-23 14:57:58 -0700 Created attachment 313749 Patch 1322452 2 313749 cdumez 2017-06-23 14:58:42 -0700 Comment on attachment 313749 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313749&action=review > Source/WebCore/loader/DocumentLoader.cpp:1698 > + auto callbackIdentifier = m_iconLoaders.take(&loader); Renamed because loadIdentifier means something else (see DocumentLoader::didGetLoadDecisionForIcon()). 1322493 3 313749 commit-queue 2017-06-23 16:24:15 -0700 Comment on attachment 313749 Patch Clearing flags on attachment: 313749 Committed r218775: <http://trac.webkit.org/changeset/218775> 1322494 4 commit-queue 2017-06-23 16:24:16 -0700 All reviewed patches have been landed. Closing bug. 313749 2017-06-23 14:57:58 -0700 2017-06-23 16:24:15 -0700 Patch bug-173792-20170623145757.patch text/plain 5035 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE4NzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjVjZTM5MGM3MTZhYzFh YWRhMzM2ZWQ0NDNmMzY5MTliNmMzMTJmOS4uMmY0NzViZjJkZmJjZjI2MTI5MWYzMWM5YWUxMjY1 YzNiOWE0Njc4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE3LTA2LTIzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHJlbGVhc2UgYXNzZXJ0 aW9uIHRvIG1ha2Ugc3VyZSBjYWxsYmFja0lkZW50aWZpZXIgaXMgbm90IDAgaW4gRG9jdW1lbnRM b2FkZXI6OmZpbmlzaGVkTG9hZGluZ0ljb24oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNzkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgQWRkIHJlbGVhc2UgYXNzZXJ0aW9uIHRvIG1ha2Ugc3VyZSBj YWxsYmFja0lkZW50aWZpZXIgaXMgbm90IDAgaW4gRG9jdW1lbnRMb2FkZXI6OmZpbmlzaGVkTG9h ZGluZ0ljb24oKQorICAgICAgICBhcyB0aGlzIGNvdWxkIGNhdXNlIEhhc2hUYWJsZSBjb3JydXB0 aW9uIG9uIFdlYlBhZ2VQcm94eSBzaWRlLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjpmaW5pc2hlZExvYWRp bmdJY29uKToKKwogMjAxNy0wNi0yMyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4K IAogICAgICAgICBbV0syXSBTdXBwb3J0IC1bV2ViQVZQbGF5ZXJDb250cm9sbGVyIHNldE11dGVk Ol0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQy L0NoYW5nZUxvZwppbmRleCA3ZjllNzFiZmViMTFmNzY5ZDQxNGI1YmQxNGZjYWMwYzg0NTlhOGY3 Li40YmQzNjVmMWVlNDBiMjU2NzQyMmM4ZDM1Y2UxZGQ5YzU2NWNhMWU5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMTkgQEAKIDIwMTctMDYtMjMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNv bT4KIAorICAgICAgICBBZGQgcmVsZWFzZSBhc3NlcnRpb24gdG8gbWFrZSBzdXJlIGNhbGxiYWNr SWRlbnRpZmllciBpcyBub3QgMCBpbiBEb2N1bWVudExvYWRlcjo6ZmluaXNoZWRMb2FkaW5nSWNv bigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM3 OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg cmVsZWFzZSBhc3NlcnRpb24gdG8gbWFrZSBzdXJlIGNhbGxiYWNrSWRlbnRpZmllciBpcyBub3Qg MCBpbiBEb2N1bWVudExvYWRlcjo6ZmluaXNoZWRMb2FkaW5nSWNvbigpCisgICAgICAgIGFzIHRo aXMgY291bGQgY2F1c2UgSGFzaFRhYmxlIGNvcnJ1cHRpb24gb24gV2ViUGFnZVByb3h5IHNpZGUu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xp ZW50LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmZpbmlzaGVk TG9hZGluZ0ljb24pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJh bWVMb2FkZXJDbGllbnQuaDoKKworMjAxNy0wNi0yMyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeCBEZWJ1ZyBidWlsZCBhZnRlciByMjE4 NzYzCiAKICAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRhc2suY3BwOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKaW5kZXggZTgyNWIxNDc1MDdhYjAy ZTFjMTFiN2E1NGRjNTI3Y2ViNTBlMTRlMS4uNzU1N2ViMDk4NjFmODExZGViN2E3Mjg1MDIxMTNh OTIyYjhjNjY0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9h ZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBA IC0xNjk1LDEwICsxNjk1LDEwIEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmZpbmlzaGVkTG9hZGlu Z0ljb24oSWNvbkxvYWRlciYgbG9hZGVyLCBTaGFyZWRCdWZmZXIqIGJ1ZmZlCiAgICAgLy8gSWYg dGhlIERvY3VtZW50TG9hZGVyIGhhcyBkZXRhY2hlZCBmcm9tIGl0cyBmcmFtZSwgYWxsIGljb24g bG9hZHMgc2hvdWxkIGhhdmUgYWxyZWFkeSBiZWVuIGNhbmNlbGxlZC4KICAgICBBU1NFUlQobV9m cmFtZSk7CiAKLSAgICBhdXRvIGxvYWRJZGVudGlmaWVyID0gbV9pY29uTG9hZGVycy50YWtlKCZs b2FkZXIpOwotICAgIEFTU0VSVChsb2FkSWRlbnRpZmllcik7CisgICAgYXV0byBjYWxsYmFja0lk ZW50aWZpZXIgPSBtX2ljb25Mb2FkZXJzLnRha2UoJmxvYWRlcik7CisgICAgUkVMRUFTRV9BU1NF UlQoY2FsbGJhY2tJZGVudGlmaWVyKTsKIAotICAgIG1fZnJhbWUtPmxvYWRlcigpLmNsaWVudCgp LmZpbmlzaGVkTG9hZGluZ0ljb24obG9hZElkZW50aWZpZXIsIGJ1ZmZlcik7CisgICAgbV9mcmFt ZS0+bG9hZGVyKCkuY2xpZW50KCkuZmluaXNoZWRMb2FkaW5nSWNvbihjYWxsYmFja0lkZW50aWZp ZXIsIGJ1ZmZlcik7CiB9CiAKIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmRpc3BhdGNoT25sb2FkRXZl bnRzKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKaW5kZXggZGI5NGMzZjQ1ZThk OTlmNDI2ZTc2OGM4OTU1N2U2MjVlNDU3YTI3My4uMTA4N2E4YTMxMzQ3ZGVjZGQyZWFkMDljMTlh Mjc4OTBjMWRmYzU4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKQEAgLTE4 MTMsMTMgKzE4MTMsMTMgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6Z2V0TG9hZERlY2lz aW9uRm9ySWNvbihjb25zdCBMaW5rSWNvbiYgaWNvbiwgdWludDY0X3QKICAgICAgICAgd2ViUGFn ZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpHZXRMb2FkRGVjaXNpb25Gb3JJY29uKGlj b24sIGNhbGxiYWNrSUQpKTsKIH0KIAotdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZmluaXNo ZWRMb2FkaW5nSWNvbih1aW50NjRfdCBsb2FkSWRlbnRpZmllciwgU2hhcmVkQnVmZmVyKiBkYXRh KQordm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZmluaXNoZWRMb2FkaW5nSWNvbih1aW50NjRf dCBjYWxsYmFja0lkZW50aWZpZXIsIFNoYXJlZEJ1ZmZlciogZGF0YSkKIHsKICAgICBpZiAoV2Vi UGFnZSogd2ViUGFnZSB7IG1fZnJhbWUtPnBhZ2UoKSB9KSB7CiAgICAgICAgIGlmIChkYXRhKQot ICAgICAgICAgICAgd2ViUGFnZS0+c2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpGaW5pc2hl ZExvYWRpbmdJY29uKGxvYWRJZGVudGlmaWVyLCB7IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWlu dDhfdCo+KGRhdGEtPmRhdGEoKSksIGRhdGEtPnNpemUoKSB9KSk7CisgICAgICAgICAgICB3ZWJQ YWdlLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkZpbmlzaGVkTG9hZGluZ0ljb24oY2Fs bGJhY2tJZGVudGlmaWVyLCB7IHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KGRhdGEt PmRhdGEoKSksIGRhdGEtPnNpemUoKSB9KSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHdl YlBhZ2UtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RmluaXNoZWRMb2FkaW5nSWNvbihs b2FkSWRlbnRpZmllciwgeyBudWxscHRyLCAwIH0pKTsKKyAgICAgICAgICAgIHdlYlBhZ2UtPnNl bmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6RmluaXNoZWRMb2FkaW5nSWNvbihjYWxsYmFja0lk ZW50aWZpZXIsIHsgbnVsbHB0ciwgMCB9KSk7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9h ZGVyQ2xpZW50LmgKaW5kZXggMDE2MzE4Yzk1NTliYmI1OTYyNGY3ZTg5NzA2YzI5MWIzMmY2ZmVh ZC4uYTJlYmYyZWIyMzU4NDZiOTY4ZjYwYWViY2U0MDViNjlmYWI5MjQ1NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2Vi RnJhbWVMb2FkZXJDbGllbnQuaApAQCAtMjYxLDcgKzI2MSw3IEBAIHByaXZhdGU6CiAKICAgICBi b29sIHVzZUljb25Mb2FkaW5nQ2xpZW50KCkgZmluYWw7CiAgICAgdm9pZCBnZXRMb2FkRGVjaXNp b25Gb3JJY29uKGNvbnN0IFdlYkNvcmU6OkxpbmtJY29uJiwgdWludDY0X3QgY2FsbGJhY2tJRCkg ZmluYWw7Ci0gICAgdm9pZCBmaW5pc2hlZExvYWRpbmdJY29uKHVpbnQ2NF90IGxvYWRJZGVudGlm aWVyLCBXZWJDb3JlOjpTaGFyZWRCdWZmZXIqKSBmaW5hbDsKKyAgICB2b2lkIGZpbmlzaGVkTG9h ZGluZ0ljb24odWludDY0X3QgY2FsbGJhY2tJZGVudGlmaWVyLCBXZWJDb3JlOjpTaGFyZWRCdWZm ZXIqKSBmaW5hbDsKIAogICAgIFdlYkZyYW1lKiBtX2ZyYW1lOwogICAgIFJlZlB0cjxQbHVnaW5W aWV3PiBtX3BsdWdpblZpZXc7Cg==