157412 2016-05-05 20:54:05 -0700 Don't use invalidated ResourceLoadStatistics iterators 2016-05-06 08:52:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham cdumez commit-queue japhet webkit-bug-importer oldest_to_newest 1190606 0 bfulgham 2016-05-05 20:54:05 -0700 We were using references bound to the return value of iterators from the ResourceLoadStatistics HashMap. When new entries were added, these iterators were invalidated causing the references to refer to invalid memory. 1190607 1 webkit-bug-importer 2016-05-05 20:54:58 -0700 <rdar://problem/26133153> 1190610 2 278231 bfulgham 2016-05-05 21:07:40 -0700 Created attachment 278231 Patch 1190611 3 278232 bfulgham 2016-05-05 21:13:04 -0700 Created attachment 278232 Patch 1190681 4 278232 cdumez 2016-05-06 08:43:57 -0700 Comment on attachment 278232 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278232&action=review r=me > Source/WebCore/loader/ResourceLoadStatisticsStore.cpp:71 > + m_resourceStatisticsMap.set(primaryDomain, statistics); WTFMove(statistics) ? 1190682 5 bfulgham 2016-05-06 08:52:27 -0700 Committed r200511: <http://trac.webkit.org/changeset/200511> 278231 2016-05-05 21:07:40 -0700 2016-05-05 21:13:00 -0700 Patch bug-157412-20160505210822.patch text/plain 3516 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDUwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA1LTA1ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IHVzZSBpbnZhbGlk YXRlZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGl0ZXJhdG9ycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NDEyCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yNjEzMzE1Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uIHdhcyB1c2lu ZyByZWZlcmVuY2VzIGJvdW5kIHRvIHRoZSAndmFsdWUnCisgICAgICAgIG1lbWJlciBvZiBpdGVy YXRvcnMgZnJvbSB0aGUgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBIYXNoTWFwLiBXaGVuIG5ldyBl bnRyaWVzIHdlcmUKKyAgICAgICAgYWRkZWQsIHRoZXNlIGl0ZXJhdG9ycyB3ZXJlIGludmFsaWRh dGVkIGNhdXNpbmcgdGhlIHJlZmVyZW5jZXMgdG8gcmVmZXIgdG8gaW52YWxpZAorICAgICAgICBt ZW1vcnkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdhdGlvbik6 IFByb3RlY3QgYWdhaW5zdCBIYXNoTWFwCisgICAgICAgIGVsZW1lbnRzIGJlaW5nIGNvcGllZC9t b3ZlZCB3aGVuIG5ldyBpbnRyaWVzIGFyZSBhZGRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbik6 IEFkZGVkLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoK KwogMjAxNi0wNS0wNSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgTW9kZXJuIElEQiAoV29ya2Vycyk6IEdldCBldmVyeXRoaW5nIHRvIHRoZSByaWdodCB0aHJl YWRzLgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2 ZXIuY3BwCShyZXZpc2lvbiAyMDA0OTgpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw3ICs5Niw3IEBAIHZvaWQg UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWcKICAgICAgICAgcmV0dXJuOwogICAg IAogICAgIGF1dG8gdGFyZ2V0T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh0YXJnZXRV UkwpOwotICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBtX3N0b3JlLT5yZXNvdXJjZVN0YXRp c3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOworICAgIGF1dG8gdGFy Z2V0U3RhdGlzdGljcyA9IG1fc3RvcmUtPnJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21h aW4odGFyZ2V0UHJpbWFyeURvbWFpbik7CiAgICAgCiAgICAgaWYgKGlzTWFpbkZyYW1lKQogICAg ICAgICB0YXJnZXRTdGF0aXN0aWNzLnRvcEZyYW1lSGFzQmVlbk5hdmlnYXRlZFRvQmVmb3JlID0g dHJ1ZTsKQEAgLTE0Miw2ICsxNDIsNyBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dG cmFtZU5hdmlnCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBtX3N0b3JlLT5zZXRSZXNvdXJjZVN0 YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4sIHRhcmdldFN0YXRp c3RpY3MpOwogICAgIG1fc3RvcmUtPmZpcmVEYXRhTW9kaWZpY2F0aW9uSGFuZGxlcigpOwogfQog ICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0YXRpc3RpY3NT dG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHJldmlzaW9uIDIwMDQ5OCkKKysrIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC02Niw2ICs2NiwxMSBAQCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBSZXNvdXJjZUxvYWRTdGF0 CiAgICAgcmV0dXJuIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CiB9CiAKK3ZvaWQgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9t YWluKGNvbnN0IFN0cmluZyYgcHJpbWFyeURvbWFpbiwgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYm IHN0YXRpc3RpY3MpCit7CisgICAgbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuc2V0KHByaW1hcnlE b21haW4sIHN0YXRpc3RpY3MpOworfQorCiB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCBSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzPjo6S2V5VmFsdWVQYWlyVHlwZSBTdGF0aXN0aWNzVmFsdWU7CiAKIHN0 ZDo6dW5pcXVlX3B0cjxLZXllZEVuY29kZXI+IFJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6 Y3JlYXRlRW5jb2RlckZyb21EYXRhKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgJKHJldmlzaW9uIDIwMDQ5OCkKKysr IFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAkod29y a2luZyBjb3B5KQpAQCAtNTAsNiArNTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbGVhcigpIHsg bV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuY2xlYXIoKTsgfQogCiAgICAgUmVzb3VyY2VMb2FkU3Rh dGlzdGljcyYgcmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihjb25zdCBTdHJpbmcm KTsKKyAgICB2b2lkIHNldFJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4oY29uc3Qg U3RyaW5nJiwgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYmKTsKIAogICAgIGJvb2wgaXNQcmV2YWxl bnRSZXNvdXJjZShjb25zdCBTdHJpbmcmKSBjb25zdDsKICAgICAK 278232 2016-05-05 21:13:04 -0700 2016-05-06 08:43:57 -0700 Patch bug-157412-20160505211345.patch text/plain 3525 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDUwNSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA1LTA1ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIERvbid0IHVzZSBpbnZhbGlk YXRlZCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIGl0ZXJhdG9ycworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU3NDEyCisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS8yNjEzMzE1Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uIHdhcyB1c2lu ZyByZWZlcmVuY2VzIGJvdW5kIHRvIHRoZSAndmFsdWUnCisgICAgICAgIG1lbWJlciBvZiBpdGVy YXRvcnMgZnJvbSB0aGUgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyBIYXNoTWFwLiBXaGVuIG5ldyBl bnRyaWVzIHdlcmUKKyAgICAgICAgYWRkZWQsIHRoZXNlIGl0ZXJhdG9ycyB3ZXJlIGludmFsaWRh dGVkIGNhdXNpbmcgdGhlIHJlZmVyZW5jZXMgdG8gcmVmZXIgdG8gaW52YWxpZAorICAgICAgICBt ZW1vcnkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdhdGlvbik6 IFByb3RlY3QgYWdhaW5zdCBIYXNoTWFwCisgICAgICAgIGVsZW1lbnRzIGJlaW5nIGNvcGllZC9t b3ZlZCB3aGVuIG5ldyBpbnRyaWVzIGFyZSBhZGRlZC4KKyAgICAgICAgKiBsb2FkZXIvUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9h ZFN0YXRpc3RpY3NTdG9yZTo6c2V0UmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbik6 IEFkZGVkLgorICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaDoK KwogMjAxNi0wNS0wNSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAg ICAgTW9kZXJuIElEQiAoV29ya2Vycyk6IEdldCBldmVyeXRoaW5nIHRvIHRoZSByaWdodCB0aHJl YWRzLgpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2 ZXIuY3BwCShyZXZpc2lvbiAyMDA0OTgpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw3ICs5Niw3IEBAIHZvaWQg UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWcKICAgICAgICAgcmV0dXJuOwogICAg IAogICAgIGF1dG8gdGFyZ2V0T3JpZ2luID0gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh0YXJnZXRV UkwpOwotICAgIGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBtX3N0b3JlLT5yZXNvdXJjZVN0YXRp c3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOworICAgIGF1dG8gdGFy Z2V0U3RhdGlzdGljcyA9IG1fc3RvcmUtPnJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21h aW4odGFyZ2V0UHJpbWFyeURvbWFpbik7CiAgICAgCiAgICAgaWYgKGlzTWFpbkZyYW1lKQogICAg ICAgICB0YXJnZXRTdGF0aXN0aWNzLnRvcEZyYW1lSGFzQmVlbk5hdmlnYXRlZFRvQmVmb3JlID0g dHJ1ZTsKQEAgLTE0Miw2ICsxNDIsNyBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dG cmFtZU5hdmlnCiAgICAgICAgIH0KICAgICB9CiAKKyAgICBtX3N0b3JlLT5zZXRSZXNvdXJjZVN0 YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4sIFdURk1vdmUodGFy Z2V0U3RhdGlzdGljcykpOwogICAgIG1fc3RvcmUtPmZpcmVEYXRhTW9kaWZpY2F0aW9uSGFuZGxl cigpOwogfQogICAgIApJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZFN0 YXRpc3RpY3NTdG9yZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZS5jcHAJKHJldmlzaW9uIDIwMDQ5OCkKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02Niw2ICs2NiwxMSBAQCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzJiBSZXNvdXJj ZUxvYWRTdGF0CiAgICAgcmV0dXJuIGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWU7CiB9CiAKK3Zv aWQgUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpzZXRSZXNvdXJjZVN0YXRpc3RpY3NGb3JQ cmltYXJ5RG9tYWluKGNvbnN0IFN0cmluZyYgcHJpbWFyeURvbWFpbiwgUmVzb3VyY2VMb2FkU3Rh dGlzdGljcyYmIHN0YXRpc3RpY3MpCit7CisgICAgbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuc2V0 KHByaW1hcnlEb21haW4sIHN0YXRpc3RpY3MpOworfQorCiB0eXBlZGVmIEhhc2hNYXA8U3RyaW5n LCBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzPjo6S2V5VmFsdWVQYWlyVHlwZSBTdGF0aXN0aWNzVmFs dWU7CiAKIHN0ZDo6dW5pcXVlX3B0cjxLZXllZEVuY29kZXI+IFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6Y3JlYXRlRW5jb2RlckZyb21EYXRhKCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlLmgJKHJldmlzaW9uIDIw MDQ5OCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3Rv cmUuaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNiArNTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBj bGVhcigpIHsgbV9yZXNvdXJjZVN0YXRpc3RpY3NNYXAuY2xlYXIoKTsgfQogCiAgICAgUmVzb3Vy Y2VMb2FkU3RhdGlzdGljcyYgcmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJpbWFyeURvbWFpbihjb25z dCBTdHJpbmcmKTsKKyAgICB2b2lkIHNldFJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21h aW4oY29uc3QgU3RyaW5nJiwgUmVzb3VyY2VMb2FkU3RhdGlzdGljcyYmKTsKIAogICAgIGJvb2wg aXNQcmV2YWxlbnRSZXNvdXJjZShjb25zdCBTdHJpbmcmKSBjb25zdDsKICAgICAK