180157 2017-11-29 11:41:17 -0800 Make WebFrameLoaderClient more robust against null pointer dereferencing 2017-11-29 13:43:21 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1375938 0 achristensen 2017-11-29 11:41:17 -0800 Make WebFrameLoaderClient more robust against null pointer dereferencing 1375948 1 327880 achristensen 2017-11-29 11:43:48 -0800 Created attachment 327880 Patch 1376002 2 327880 thorton 2017-11-29 13:36:45 -0800 Comment on attachment 327880 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=327880&action=review > Source/WebKit/ChangeLog:14 > + (WebKit::WebFrame::page const): Should probably mention why you think this got worse here. 1376008 3 achristensen 2017-11-29 13:42:14 -0800 http://trac.webkit.org/r225292 1376009 4 webkit-bug-importer 2017-11-29 13:43:21 -0800 <rdar://problem/35756212> 327880 2017-11-29 11:43:48 -0800 2017-11-29 13:36:45 -0800 Patch bug-180157-20171129114347.patch text/plain 5498 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjUyODIpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE3LTExLTI5ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBXZWJGcmFt ZUxvYWRlckNsaWVudCBtb3JlIHJvYnVzdCBhZ2FpbnN0IG51bGwgcG9pbnRlciBkZXJlZmVyZW5j aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODAx NTcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM0ODk1NjE2PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lTG9h ZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvclJlc3BvbnNlKToKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3V2lu ZG93QWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3Bh dGNoRGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgICogV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OnBhZ2Ug Y29uc3QpOgorCiAyMDE3LTExLTI5ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgZW5zdXJlKkNvbm5lY3Rpb24oKSBtZXRob2RzIG9uIFdlYlByb2Nlc3Mgc2hvdWxk IHJldHVybiBhIHJlZmVyZW5jZQpJbmRleDogU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3Bw CShyZXZpc2lvbiAyMjUxODEpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1 cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTIsNyAr NjkyLDcgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hTaG93KAogCiB2b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkZVBvbGljeUZvclJlc3BvbnNlKGNv bnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QsIEZyYW1lUG9saWN5RnVuY3Rpb24mJiBmdW5jdGlvbikKIHsKLSAgICBXZWJQYWdlKiB3 ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgpOworICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1l ID8gbV9mcmFtZS0+cGFnZSgpIDogbnVsbHB0cjsKICAgICBpZiAoIXdlYlBhZ2UpIHsKICAgICAg ICAgZnVuY3Rpb24oUG9saWN5QWN0aW9uOjpJZ25vcmUpOwogICAgICAgICByZXR1cm47CkBAIC03 MjEsNiArNzIxLDggQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZAog CiAgICAgUmVmPFdlYkZyYW1lPiBwcm90ZWN0KCptX2ZyYW1lKTsKICAgICBXZWJDb3JlOjpGcmFt ZSogY29yZUZyYW1lID0gbV9mcmFtZS0+Y29yZUZyYW1lKCk7CisgICAgaWYgKCFjb3JlRnJhbWUp CisgICAgICAgIHJldHVybiBmdW5jdGlvbihQb2xpY3lBY3Rpb246Oklnbm9yZSk7CiAgICAgYXV0 byBuYXZpZ2F0aW9uSUQgPSBzdGF0aWNfY2FzdDxXZWJEb2N1bWVudExvYWRlciY+KCpjb3JlRnJh bWUtPmxvYWRlcigpLnByb3Zpc2lvbmFsRG9jdW1lbnRMb2FkZXIoKSkubmF2aWdhdGlvbklEKCk7 CiAgICAgaWYgKCF3ZWJQYWdlLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpEZWNp ZGVQb2xpY3lGb3JSZXNwb25zZVN5bmMobV9mcmFtZS0+ZnJhbWVJRCgpLCBTZWN1cml0eU9yaWdp bkRhdGE6OmZyb21GcmFtZShjb3JlRnJhbWUpLCBuYXZpZ2F0aW9uSUQsIHJlc3BvbnNlLCByZXF1 ZXN0LCBjYW5TaG93TUlNRVR5cGUsIGxpc3RlbmVySUQsIFVzZXJEYXRhKFdlYlByb2Nlc3M6OnNp bmdsZXRvbigpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEuZ2V0KCkpLmdldCgp KSksIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRlY2lkZVBvbGljeUZvclJlc3BvbnNlU3luYzo6 UmVwbHkocmVjZWl2ZWRQb2xpY3lBY3Rpb24sIHBvbGljeUFjdGlvbiwgZG93bmxvYWRJRCksIFNl Y29uZHM6OmluZmluaXR5KCksIElQQzo6U2VuZFN5bmNPcHRpb246OkluZm9ybVBsYXRmb3JtUHJv Y2Vzc1dpbGxTdXNwZW5kKSkgewogICAgICAgICBtX2ZyYW1lLT5kaWRSZWNlaXZlUG9saWN5RGVj aXNpb24obGlzdGVuZXJJRCwgUG9saWN5QWN0aW9uOjpJZ25vcmUsIDAsIHsgfSwgeyB9KTsKQEAg LTczNCw3ICs3MzYsNyBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lk CiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGVjaWRlUG9saWN5Rm9yTmV3 V2luZG93QWN0aW9uKGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIG5hdmlnYXRpb25BY3Rpb24sIGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIGNvbnN0 IFN0cmluZyYgZnJhbWVOYW1lLCBGcmFtZVBvbGljeUZ1bmN0aW9uJiYgZnVuY3Rpb24pCiB7Ci0g ICAgV2ViUGFnZSogd2ViUGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKKyAgICBXZWJQYWdlKiB3ZWJQ YWdlID0gbV9mcmFtZSA/IG1fZnJhbWUtPnBhZ2UoKSA6IG51bGxwdHI7CiAgICAgaWYgKCF3ZWJQ YWdlKSB7CiAgICAgICAgIGZ1bmN0aW9uKFBvbGljeUFjdGlvbjo6SWdub3JlKTsKICAgICAgICAg cmV0dXJuOwpAQCAtODIxLDcgKzgyMyw3IEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmFw cGx5VG9Eb2N1bWUKIAogdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hEZWNpZGVQ b2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKGNvbnN0IE5hdmlnYXRpb25BY3Rpb24mIG5hdmlnYXRp b25BY3Rpb24sIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgYm9vbCBkaWRSZWNlaXZl UmVkaXJlY3RSZXNwb25zZSwgRm9ybVN0YXRlKiBmb3JtU3RhdGUsIEZyYW1lUG9saWN5RnVuY3Rp b24mJiBmdW5jdGlvbikKIHsKLSAgICBXZWJQYWdlKiB3ZWJQYWdlID0gbV9mcmFtZS0+cGFnZSgp OworICAgIFdlYlBhZ2UqIHdlYlBhZ2UgPSBtX2ZyYW1lID8gbV9mcmFtZS0+cGFnZSgpIDogbnVs bHB0cjsKICAgICBpZiAoIXdlYlBhZ2UpIHsKICAgICAgICAgZnVuY3Rpb24oUG9saWN5QWN0aW9u OjpJZ25vcmUpOwogICAgICAgICByZXR1cm47CkBAIC04MzUsMTAgKzgzNywxMCBAQCB2b2lkIFdl YkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lkCiAKICAgICBSZWZQdHI8QVBJOjpPYmpl Y3Q+IHVzZXJEYXRhOwogCi0gICAgUmVmUHRyPEluamVjdGVkQnVuZGxlTmF2aWdhdGlvbkFjdGlv bj4gYWN0aW9uID0gSW5qZWN0ZWRCdW5kbGVOYXZpZ2F0aW9uQWN0aW9uOjpjcmVhdGUobV9mcmFt ZSwgbmF2aWdhdGlvbkFjdGlvbiwgZm9ybVN0YXRlKTsKKyAgICBSZWY8SW5qZWN0ZWRCdW5kbGVO YXZpZ2F0aW9uQWN0aW9uPiBhY3Rpb24gPSBJbmplY3RlZEJ1bmRsZU5hdmlnYXRpb25BY3Rpb246 OmNyZWF0ZShtX2ZyYW1lLCBuYXZpZ2F0aW9uQWN0aW9uLCBmb3JtU3RhdGUpOwogCiAgICAgLy8g Tm90aWZ5IHRoZSBidW5kbGUgY2xpZW50LgotICAgIFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvbiBw b2xpY3kgPSB3ZWJQYWdlLT5pbmplY3RlZEJ1bmRsZVBvbGljeUNsaWVudCgpLmRlY2lkZVBvbGlj eUZvck5hdmlnYXRpb25BY3Rpb24od2ViUGFnZSwgbV9mcmFtZSwgYWN0aW9uLmdldCgpLCByZXF1 ZXN0LCB1c2VyRGF0YSk7CisgICAgV0tCdW5kbGVQYWdlUG9saWN5QWN0aW9uIHBvbGljeSA9IHdl YlBhZ2UtPmluamVjdGVkQnVuZGxlUG9saWN5Q2xpZW50KCkuZGVjaWRlUG9saWN5Rm9yTmF2aWdh dGlvbkFjdGlvbih3ZWJQYWdlLCBtX2ZyYW1lLCBhY3Rpb24ucHRyKCksIHJlcXVlc3QsIHVzZXJE YXRhKTsKICAgICBpZiAocG9saWN5ID09IFdLQnVuZGxlUGFnZVBvbGljeUFjdGlvblVzZSkgewog ICAgICAgICBmdW5jdGlvbihQb2xpY3lBY3Rpb246OlVzZSk7CiAgICAgICAgIHJldHVybjsKQEAg LTg3NCw2ICs4NzYsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaERlY2lk CiAgICAgbmF2aWdhdGlvbkFjdGlvbkRhdGEuaXNSZWRpcmVjdCA9IGRpZFJlY2VpdmVSZWRpcmVj dFJlc3BvbnNlOwogCiAgICAgV2ViQ29yZTo6RnJhbWUqIGNvcmVGcmFtZSA9IG1fZnJhbWUtPmNv cmVGcmFtZSgpOworICAgIGlmICghY29yZUZyYW1lKQorICAgICAgICByZXR1cm4gZnVuY3Rpb24o UG9saWN5QWN0aW9uOjpJZ25vcmUpOwogICAgIFdlYkRvY3VtZW50TG9hZGVyKiBkb2N1bWVudExv YWRlciA9IHN0YXRpY19jYXN0PFdlYkRvY3VtZW50TG9hZGVyKj4oY29yZUZyYW1lLT5sb2FkZXIo KS5wb2xpY3lEb2N1bWVudExvYWRlcigpKTsKICAgICBpZiAoIWRvY3VtZW50TG9hZGVyKSB7CiAg ICAgICAgIC8vIEZJWE1FOiBXaGVuIHdlIHJlY2VpdmUgYSByZWRpcmVjdCBhZnRlciB0aGUgbmF2 aWdhdGlvbiBwb2xpY3kgaGFzIGJlZW4gZGVjaWRlZCBmb3IgdGhlIGluaXRpYWwgcmVxdWVzdCwK SW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkZyYW1lLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAJ KHJldmlzaW9uIDIyNTE4MSkKKysrIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YkZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcxLDE0ICsxNzEsMTQgQEAgV2ViRnJhbWU6 On5XZWJGcmFtZSgpCiB9CiAKIFdlYlBhZ2UqIFdlYkZyYW1lOjpwYWdlKCkgY29uc3QKLXsgCit7 CiAgICAgaWYgKCFtX2NvcmVGcmFtZSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogICAgIAogICAgIGlmIChQYWdlKiBwYWdlID0gbV9jb3JlRnJhbWUtPnBhZ2Uo KSkKICAgICAgICAgcmV0dXJuIFdlYlBhZ2U6OmZyb21Db3JlUGFnZShwYWdlKTsKIAotICAgIHJl dHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBXZWJGcmFtZSogV2ViRnJhbWU6OmZy b21Db3JlRnJhbWUoRnJhbWUmIGZyYW1lKQo=