165102 2016-11-28 12:19:48 -0800 Fix exception scope verification failures in more miscellaneous files. 2016-11-28 14:57:04 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam alecflett beidson commit-queue jsbell keith_miller msaboff saam oldest_to_newest 1253917 0 mark.lam 2016-11-28 12:19:48 -0800 Patch coming. 1253923 1 295514 mark.lam 2016-11-28 12:27:56 -0800 Created attachment 295514 proposed patch. 1254035 2 mark.lam 2016-11-28 14:57:04 -0800 Thanks for the review. Landed in r209025: <http://trac.webkit.org/r209025>. 295514 2016-11-28 12:27:56 -0800 2016-11-28 12:52:44 -0800 proposed patch. bug-165102.patch text/plain 9451 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA5MDAzKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTExLTI4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBtb3JlIG1pc2NlbGxh bmVvdXMgZmlsZXMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNjUxMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHdhc20vanMvV2ViQXNzZW1ibHlJbnN0YW5jZUNvbnN0cnVjdG9yLmNwcDoKKyAgICAg ICAgKEpTQzo6Y29uc3RydWN0SlNXZWJBc3NlbWJseUluc3RhbmNlKToKKwogMjAxNi0xMS0yNiAg WXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBbV1RGXSBJ bXBvcnQgc3RkOjpvcHRpb25hbCByZWZlcmVuY2UgaW1wbGVtZW50YXRpb24gYXMgV1RGOjpPcHRp b25hbApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3dhc20vanMvV2ViQXNzZW1ibHlJbnN0 YW5jZUNvbnN0cnVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv d2FzbS9qcy9XZWJBc3NlbWJseUluc3RhbmNlQ29uc3RydWN0b3IuY3BwCShyZXZpc2lvbiAyMDkw MDMpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvd2FzbS9qcy9XZWJBc3NlbWJseUluc3RhbmNl Q29uc3RydWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MCw3ICs4MCw5IEBAIHN0YXRpYyBF bmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGNvbnMKICAgICBWYXJpYWJsZUVudmlyb25tZW50 IGRlY2xhcmVkVmFyaWFibGVzOwogICAgIFZhcmlhYmxlRW52aXJvbm1lbnQgbGV4aWNhbFZhcmlh YmxlczsKICAgICBhdXRvKiBtb2R1bGVSZWNvcmQgPSBKU01vZHVsZVJlY29yZDo6Y3JlYXRlKHN0 YXRlLCB2bSwgZ2xvYmFsT2JqZWN0LT5tb2R1bGVSZWNvcmRTdHJ1Y3R1cmUoKSwgbW9kdWxlS2V5 LCBzb3VyY2VDb2RlLCBkZWNsYXJlZFZhcmlhYmxlcywgbGV4aWNhbFZhcmlhYmxlcyk7CisgICAg UkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CiAgICAgYXV0byog bW9kdWxlTmFtZXNwYWNlT2JqZWN0ID0gSlNNb2R1bGVOYW1lc3BhY2VPYmplY3Q6OmNyZWF0ZShz dGF0ZSwgZ2xvYmFsT2JqZWN0LCBnbG9iYWxPYmplY3QtPm1vZHVsZU5hbWVzcGFjZU9iamVjdFN0 cnVjdHVyZSgpLCBtb2R1bGVSZWNvcmQsIGluc3RhbmNlRXhwb3J0cyk7CisgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CiAKICAgICBhdXRvKiBzdHJ1Y3R1 cmUgPSBJbnRlcm5hbEZ1bmN0aW9uOjpjcmVhdGVTdWJjbGFzc1N0cnVjdHVyZShzdGF0ZSwgc3Rh dGUtPm5ld1RhcmdldCgpLCBnbG9iYWxPYmplY3QtPldlYkFzc2VtYmx5SW5zdGFuY2VTdHJ1Y3R1 cmUoKSk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMDkwMDMpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNSBAQAorMjAxNi0xMS0yOCAgTWFyayBM YW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGV4Y2VwdGlvbiBzY29wZSB2 ZXJpZmljYXRpb24gZmFpbHVyZXMgaW4gbW9yZSBtaXNjZWxsYW5lb3VzIGZpbGVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1MTAyCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJl Y2F1c2UgdGhlc2UgYXJlIGZpeGVzIHRvIGZhaWx1cmVzIGRldGVjdGVkIGJ5IGV4aXN0aW5nIHRl c3RzIHdoZW4KKyAgICAgICAgZXhjZXB0aW9uIGNoZWNrIHZlcmlmaWNhdGlvbiBpcyBlbmFibGVk LgorCisgICAgICAgICogYmluZGluZ3MvanMvSURCQmluZGluZ1V0aWxpdGllcy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp0b0pTKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NvbW1hbmRMaW5l QVBJSG9zdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpnZXRKU0xpc3RlbmVyRnVuY3Rp b25zKToKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0NyeXB0b0tleVNlcmlhbGl6YXRpb25KV0su Y3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRKU09ORm9yUlNBQ29tcG9uZW50cyk6CisgICAg ICAgIChXZWJDb3JlOjphZGRVc2FnZXNUb0pTT04pOgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pT RE9NQmluZGluZy5oOgorICAgICAgICAoV2ViQ29yZTo6dG9KUyk6CisgICAgICAgICogYnJpZGdl L3J1bnRpbWVfYXJyYXkuY3BwOgorICAgICAgICAoSlNDOjpSdW50aW1lQXJyYXk6OnB1dCk6CisK IDIwMTYtMTEtMjggIERhdmUgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NT UyBQYXJzZXJdIGZsZXgtYmFzaXMgc2hvdWxkIGJlIHBpeGVsIHVuaXRzIG5vdCBwZXJjZW50YWdl cy4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdVdGlsaXRpZXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0lEQkJpbmRpbmdV dGlsaXRpZXMuY3BwCShyZXZpc2lvbiAyMDkwMDMpCisrKyBTb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9JREJCaW5kaW5nVXRpbGl0aWVzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTAxLDggKzEw MSwxMCBAQCBKU1ZhbHVlIHRvSlMoRXhlY1N0YXRlJiBzdGF0ZSwgSlNHbG9iYWxPCiAgICAgICAg IHVuc2lnbmVkIHNpemUgPSBpbkFycmF5LnNpemUoKTsKICAgICAgICAgYXV0byBvdXRBcnJheSA9 IGNvbnN0cnVjdEVtcHR5QXJyYXkoJnN0YXRlLCAwLCAmZ2xvYmFsT2JqZWN0LCBzaXplKTsKICAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKLSAgICAgICAgZm9y IChzaXplX3QgaSA9IDA7IGkgPCBzaXplOyArK2kpCisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgICAgICBvdXRBcnJheS0+cHV0RGlyZWN0SW5kZXgo JnN0YXRlLCBpLCB0b0pTKHN0YXRlLCBnbG9iYWxPYmplY3QsIGluQXJyYXkuYXQoaSkuZ2V0KCkp KTsKKyAgICAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7Cisg ICAgICAgIH0KICAgICAgICAgcmV0dXJuIG91dEFycmF5OwogICAgIH0KICAgICBjYXNlIEtleVR5 cGU6OkJpbmFyeTogewpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDb21tYW5k TGluZUFQSUhvc3RDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL2pzL0pTQ29tbWFuZExpbmVBUElIb3N0Q3VzdG9tLmNwcAkocmV2aXNpb24gMjA5MDAzKQor KysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDb21tYW5kTGluZUFQSUhvc3RDdXN0b20u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MSw2ICs5MSw3IEBAIHN0YXRpYyBKU0FycmF5KiBnZXRK U0xpc3RlbmVyRnVuY3Rpb25zKEUKICAgICAgICAgbGlzdGVuZXJFbnRyeS0+cHV0RGlyZWN0KHZt LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKCZzdGF0ZSwgImxpc3RlbmVyIiksIGZ1bmN0aW9uKTsK ICAgICAgICAgbGlzdGVuZXJFbnRyeS0+cHV0RGlyZWN0KHZtLCBJZGVudGlmaWVyOjpmcm9tU3Ry aW5nKCZzdGF0ZSwgInVzZUNhcHR1cmUiKSwganNCb29sZWFuKGxpc3RlbmVySW5mby5ldmVudExp c3RlbmVyVmVjdG9yW2ldLT51c2VDYXB0dXJlKCkpKTsKICAgICAgICAgcmVzdWx0LT5wdXREaXJl Y3RJbmRleCgmc3RhdGUsIG91dHB1dEluZGV4KyssIEpTVmFsdWUobGlzdGVuZXJFbnRyeSkpOwor ICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBudWxscHRyKTsKICAgICB9CiAgICAg cmV0dXJuIHJlc3VsdDsKIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTQ3J5 cHRvS2V5U2VyaWFsaXphdGlvbkpXSy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YmluZGluZ3MvanMvSlNDcnlwdG9LZXlTZXJpYWxpemF0aW9uSldLLmNwcAkocmV2aXNpb24gMjA5 MDAzKQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNDcnlwdG9LZXlTZXJpYWxpemF0 aW9uSldLLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcxLDYgKzU3MSw3IEBAIHN0YXRpYyB2b2lk IGJ1aWxkSlNPTkZvclJTQUNvbXBvbmVudHMoSlMKICAgICAgICAgYWRkVG9KU09OKGV4ZWMsIGpz UHJpbWVJbmZvLCAiZCIsIGJhc2U2NFVSTEVuY29kZShkYXRhLm90aGVyUHJpbWVJbmZvcygpW2ld LmZhY3RvckNSVEV4cG9uZW50KSk7CiAgICAgICAgIGFkZFRvSlNPTihleGVjLCBqc1ByaW1lSW5m bywgInQiLCBiYXNlNjRVUkxFbmNvZGUoZGF0YS5vdGhlclByaW1lSW5mb3MoKVtpXS5mYWN0b3JD UlRDb2VmZmljaWVudCkpOwogICAgICAgICBvdGgtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGksIGpz UHJpbWVJbmZvKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsK ICAgICB9CiAgICAgcmVzdWx0LT5wdXREaXJlY3Qodm0sIElkZW50aWZpZXI6OmZyb21TdHJpbmco ZXhlYywgIm90aCIpLCBvdGgpOwogfQpAQCAtNjk0LDIyICs2OTUsMzggQEAgc3RhdGljIHZvaWQg YWRkVXNhZ2VzVG9KU09OKEV4ZWNTdGF0ZSogZQogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIHZvaWQoKSk7CiAKICAgICB1bnNpZ25lZCBpbmRleCA9IDA7Ci0gICAgaWYgKHVzYWdlcyAm IENyeXB0b0tleVVzYWdlU2lnbikKKyAgICBpZiAodXNhZ2VzICYgQ3J5cHRvS2V5VXNhZ2VTaWdu KSB7CiAgICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywganNOb250 cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgic2lnbiIpKSk7Ci0gICAgaWYgKHVzYWdl cyAmIENyeXB0b0tleVVzYWdlVmVyaWZ5KQorICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNj b3BlLCB2b2lkKCkpOworICAgIH0KKyAgICBpZiAodXNhZ2VzICYgQ3J5cHRvS2V5VXNhZ2VWZXJp ZnkpIHsKICAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBqc05v bnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJ2ZXJpZnkiKSkpOwotICAgIGlmICh1 c2FnZXMgJiBDcnlwdG9LZXlVc2FnZUVuY3J5cHQpCisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJ T04oc2NvcGUsIHZvaWQoKSk7CisgICAgfQorICAgIGlmICh1c2FnZXMgJiBDcnlwdG9LZXlVc2Fn ZUVuY3J5cHQpIHsKICAgICAgICAga2V5T3BzLT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsr LCBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJlbmNyeXB0IikpKTsKLSAg ICBpZiAodXNhZ2VzICYgQ3J5cHRvS2V5VXNhZ2VEZWNyeXB0KQorICAgICAgICBSRVRVUk5fSUZf RVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOworICAgIH0KKyAgICBpZiAodXNhZ2VzICYgQ3J5cHRv S2V5VXNhZ2VEZWNyeXB0KSB7CiAgICAgICAgIGtleU9wcy0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgiZGVjcnlwdCIp KSk7Ci0gICAgaWYgKHVzYWdlcyAmIENyeXB0b0tleVVzYWdlV3JhcEtleSkKKyAgICAgICAgUkVU VVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKKyAgICB9CisgICAgaWYgKHVzYWdlcyAm IENyeXB0b0tleVVzYWdlV3JhcEtleSkgewogICAgICAgICBrZXlPcHMtPnB1dERpcmVjdEluZGV4 KGV4ZWMsIGluZGV4KyssIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoIndy YXBLZXkiKSkpOwotICAgIGlmICh1c2FnZXMgJiBDcnlwdG9LZXlVc2FnZVVud3JhcEtleSkKKyAg ICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgdm9pZCgpKTsKKyAgICB9CisgICAgaWYg KHVzYWdlcyAmIENyeXB0b0tleVVzYWdlVW53cmFwS2V5KSB7CiAgICAgICAgIGtleU9wcy0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIEFTQ0lJ TGl0ZXJhbCgidW53cmFwS2V5IikpKTsKLSAgICBpZiAodXNhZ2VzICYgQ3J5cHRvS2V5VXNhZ2VE ZXJpdmVLZXkpCisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIHZvaWQoKSk7Cisg ICAgfQorICAgIGlmICh1c2FnZXMgJiBDcnlwdG9LZXlVc2FnZURlcml2ZUtleSkgewogICAgICAg ICBrZXlPcHMtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGpzTm9udHJpdmlhbFN0cmlu ZyhleGVjLCBBU0NJSUxpdGVyYWwoImRlcml2ZUtleSIpKSk7Ci0gICAgaWYgKHVzYWdlcyAmIENy eXB0b0tleVVzYWdlRGVyaXZlQml0cykKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgdm9pZCgpKTsKKyAgICB9CisgICAgaWYgKHVzYWdlcyAmIENyeXB0b0tleVVzYWdlRGVyaXZl Qml0cykgewogICAgICAgICBrZXlPcHMtPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGpz Tm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoImRlcml2ZUJpdHMiKSkpOworICAg ICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOworICAgIH0KIAogICAgIGpz b24tPnB1dERpcmVjdCh2bSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyhleGVjLCAia2V5X29wcyIp LCBrZXlPcHMpOwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5k aW5nLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNET01CaW5k aW5nLmgJKHJldmlzaW9uIDIwOTAwMykKKysrIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pT RE9NQmluZGluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogLyoKICAqICBDb3B5 cmlnaHQgKEMpIDE5OTktMjAwMSBIYXJyaSBQb3J0ZW4gKHBvcnRlbkBrZGUub3JnKQotICogIENv cHlyaWdodCAoQykgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAwOCwgMjAwOSwgMjAxMyBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiAgQ29weXJpZ2h0IChDKSAyMDAzLTIwMDYs IDIwMDgtMjAwOSwgMjAxMywgMjAxNiBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAg KiAgQ29weXJpZ2h0IChDKSAyMDA3IFNhbXVlbCBXZWluaWcgPHNhbUB3ZWJraXQub3JnPgogICog IENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAq ICBDb3B5cmlnaHQgKEMpIDIwMTIgRXJpY3Nzb24gQUIuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCkBA IC02NTgsOCArNjU4LDEwIEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlubGluZSBKU0M6OkpTVmFs dWUKIAogICAgIEpTQzo6SlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMs IG51bGxwdHIsIHZlY3Rvci5zaXplKCkpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUs IEpTQzo6SlNWYWx1ZSgpKTsKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHZlY3Rvci5zaXpl KCk7ICsraSkKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHZlY3Rvci5zaXplKCk7ICsraSkg ewogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaSwgdG9KUyhleGVjLCBnbG9i YWxPYmplY3QsIHZlY3RvcltpXSkpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBKU0M6OkpTVmFsdWUoKSk7CisgICAgfQogICAgIHJldHVybiBhcnJheTsKIH0KIApAQCAtNjcw LDggKzY3MiwxMCBAQCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgSlNDOjpKU1ZhbHVlCiAK ICAgICBKU0M6OkpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxs cHRyLCB2ZWN0b3Iuc2l6ZSgpKTsKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU0M6 OkpTVmFsdWUoKSk7Ci0gICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2ZWN0b3Iuc2l6ZSgpOyAr K2kpCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB2ZWN0b3Iuc2l6ZSgpOyArK2kpIHsKICAg ICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGksIHRvSlMoZXhlYywgZ2xvYmFsT2Jq ZWN0LCB2ZWN0b3JbaV0uZ2V0KCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29w ZSwgSlNDOjpKU1ZhbHVlKCkpOworICAgIH0KICAgICByZXR1cm4gYXJyYXk7CiB9CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX2FycmF5LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9icmlkZ2UvcnVudGltZV9hcnJheS5jcHAJKHJldmlzaW9uIDIwOTAwMykK KysrIFNvdXJjZS9XZWJDb3JlL2JyaWRnZS9ydW50aW1lX2FycmF5LmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTI3LDcgKzEyNyw4IEBAIGJvb2wgUnVudGltZUFycmF5OjpwdXQoSlNDZWxsKiBjZWxs LCBFeGUKICAgICAKICAgICBpZiAoc3RkOjpvcHRpb25hbDx1aW50MzJfdD4gaW5kZXggPSBwYXJz ZUluZGV4KHByb3BlcnR5TmFtZSkpCiAgICAgICAgIHJldHVybiB0aGlzT2JqZWN0LT5nZXRDb25j cmV0ZUFycmF5KCktPnNldFZhbHVlQXQoZXhlYywgaW5kZXgudmFsdWUoKSwgdmFsdWUpOwotICAg IAorCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVybiBKU09iamVjdDo6cHV0KHRoaXNP YmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNsb3QpOwogfQogCg==