31309 2009-11-10 13:27:01 -0800 Avoid crashes in executeScript 2009-11-10 15:36:03 -0800 1 1 1 Unclassified WebKit WebKit wx 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 robin webkit-unassigned kevino oldest_to_newest 162192 0 42888 robin 2009-11-10 13:27:01 -0800 Created attachment 42888 runscript.patch This patch adds running of sanity checks before calling executeScript so that we'll assert or ignore the call rather than crash. 162254 1 kevino 2009-11-10 15:36:03 -0800 Landed in r50777, thanks! 42888 2009-11-10 13:27:01 -0800 2009-11-10 13:54:09 -0800 runscript.patch runscript.patch text/plain 2085 robin SW5kZXg6IFdlYktpdC93eC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3d4L0NoYW5n ZUxvZwkocmV2aXNpb24gNTA3NDgpCisrKyBXZWJLaXQvd3gvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMTEtMTAgIFJvYmluIER1bm4gIDxyb2JpbkBhbGxk dW5uLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBZGQgc2FuaXR5IGNoZWNrcyB0byBSdW5TY3JpcHQgdG8gZW5zdXJlIGl0IGRvZXNuJ3QgcnVu IHdoZW4gdGhlIGRvY3VtZW50IGhhc24ndCB5ZXQKKyAgICAgICAgbG9hZGVkIG5vciB3aGVuIEph dmFTY3JpcHQgaXMgZGlzYWJsZWQuCisKKyAgICAgICAgKiBXZWJGcmFtZS5jcHA6CisgICAgICAg ICh3eFdlYkZyYW1lOjpSdW5TY3JpcHQpOgorCiAyMDA5LTExLTA0ICBLZXZpbiBXYXR0ZXJzICA8 a2V2aW53YXR0ZXJzQGdtYWlsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZXZpbiBPbGxp dmllci4KSW5kZXg6IFdlYktpdC93eC9XZWJGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L3d4L1dlYkZyYW1lLmNwcAkocmV2aXNpb24gNTA3MzgpCisrKyBXZWJLaXQvd3gvV2ViRnJhbWUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODcsMTAgKzE4NywxOSBAQAogd3hTdHJpbmcgd3hXZWJG cmFtZTo6UnVuU2NyaXB0KGNvbnN0IHd4U3RyaW5nJiBqYXZhc2NyaXB0KQogewogICAgIHd4U3Ry aW5nIHJldHVyblZhbHVlID0gd3hFbXB0eVN0cmluZzsKLSAgICBpZiAobV9pbXBsLT5mcmFtZSkg ewotICAgICAgICBKU0M6OkpTVmFsdWUgcmVzdWx0ID0gbV9pbXBsLT5mcmFtZS0+c2NyaXB0KCkt PmV4ZWN1dGVTY3JpcHQoamF2YXNjcmlwdCwgdHJ1ZSkuanNWYWx1ZSgpOwotICAgICAgICBpZiAo cmVzdWx0KQotICAgICAgICAgICAgcmV0dXJuVmFsdWUgPSB3eFN0cmluZyhyZXN1bHQudG9TdHJp bmcobV9pbXBsLT5mcmFtZS0+c2NyaXB0KCktPmdsb2JhbE9iamVjdChXZWJDb3JlOjptYWluVGhy ZWFkTm9ybWFsV29ybGQoKSktPmdsb2JhbEV4ZWMoKSkuVVRGOFN0cmluZygpLmNfc3RyKCksIHd4 Q29udlVURjgpOyAgICAgICAgCisgICAgaWYgKG1faW1wbC0+ZnJhbWUgJiYgbV9pbXBsLT5mcmFt ZS0+bG9hZGVyKCkpIHsKKyAgICAgICAgYm9vbCBoYXNMb2FkZWQgPSBtX2ltcGwtPmZyYW1lLT5s b2FkZXIoKS0+ZnJhbWVIYXNMb2FkZWQoKTsKKyAgICAgICAgd3hBU1NFUlRfTVNHKGhhc0xvYWRl ZCwgd3hUKCJEb2N1bWVudCBtdXN0IGJlIGxvYWRlZCBiZWZvcmUgY2FsbGluZyBSdW5TY3JpcHQu IikpOworICAgICAgICBpZiAoaGFzTG9hZGVkKSB7CisgICAgICAgICAgICBXZWJDb3JlOjpTY3Jp cHRDb250cm9sbGVyKiBjb250cm9sbGVyID0gbV9pbXBsLT5mcmFtZS0+c2NyaXB0KCk7CisgICAg ICAgICAgICBib29sIGpzRW5hYmxlZCA9IGNvbnRyb2xsZXItPmlzRW5hYmxlZCgpOyAKKyAgICAg ICAgICAgIHd4QVNTRVJUX01TRyhqc0VuYWJsZWQsIHd4VCgiUnVuU2NyaXB0IHJlcXVpcmVzIEph dmFTY3JpcHQgdG8gYmUgZW5hYmxlZC4iKSk7CisgICAgICAgICAgICBpZiAoanNFbmFibGVkKSB7 CisgICAgICAgICAgICAgICAgSlNDOjpKU1ZhbHVlIHJlc3VsdCA9IGNvbnRyb2xsZXItPmV4ZWN1 dGVTY3JpcHQoamF2YXNjcmlwdCwgdHJ1ZSkuanNWYWx1ZSgpOworICAgICAgICAgICAgICAgIGlm IChyZXN1bHQpCisgICAgICAgICAgICAgICAgICAgIHJldHVyblZhbHVlID0gd3hTdHJpbmcocmVz dWx0LnRvU3RyaW5nKG1faW1wbC0+ZnJhbWUtPnNjcmlwdCgpLT5nbG9iYWxPYmplY3QoV2ViQ29y ZTo6bWFpblRocmVhZE5vcm1hbFdvcmxkKCkpLT5nbG9iYWxFeGVjKCkpLlVURjhTdHJpbmcoKS5j X3N0cigpLCB3eENvbnZVVEY4KTsgICAgICAgIAorICAgICAgICAgICAgfQorICAgICAgICB9CiAg ICAgfQogICAgIHJldHVybiByZXR1cm5WYWx1ZTsKIH0K