213923 2020-07-03 05:55:34 -0700 [JSC] Add exception checks before and after viewWithUnderlyingString 2020-07-03 13:06:56 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki ysuzuki ews-watchlist keith_miller mark.lam msaboff saam sam tzagallo webkit-bug-importer oldest_to_newest 1668541 0 ysuzuki 2020-07-03 05:55:34 -0700 [JSC] Add exception checks before and after viewWithUnderlyingString 1668542 1 403454 ysuzuki 2020-07-03 05:56:45 -0700 Created attachment 403454 Patch 1668543 2 ysuzuki 2020-07-03 05:56:47 -0700 <rdar://problem/65068473> 1668619 3 ysuzuki 2020-07-03 12:52:03 -0700 Win EWS is getting bad state (early failure without this patch) 1668627 4 ews-feeder 2020-07-03 13:06:55 -0700 Committed r263905: <https://trac.webkit.org/changeset/263905> All reviewed patches have been landed. Closing bug and clearing flags on attachment 403454. 403454 2020-07-03 05:56:45 -0700 2020-07-03 13:06:55 -0700 Patch bug-213923-20200703055644.patch text/plain 11968 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzODkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ODI3ZjRiMjc2ZGEyNTA0YTY3MjE1YzRmYzdlNmViZjliYzcwYTI3Li42ZjExYmI4MDdkMDE1MGJi YWZjMjQ3OThmNjY3Yjg4NWM5MmFmOGIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNiBAQAorMjAyMC0wNy0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29t PgorCisgICAgICAgIFtKU0NdIEFkZCBleGNlcHRpb24gY2hlY2tzIGJlZm9yZSBhbmQgYWZ0ZXIg dmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTM5MjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY1MDY4NDcz PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cGF0Y2ggaW5zZXJ0cyBtaXNzaW5nIGV4Y2VwdGlvbiBjaGVja3MgYmVmb3JlIGFuZCBhZnRlciB2 aWV3V2l0aFVuZGVybHlpbmdTdHJpbmcuCisKKyAgICAgICAgKiBqc2MuY3BwOgorICAgICAgICAo cHJpbnRJbnRlcm5hbCk6CisgICAgICAgIChmdW5jdGlvbkRlYnVnKToKKyAgICAgICAgKiBydW50 aW1lL0Z1bmN0aW9uQ29uc3RydWN0b3IuY3BwOgorICAgICAgICAoSlNDOjpjb25zdHJ1Y3RGdW5j dGlvblNraXBwaW5nRXZhbEVuYWJsZWRDaGVjayk6CisgICAgICAgICogcnVudGltZS9KU0dsb2Jh bE9iamVjdEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChKU0M6Omdsb2JhbEZ1bmNQYXJzZUZsb2F0 KToKKyAgICAgICAgKiBydW50aW1lL0pTT05PYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpKU09O UHJvdG9GdW5jUGFyc2UpOgorICAgICAgICAqIHJ1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcDoK KyAgICAgICAgKEpTQzo6c3RyaW5nUHJvdG9GdW5jQ2hhckF0KToKKyAgICAgICAgKEpTQzo6c3Ry aW5nUHJvdG9GdW5jQ2hhckNvZGVBdCk6CisKIDIwMjAtMDctMDMgIFl1c3VrZSBTdXp1a2kgIDx5 c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBBZGQgZXhjZXB0aW9uIGNoZWNrcyBp biBKU1N0cmluZ0J1aWxkZXIgYW5kIEFycmF5I2pvaW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qc2MuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKaW5kZXgg NGViNWY0MTJlMmVhYzlkMDNiNGNlMzRhOTYxOTJjZDIwYjdiNTkyYS4uNzc0YzBiMGJkYTUwOWEx NjMyNDFhMzc2OWQ4OGQ1OGUwODlkY2QxOSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2pzYy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2pzYy5jcHAKQEAgLTEyMzEs MTAgKzEyMzEsMTIgQEAgc3RhdGljIEVuY29kZWRKU1ZhbHVlIHByaW50SW50ZXJuYWwoSlNHbG9i YWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ2FsbEZyYW1lKiBjYWwKICAgICAgICAgICAgIGlmIChF T0YgPT0gZnB1dGMoJyAnLCBvdXQpKQogICAgICAgICAgICAgICAgIGdvdG8gZmFpbDsKIAotICAg ICAgICBhdXRvIHZpZXdXaXRoU3RyaW5nID0gY2FsbEZyYW1lLT51bmNoZWNrZWRBcmd1bWVudChp KS50b1N0cmluZyhnbG9iYWxPYmplY3QpLT52aWV3V2l0aFVuZGVybHlpbmdTdHJpbmcoZ2xvYmFs T2JqZWN0KTsKLSAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFs dWUoKSk7CisgICAgICAgIGF1dG8qIGpzU3RyaW5nID0gY2FsbEZyYW1lLT51bmNoZWNrZWRBcmd1 bWVudChpKS50b1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHNjb3BlLCB7IH0pOworICAgICAgICBhdXRvIHZpZXdXaXRoU3RyaW5nID0ganNTdHJpbmct PnZpZXdXaXRoVW5kZXJseWluZ1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgICAgICBSRVRVUk5f SUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgICAgICBhdXRvIHN0cmluZyA9IGNTdHJpbmdG cm9tVmlld1dpdGhTdHJpbmcoZ2xvYmFsT2JqZWN0LCBzY29wZSwgdmlld1dpdGhTdHJpbmcpOwot ICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKKyAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICAgICAgZndyaXRlKHN0 cmluZy5kYXRhKCksIHNpemVvZihjaGFyKSwgc3RyaW5nLmxlbmd0aCgpLCBvdXQpOwogICAgICAg ICBpZiAoZmVycm9yKG91dCkpCiAgICAgICAgICAgICBnb3RvIGZhaWw7CkBAIC0xMjUzLDEwICsx MjU1LDEyIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZnVuY3Rpb25EZWJ1ZyhKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxsRnJhCiB7CiAgICAgVk0mIHZtID0gZ2xvYmFs T2JqZWN0LT52bSgpOwogICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsK LSAgICBhdXRvIHZpZXdXaXRoU3RyaW5nID0gY2FsbEZyYW1lLT5hcmd1bWVudCgwKS50b1N0cmlu ZyhnbG9iYWxPYmplY3QpLT52aWV3V2l0aFVuZGVybHlpbmdTdHJpbmcoZ2xvYmFsT2JqZWN0KTsK LSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKKyAgICBh dXRvKiBqc1N0cmluZyA9IGNhbGxGcmFtZS0+YXJndW1lbnQoMCkudG9TdHJpbmcoZ2xvYmFsT2Jq ZWN0KTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAgIGF1dG8gdmll d1dpdGhTdHJpbmcgPSBqc1N0cmluZy0+dmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nKGdsb2JhbE9i amVjdCk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKICAgICBhdXRvIHN0 cmluZyA9IGNTdHJpbmdGcm9tVmlld1dpdGhTdHJpbmcoZ2xvYmFsT2JqZWN0LCBzY29wZSwgdmll d1dpdGhTdHJpbmcpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1Zh bHVlKCkpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7CiAgICAgZnB1dHMo Ii0tPiAiLCBzdGRlcnIpOwogICAgIGZ3cml0ZShzdHJpbmcuZGF0YSgpLCBzaXplb2YoY2hhciks IHN0cmluZy5sZW5ndGgoKSwgc3RkZXJyKTsKICAgICBmcHV0YygnXG4nLCBzdGRlcnIpOwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRnVuY3Rpb25Db25zdHJ1Y3Rv ci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkNvbnN0cnVjdG9y LmNwcAppbmRleCA2OWYxNmFlYzkwNzNlMTkzYjFkOTA5YjAwOTRjMzQ4MmU5ZDM3OThhLi4xMjYx NGRlZGEzOTU2YmE0NGYyMDgyOWRkZDQ5MDZmMGI0ZjI3ZjhjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkNvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5jdGlvbkNvbnN0cnVjdG9yLmNwcApAQCAtMTE3 LDExICsxMTcsMTUgQEAgSlNPYmplY3QqIGNvbnN0cnVjdEZ1bmN0aW9uU2tpcHBpbmdFdmFsRW5h YmxlZENoZWNrKAogICAgICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXIoU3RyaW5nQnVpbGRlcjo6 T3ZlcmZsb3dIYW5kbGVyOjpSZWNvcmRPdmVyZmxvdyk7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5k KHByZWZpeCwgZnVuY3Rpb25OYW1lLnN0cmluZygpLCAnKCcpOwogCi0gICAgICAgIGF1dG8gdmll d1dpdGhTdHJpbmcgPSBhcmdzLmF0KDApLnRvU3RyaW5nKGdsb2JhbE9iamVjdCktPnZpZXdXaXRo VW5kZXJseWluZ1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgICAgICBhdXRvKiBqc1N0cmluZyA9 IGFyZ3MuYXQoMCkudG9TdHJpbmcoZ2xvYmFsT2JqZWN0KTsKKyAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTihzY29wZSwgbnVsbHB0cik7CisgICAgICAgIGF1dG8gdmlld1dpdGhTdHJpbmcgPSBq c1N0cmluZy0+dmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nKGdsb2JhbE9iamVjdCk7CiAgICAgICAg IFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIG51bGxwdHIpOwogICAgICAgICBidWlsZGVyLmFw cGVuZCh2aWV3V2l0aFN0cmluZy52aWV3KTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDE7ICFi dWlsZGVyLmhhc092ZXJmbG93ZWQoKSAmJiBpIDwgYXJncy5zaXplKCkgLSAxOyBpKyspIHsKLSAg ICAgICAgICAgIGF1dG8gdmlld1dpdGhTdHJpbmcgPSBhcmdzLmF0KGkpLnRvU3RyaW5nKGdsb2Jh bE9iamVjdCktPnZpZXdXaXRoVW5kZXJseWluZ1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgICAg ICAgICAgYXV0byoganNTdHJpbmcgPSBhcmdzLmF0KGkpLnRvU3RyaW5nKGdsb2JhbE9iamVjdCk7 CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKKyAgICAg ICAgICAgIGF1dG8gdmlld1dpdGhTdHJpbmcgPSBqc1N0cmluZy0+dmlld1dpdGhVbmRlcmx5aW5n U3RyaW5nKGdsb2JhbE9iamVjdCk7CiAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBudWxscHRyKTsKICAgICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIsICIsIHZpZXdXaXRo U3RyaW5nLnZpZXcpOwogICAgICAgICB9CkBAIC0xMzIsNyArMTM2LDkgQEAgSlNPYmplY3QqIGNv bnN0cnVjdEZ1bmN0aW9uU2tpcHBpbmdFdmFsRW5hYmxlZENoZWNrKAogCiAgICAgICAgIGZ1bmN0 aW9uQ29uc3RydWN0b3JQYXJhbWV0ZXJzRW5kUG9zaXRpb24gPSBidWlsZGVyLmxlbmd0aCgpICsg MTsKIAotICAgICAgICBhdXRvIGJvZHkgPSBhcmdzLmF0KGFyZ3Muc2l6ZSgpIC0gMSkudG9TdHJp bmcoZ2xvYmFsT2JqZWN0KS0+dmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nKGdsb2JhbE9iamVjdCk7 CisgICAgICAgIGF1dG8qIGJvZHlTdHJpbmcgPSBhcmdzLmF0KGFyZ3Muc2l6ZSgpIC0gMSkudG9T dHJpbmcoZ2xvYmFsT2JqZWN0KTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg bnVsbHB0cik7CisgICAgICAgIGF1dG8gYm9keSA9IGJvZHlTdHJpbmctPnZpZXdXaXRoVW5kZXJs eWluZ1N0cmluZyhnbG9iYWxPYmplY3QpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCBudWxscHRyKTsKICAgICAgICAgYnVpbGRlci5hcHBlbmQoIikge1xuIiwgYm9keS52aWV3 LCAiXG59Iik7CiAgICAgICAgIGlmIChVTkxJS0VMWShidWlsZGVyLmhhc092ZXJmbG93ZWQoKSkp IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFsT2Jq ZWN0RnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTR2xvYmFs T2JqZWN0RnVuY3Rpb25zLmNwcAppbmRleCBlYTI1ZThiODk0NjljNjllN2YxMWJjYzBhMDMxYWU0 NzNiMTY5ODFiLi40MjRlMTUxYWFlYmQyOTQzNTIxOTRlNTRhNTc5YTNmMTJjNzhhYWYyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdEZ1bmN0 aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmpl Y3RGdW5jdGlvbnMuY3BwCkBAIC01MjcsNyArNTI3LDEzIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwgZ2xvYmFsRnVuY1BhcnNlSW50KEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3Qs IENhCiAKIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgZ2xvYmFsRnVuY1BhcnNlRmxvYXQo SlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ2FsbEZyYW1lKiBjYWxsRnJhbWUpCiB7Ci0g ICAgYXV0byB2aWV3V2l0aFN0cmluZyA9IGNhbGxGcmFtZS0+YXJndW1lbnQoMCkudG9TdHJpbmco Z2xvYmFsT2JqZWN0KS0+dmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nKGdsb2JhbE9iamVjdCk7Cisg ICAgVk0mIHZtID0gZ2xvYmFsT2JqZWN0LT52bSgpOworICAgIGF1dG8gc2NvcGUgPSBERUNMQVJF X1RIUk9XX1NDT1BFKHZtKTsKKworICAgIGF1dG8qIGpzU3RyaW5nID0gY2FsbEZyYW1lLT5hcmd1 bWVudCgwKS50b1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04o c2NvcGUsIHsgfSk7CisgICAgYXV0byB2aWV3V2l0aFN0cmluZyA9IGpzU3RyaW5nLT52aWV3V2l0 aFVuZGVybHlpbmdTdHJpbmcoZ2xvYmFsT2JqZWN0KTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCB7IH0pOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNOdW1iZXIocGFyc2VG bG9hdCh2aWV3V2l0aFN0cmluZy52aWV3KSkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU09OT2JqZWN0LmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0pTT05PYmplY3QuY3BwCmluZGV4IDc4MTY4OGQ0OWNjNzcyZTU3NDAyZTQ1ODhk YjczNjM1MDBmMTA3ZmIuLmU5ZmFhOGMzOGNmMTJjNjc4YWI2OTc1NGQ0OTI1OTlhMDJlZjVkNTQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT05PYmplY3QuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT05PYmplY3QuY3BwCkBAIC03 ODcsNyArNzg3LDkgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBKU09OUHJvdG9GdW5j UGFyc2UoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgQ2EKIHsKICAgICBWTSYgdm0gPSBn bG9iYWxPYmplY3QtPnZtKCk7CiAgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUo dm0pOwotICAgIGF1dG8gdmlld1dpdGhTdHJpbmcgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDApLnRv U3RyaW5nKGdsb2JhbE9iamVjdCktPnZpZXdXaXRoVW5kZXJseWluZ1N0cmluZyhnbG9iYWxPYmpl Y3QpOworICAgIGF1dG8qIHN0cmluZyA9IGNhbGxGcmFtZS0+YXJndW1lbnQoMCkudG9TdHJpbmco Z2xvYmFsT2JqZWN0KTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOworICAg IGF1dG8gdmlld1dpdGhTdHJpbmcgPSBzdHJpbmctPnZpZXdXaXRoVW5kZXJseWluZ1N0cmluZyhn bG9iYWxPYmplY3QpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7CiAgICAg U3RyaW5nVmlldyB2aWV3ID0gdmlld1dpdGhTdHJpbmcudmlldzsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RyaW5nUHJvdG90eXBlLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cmluZ1Byb3RvdHlwZS5jcHAKaW5kZXggOTkyNDZiNzVk OThkZGQ5NzJlYWI2MDZjMmU1Y2U2NWFmZTAxOTAwMS4uMzZkNGI3OWY3ZGE1YWNmMzYyMTAwMWFh NmI2M2ZkYzBmYjBlOGY5OCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvU3RyaW5nUHJvdG90eXBlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGlt ZS9TdHJpbmdQcm90b3R5cGUuY3BwCkBAIC05NzksMTAgKzk3OSwxMSBAQCBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY0NoYXJBdChKU0dsb2JhbE9iamVjdCogZ2xv YmFsT2JqZWN0LAogICAgIEpTVmFsdWUgdGhpc1ZhbHVlID0gY2FsbEZyYW1lLT50aGlzVmFsdWUo KTsKICAgICBpZiAoIWNoZWNrT2JqZWN0Q29lcmNpYmxlKHRoaXNWYWx1ZSkpCiAgICAgICAgIHJl dHVybiB0aHJvd1ZNVHlwZUVycm9yKGdsb2JhbE9iamVjdCwgc2NvcGUpOwotICAgIGF1dG8gdmll d1dpdGhTdHJpbmcgPSB0aGlzVmFsdWUudG9TdHJpbmcoZ2xvYmFsT2JqZWN0KS0+dmlld1dpdGhV bmRlcmx5aW5nU3RyaW5nKGdsb2JhbE9iamVjdCk7Ci0gICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgYXV0byogdGhpc1N0cmluZyA9IHRoaXNWYWx1 ZS50b1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUs IHsgfSk7CisgICAgYXV0byB2aWV3V2l0aFN0cmluZyA9IHRoaXNTdHJpbmctPnZpZXdXaXRoVW5k ZXJseWluZ1N0cmluZyhnbG9iYWxPYmplY3QpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIHsgfSk7CiAgICAgU3RyaW5nVmlldyB2aWV3ID0gdmlld1dpdGhTdHJpbmcudmlldzsKLSAg ICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKICAgICBKU1Zh bHVlIGEwID0gY2FsbEZyYW1lLT5hcmd1bWVudCgwKTsKICAgICBpZiAoYTAuaXNVSW50MzIoKSkg ewogICAgICAgICB1aW50MzJfdCBpID0gYTAuYXNVSW50MzIoKTsKQEAgLTk5MSw3ICs5OTIsNyBA QCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1Byb3RvRnVuY0NoYXJBdChKU0ds b2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LAogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2Rl KGpzRW1wdHlTdHJpbmcodm0pKTsKICAgICB9CiAgICAgZG91YmxlIGRwb3MgPSBhMC50b0ludGVn ZXIoZ2xvYmFsT2JqZWN0KTsKLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVk SlNWYWx1ZSgpKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB7IH0pOwogICAgIGlm IChkcG9zID49IDAgJiYgZHBvcyA8IHZpZXcubGVuZ3RoKCkpCiAgICAgICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoanNTaW5nbGVDaGFyYWN0ZXJTdHJpbmcodm0sIHZpZXdbc3RhdGljX2Nhc3Q8 dW5zaWduZWQ+KGRwb3MpXSkpOwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNFbXB0eVN0 cmluZyh2bSkpOwpAQCAtMTAwNSw4ICsxMDA2LDEwIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgc3RyaW5nUHJvdG9GdW5jQ2hhckNvZGVBdChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2Jq CiAgICAgSlNWYWx1ZSB0aGlzVmFsdWUgPSBjYWxsRnJhbWUtPnRoaXNWYWx1ZSgpOwogICAgIGlm ICghY2hlY2tPYmplY3RDb2VyY2libGUodGhpc1ZhbHVlKSkKICAgICAgICAgcmV0dXJuIHRocm93 Vk1UeXBlRXJyb3IoZ2xvYmFsT2JqZWN0LCBzY29wZSk7Ci0gICAgYXV0byB2aWV3V2l0aFN0cmlu ZyA9IHRoaXNWYWx1ZS50b1N0cmluZyhnbG9iYWxPYmplY3QpLT52aWV3V2l0aFVuZGVybHlpbmdT dHJpbmcoZ2xvYmFsT2JqZWN0KTsKLSAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNv ZGVkSlNWYWx1ZSgpKTsKKyAgICBhdXRvKiB0aGlzU3RyaW5nID0gdGhpc1ZhbHVlLnRvU3RyaW5n KGdsb2JhbE9iamVjdCk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsKKyAg ICBhdXRvIHZpZXdXaXRoU3RyaW5nID0gdGhpc1N0cmluZy0+dmlld1dpdGhVbmRlcmx5aW5nU3Ry aW5nKGdsb2JhbE9iamVjdCk7CisgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgeyB9KTsK ICAgICBTdHJpbmdWaWV3IHZpZXcgPSB2aWV3V2l0aFN0cmluZy52aWV3OwogICAgIEpTVmFsdWUg YTAgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDApOwogICAgIGlmIChhMC5pc1VJbnQzMigpKSB7CkBA IC0xMDE2LDcgKzEwMTksNyBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIHN0cmluZ1By b3RvRnVuY0NoYXJDb2RlQXQoSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iagogICAgICAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzTmFOKCkpOwogICAgIH0KICAgICBkb3VibGUgZHBvcyA9IGEw LnRvSW50ZWdlcihnbG9iYWxPYmplY3QpOwotICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUs IGVuY29kZWRKU1ZhbHVlKCkpOworICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHsgfSk7 CiAgICAgaWYgKGRwb3MgPj0gMCAmJiBkcG9zIDwgdmlldy5sZW5ndGgoKSkKICAgICAgICAgcmV0 dXJuIEpTVmFsdWU6OmVuY29kZShqc051bWJlcih2aWV3W3N0YXRpY19jYXN0PGludD4oZHBvcyld KSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc05hTigpKTsKZGlmZiAtLWdpdCBhL0pT VGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjUwZmFjMjJjMDNkMDEy MzU2ODUzMmJhNGRkMGJlODhiODM3YWMzNy4uNjk2YmY4NThkMzUyMzc3MzZlYmUxYzlkNDMxOGEy ZWUyOWM2MDE1OCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0wNy0wMyAgWXVzdWtlIFN1enVraSAgPHlz dXp1a2lAYXBwbGUuY29tPgorCisgICAgICAgIFtKU0NdIEFkZCBleGNlcHRpb24gY2hlY2tzIGJl Zm9yZSBhbmQgYWZ0ZXIgdmlld1dpdGhVbmRlcmx5aW5nU3RyaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM5MjMKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzY1MDY4NDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogc3RyZXNzL2V4Y2VwdGlvbi1jaGVja3MtYmVmb3JlLWFuZC1hZnRlci12aWV3 d2l0aHVuZGVybHlpbmdzdHJpbmcuanM6IEFkZGVkLgorICAgICAgICAoc2hvdWxkVGhyb3cpOgor CiAyMDIwLTA3LTAzICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0pTQ10gQWRkIGV4Y2VwdGlvbiBjaGVja3MgaW4gSlNTdHJpbmdCdWlsZGVyIGFuZCBBcnJh eSNqb2luCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9leGNlcHRpb24tY2hlY2tzLWJlZm9y ZS1hbmQtYWZ0ZXItdmlld3dpdGh1bmRlcmx5aW5nc3RyaW5nLmpzIGIvSlNUZXN0cy9zdHJlc3Mv ZXhjZXB0aW9uLWNoZWNrcy1iZWZvcmUtYW5kLWFmdGVyLXZpZXd3aXRodW5kZXJseWluZ3N0cmlu Zy5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi4zMDQ0MTUxNTBhYWU4ODVlOWE3YTIzODJiM2NjZTQzMzU1Mzg4MjUx Ci0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3MvZXhjZXB0aW9uLWNoZWNrcy1iZWZv cmUtYW5kLWFmdGVyLXZpZXd3aXRodW5kZXJseWluZ3N0cmluZy5qcwpAQCAtMCwwICsxLDMxIEBA CisvL0Agc2tpcCBpZiAkbWVtb3J5TGltaXRlZAorCitmdW5jdGlvbiBzaG91bGRUaHJvdyhmdW5j LCBlcnJvck1lc3NhZ2UpIHsKKyAgICB2YXIgZXJyb3JUaHJvd24gPSBmYWxzZTsKKyAgICB2YXIg ZXJyb3IgPSBudWxsOworICAgIHRyeSB7CisgICAgICAgIGZ1bmMoKTsKKyAgICB9IGNhdGNoIChl KSB7CisgICAgICAgIGVycm9yVGhyb3duID0gdHJ1ZTsKKyAgICAgICAgZXJyb3IgPSBlOworICAg IH0KKyAgICBpZiAoIWVycm9yVGhyb3duKQorICAgICAgICB0aHJvdyBuZXcgRXJyb3IoJ25vdCB0 aHJvd24nKTsKKyAgICBpZiAoU3RyaW5nKGVycm9yKSAhPT0gZXJyb3JNZXNzYWdlKQorICAgICAg ICB0aHJvdyBuZXcgRXJyb3IoYGJhZCBlcnJvcjogJHtTdHJpbmcoZXJyb3IpfWApOworfQorCitz aG91bGRUaHJvdygoKSA9PiB7CisgICAgbGV0IHggPSB7IHRvU3RyaW5nOiAoKSA9PiAnJy5wYWRF bmQoMiAqKiAzMSAtIDEsIDEwLi50b0xvY2FsZVN0cmluZygpKSB9OworICAgIEpTT04ucGFyc2Uo eCk7Cit9LCBgUmFuZ2VFcnJvcjogT3V0IG9mIG1lbW9yeWApOworCitzaG91bGRUaHJvdygoKSA9 PiB7CisgICAgbGV0IHggPSB7IHRvU3RyaW5nOiAoKSA9PiAnJy5wYWRFbmQoMiAqKiAzMSAtIDEs IDEwLi50b0xvY2FsZVN0cmluZygpKSB9OworICAgIHByaW50KHgpOworfSwgYFJhbmdlRXJyb3I6 IE91dCBvZiBtZW1vcnlgKTsKKworc2hvdWxkVGhyb3coKCkgPT4geworICAgIGxldCB4ID0geyB0 b1N0cmluZzogKCkgPT4gJycucGFkRW5kKDIgKiogMzEgLSAxLCAxMC4udG9Mb2NhbGVTdHJpbmco KSkgfTsKKyAgICBkZWJ1Zyh4KTsKK30sIGBSYW5nZUVycm9yOiBPdXQgb2YgbWVtb3J5YCk7Cg==