193985 2019-01-29 14:58:01 -0800 Make sure we have a frame before trying to access its loader 2019-01-29 17:42:56 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham achristensen bfulgham cdumez commit-queue dbates ddkilzer ews-watchlist japhet rniwa wilander oldest_to_newest 1499743 0 bfulgham 2019-01-29 14:58:01 -0800 Early seeding of iOS 12.2 showed some nullptr dereferences in 'ResourceLoadObserver::logUserInteractionWithReducedTimeResolution'. Code inspection and review of the backtraces reveal that the code attempts to access the frame's loader, even if the frame is a nullptr. We check for null frames in other uses of the document frame member, so should do so here as well. 1499744 1 bfulgham 2019-01-29 14:58:17 -0800 <rdar://problem/47618239> 1499756 2 360506 bfulgham 2019-01-29 15:16:59 -0800 Created attachment 360506 Patch 1499757 3 360506 wilander 2019-01-29 15:20:10 -0800 Comment on attachment 360506 Patch LGTM. 1499829 4 360506 commit-queue 2019-01-29 17:42:55 -0800 Comment on attachment 360506 Patch Clearing flags on attachment: 360506 Committed r240697: <https://trac.webkit.org/changeset/240697> 1499831 5 commit-queue 2019-01-29 17:42:56 -0800 All reviewed patches have been landed. Closing bug. 360506 2019-01-29 15:16:59 -0800 2019-01-29 17:42:55 -0800 Patch bug-193985-20190129151658.patch text/plain 2140 bfulgham U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNjc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjRjZDRkZjEzNDQwNjFk YzhkOTQ4NTc2MjBjMGFmZDNlYmU2OTUyNS4uMzU5MDNiNmI5ODQ5NmE5N2VhNGYxZmY4NDBhMmNi ZWQyMzA3NDk0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTAxLTI5ICBCcmVu dCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIE1ha2Ugc3VyZSB3ZSBo YXZlIGEgZnJhbWUgYmVmb3JlIHRyeWluZyB0byBhY2Nlc3MgaXRzIGxvYWRlciAKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5Mzk4NQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vNDc2MTgyMzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1VzZXJJbnRlcmFjdGlvbldp dGhSZWR1Y2VkVGltZVJlc29sdXRpb24pOgorCiAyMDE5LTAxLTI5ICBKdXN0aW4gRmFuICA8anVz dGluX2ZhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdQVV0gRml4IGFuZCBhZGQgdmFsaWRh dGlvbiB0byBXZWJHUFVSZW5kZXJQaXBlbGluZSBhbmQgTVRMVmVydGV4RGVzY3JpcHRvcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKaW5kZXggMDFk MzNkNmJlNDZiZTA2MWQyZDI3ZjEyZjBiNGRhOGYzMDM3Mjc3ZC4uYTM2MzE1NTAxNzAyMGM5Nzdm NWRlNTQ3YzVlOWI4MjE2YWRlMjllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCkBAIC0yMTQsMTEgKzIxNCwxMiBAQCB2b2lkIFJlc291cmNl TG9hZE9ic2VydmVyOjpsb2dVc2VySW50ZXJhY3Rpb25XaXRoUmVkdWNlZFRpbWVSZXNvbHV0aW9u KGNvbnN0IERvYwogICAgIHN0YXRpc3RpY3MubW9zdFJlY2VudFVzZXJJbnRlcmFjdGlvblRpbWUg PSBuZXdUaW1lOwogCiAjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykKLSAgICBp ZiAoYXV0byogb3BlbmVyID0gZG9jdW1lbnQuZnJhbWUoKS0+bG9hZGVyKCkub3BlbmVyKCkpIHsK LSAgICAgICAgaWYgKGF1dG8qIG9wZW5lckRvY3VtZW50ID0gb3BlbmVyLT5kb2N1bWVudCgpKSB7 Ci0gICAgICAgICAgICBpZiAoYXV0byogb3BlbmVyRnJhbWUgPSBvcGVuZXJEb2N1bWVudC0+ZnJh bWUoKSkgewotICAgICAgICAgICAgICAgIGlmIChhdXRvIG9wZW5lclBhZ2VJRCA9IG9wZW5lckZy YW1lLT5sb2FkZXIoKS5jbGllbnQoKS5wYWdlSUQoKSkgewotICAgICAgICAgICAgICAgICAgICBy ZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKGRvbWFpbiwgb3BlbmVyUGFnZUlELnZhbHVl KCksICpvcGVuZXJEb2N1bWVudCk7CisgICAgaWYgKGF1dG8qIGZyYW1lID0gZG9jdW1lbnQuZnJh bWUoKSkgeworICAgICAgICBpZiAoYXV0byogb3BlbmVyID0gZnJhbWUtPmxvYWRlcigpLm9wZW5l cigpKSB7CisgICAgICAgICAgICBpZiAoYXV0byogb3BlbmVyRG9jdW1lbnQgPSBvcGVuZXItPmRv Y3VtZW50KCkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byogb3BlbmVyRnJhbWUgPSBvcGVu ZXJEb2N1bWVudC0+ZnJhbWUoKSkgeworICAgICAgICAgICAgICAgICAgICBpZiAoYXV0byBvcGVu ZXJQYWdlSUQgPSBvcGVuZXJGcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkucGFnZUlEKCkpCisgICAg ICAgICAgICAgICAgICAgICAgICByZXF1ZXN0U3RvcmFnZUFjY2Vzc1VuZGVyT3BlbmVyKGRvbWFp biwgb3BlbmVyUGFnZUlELnZhbHVlKCksICpvcGVuZXJEb2N1bWVudCk7CiAgICAgICAgICAgICAg ICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9Cg==