164959 2016-11-18 14:53:38 -0800 Fix missing exception checks in JSC inspector files. 2016-11-19 00:04:00 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam commit-queue fpizlo ggaren jfbastien joepeck keith_miller msaboff saam ysuzuki oldest_to_newest 1252882 0 mark.lam 2016-11-18 14:53:38 -0800 Patch coming. 1252885 1 295197 mark.lam 2016-11-18 14:56:09 -0800 Created attachment 295197 proposed patch. 1252890 2 295200 mark.lam 2016-11-18 15:16:26 -0800 Created attachment 295200 revised to have returns immediately following scope.release()s. 1252934 3 295200 mark.lam 2016-11-18 16:21:04 -0800 Comment on attachment 295200 revised to have returns immediately following scope.release()s. View in context: https://bugs.webkit.org/attachment.cgi?id=295200&action=review > Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp:274 > + scope.release(); > array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("status"), jsNontrivialString(exec, ASCIILiteral("pending")))); > break; Thanks for the review. I just realized that I uploaded the wrong version of the patch. The updated one should return shortly after the call to scope.release(). The change is minor. I'll upload the modified patch for landing. 1252946 4 295219 mark.lam 2016-11-18 16:38:40 -0800 Created attachment 295219 patch for landing. 1253051 5 295219 commit-queue 2016-11-19 00:03:56 -0800 Comment on attachment 295219 patch for landing. Clearing flags on attachment: 295219 Committed r208923: <http://trac.webkit.org/changeset/208923> 1253052 6 commit-queue 2016-11-19 00:04:00 -0800 All reviewed patches have been landed. Closing bug. 295197 2016-11-18 14:56:09 -0800 2016-11-18 15:16:26 -0800 proposed patch. bug-164959.patch text/plain 8386 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTAyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE2LTExLTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggbWlzc2luZyBleGNlcHRpb24gY2hlY2tzIGluIEpTQyBpbnNwZWN0b3IgZmlsZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ5NTkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9K U0luamVjdGVkU2NyaXB0SG9zdC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRT Y3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3BlcnRpZXMpOgorICAgICAgICAoSW5zcGVjdG9yOjpK U0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcEVudHJpZXMpOgorICAgICAgICAoSW5zcGVjdG9y OjpKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldEVudHJpZXMpOgorICAgICAgICAoSW5zcGVj dG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6aXRlcmF0b3JFbnRyaWVzKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6 SlNKYXZhU2NyaXB0Q2FsbEZyYW1lOjpzY29wZURlc2NyaXB0aW9ucyk6CisKIDIwMTYtMTEtMTgg IEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBm aXggY2xvb3AuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0 ZWRTY3JpcHRIb3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAkocmV2aXNpb24gMjA4ODkwKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI2OSwxNCArMjY5LDE5IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlw dEhvc3Q6OmdldEludGVybmEKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNW YWx1ZSgpKTsKICAgICAgICAgc3dpdGNoIChwcm9taXNlLT5zdGF0dXMoZXhlYy0+dm0oKSkpIHsK ICAgICAgICAgY2FzZSBKU1Byb21pc2U6OlN0YXR1czo6UGVuZGluZzoKKyAgICAgICAgICAgIHNj b3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBp bmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0ZXJhbCgic3Rh dHVzIiksIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInBlbmRpbmciKSkp KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEpTUHJvbWlzZTo6U3RhdHVzOjpG dWxmaWxsZWQ6CiAgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInN0YXR1cyIp LCBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJyZXNvbHZlZCIpKSkpOwor ICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKKyAgICAg ICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRl eChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0 ZXJhbCgicmVzdWx0IiksIHByb21pc2UtPnJlc3VsdChleGVjLT52bSgpKSkpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgSlNQcm9taXNlOjpTdGF0dXM6OlJlamVjdGVkOgogICAg ICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdElu dGVybmFsUHJvcGVydHkoZXhlYywgQVNDSUlMaXRlcmFsKCJzdGF0dXMiKSwganNOb250cml2aWFs U3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgicmVqZWN0ZWQiKSkpKTsKKyAgICAgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAgICAgICBzY29wZS5y ZWxlYXNlKCk7CiAgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInJlc3VsdCIp LCBwcm9taXNlLT5yZXN1bHQoZXhlYy0+dm0oKSkpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CkBAIC0yODksOSArMjk0LDEzIEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6 OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5 KGV4ZWMsIG51bGxwdHIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1Zh bHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29u c3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAidGFyZ2V0RnVuY3Rpb24iLCBib3VuZEZ1bmN0 aW9uLT50YXJnZXRGdW5jdGlvbigpKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIEpTVmFsdWUoKSk7CiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRl eCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJib3VuZFRoaXMiLCBib3VuZEZ1 bmN0aW9uLT5ib3VuZFRoaXMoKSkpOwotICAgICAgICBpZiAoYm91bmRGdW5jdGlvbi0+Ym91bmRB cmdzKCkpCisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7Cisg ICAgICAgIGlmIChib3VuZEZ1bmN0aW9uLT5ib3VuZEFyZ3MoKSkgeworICAgICAgICAgICAgc2Nv cGUucmVsZWFzZSgpOwogICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgImJvdW5kQXJncyIsIGJvdW5k RnVuY3Rpb24tPmJvdW5kQXJncygpKSk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGFycmF5 OwogICAgIH0KIApAQCAtMzAwLDYgKzMwOSw4IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFy cmF5KGV4ZWMsIG51bGxwdHIsIDIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBKU1ZhbHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInRhcmdldCIp LCBwcm94eS0+dGFyZ2V0KCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg SlNWYWx1ZSgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVj LCBBU0NJSUxpdGVyYWwoImhhbmRsZXIiKSwgcHJveHktPmhhbmRsZXIoKSkpOwogICAgICAgICBy ZXR1cm4gYXJyYXk7CiAgICAgfQpAQCAtMzEzLDYgKzMyNCw4IEBAIEpTVmFsdWUgSlNJbmplY3Rl ZFNjcmlwdEhvc3Q6OmdldEludGVybmEKICAgICAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29u c3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyLCAyKTsKICAgICAgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAgICAgICAgICAgICBhcnJheS0+cHV0RGly ZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAi YXJyYXkiLCBpdGVyYXRlZFZhbHVlKSk7CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBKU1ZhbHVlKCkpOworICAgICAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAg ICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVy bmFsUHJvcGVydHkoZXhlYywgImtpbmQiLCBraW5kKSk7CiAgICAgICAgICAgICByZXR1cm4gYXJy YXk7CiAgICAgICAgIH0KQEAgLTMzNSw2ICszNDgsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3Jp cHRIb3N0OjpnZXRJbnRlcm5hCiAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1w dHlBcnJheShleGVjLCBudWxscHRyLCAyKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgSlNWYWx1ZSgpKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgIm1hcCIsIG1hcEl0ZXJhdG9y LT5pdGVyYXRlZFZhbHVlKCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg SlNWYWx1ZSgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVj LCAia2luZCIsIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBraW5kKSkpOwogICAgICAgICByZXR1 cm4gYXJyYXk7CiAgICAgfQpAQCAtMzU2LDYgKzM3MSw4IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNj cmlwdEhvc3Q6OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RF bXB0eUFycmF5KGV4ZWMsIG51bGxwdHIsIDIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBKU1ZhbHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAic2V0Iiwgc2V0SXRlcmF0 b3ItPml0ZXJhdGVkVmFsdWUoKSkpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBKU1ZhbHVlKCkpOworICAgICAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgICAgIGFycmF5LT5w dXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4 ZWMsICJraW5kIiwganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIGtpbmQpKSk7CiAgICAgICAgIHJl dHVybiBhcnJheTsKICAgICB9CkBAIC0zNjQsNiArMzgxLDcgQEAgSlNWYWx1ZSBKU0luamVjdGVk U2NyaXB0SG9zdDo6Z2V0SW50ZXJuYQogICAgICAgICB1bnNpZ25lZCBpbmRleCA9IDA7CiAgICAg ICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyLCAx KTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKKyAgICAg ICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAic3RyaW5nIiwgc3RyaW5n SXRlcmF0b3ItPml0ZXJhdGVkVmFsdWUoZXhlYykpKTsKICAgICAgICAgcmV0dXJuIGFycmF5Owog ICAgIH0KQEAgLTM3Miw2ICszOTAsNyBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpn ZXRJbnRlcm5hCiAgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKICAgICAgICAgSlNBcnJheSog YXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIsIDEpOwogICAgICAgICBS RVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOworICAgICAgICBzY29wZS5yZWxl YXNlKCk7CiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25z dHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJvYmplY3QiLCBwcm9wZXJ0eU5hbWVJdGVyYXRv ci0+aXRlcmF0ZWRWYWx1ZSgpKSk7CiAgICAgICAgIHJldHVybiBhcnJheTsKICAgICB9CkBAIC00 MzYsNiArNDU1LDcgQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcEVudAog ICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXI6OmZyb21TdHJp bmcoZXhlYywgImtleSIpLCBpdC0+a2V5KTsKICAgICAgICAgZW50cnktPnB1dERpcmVjdChleGVj LT52bSgpLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKGV4ZWMsICJ2YWx1ZSIpLCBpdC0+dmFsdWUu Z2V0KCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgZmV0Y2hlZCsrLCBl bnRyeSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAg ICAgICAgIGlmIChudW1iZXJUb0ZldGNoICYmIGZldGNoZWQgPj0gbnVtYmVyVG9GZXRjaCkKICAg ICAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTQ4Miw2ICs1MDIsNyBAQCBKU1ZhbHVlIEpTSW5q ZWN0ZWRTY3JpcHRIb3N0Ojp3ZWFrU2V0RW50CiAgICAgICAgIEpTT2JqZWN0KiBlbnRyeSA9IGNv bnN0cnVjdEVtcHR5T2JqZWN0KGV4ZWMpOwogICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMt PnZtKCksIElkZW50aWZpZXI6OmZyb21TdHJpbmcoZXhlYywgInZhbHVlIiksIGl0LT5rZXkpOwog ICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgZmV0Y2hlZCsrLCBlbnRyeSk7Cisg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAgICAgICAgIGlm IChudW1iZXJUb0ZldGNoICYmIGZldGNoZWQgPj0gbnVtYmVyVG9GZXRjaCkKICAgICAgICAgICAg IGJyZWFrOwogICAgIH0KQEAgLTU1Miw2ICs1NzMsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3Jp cHRIb3N0OjppdGVyYXRvckVuCiAgICAgICAgIEpTT2JqZWN0KiBlbnRyeSA9IGNvbnN0cnVjdEVt cHR5T2JqZWN0KGV4ZWMpOwogICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElk ZW50aWZpZXI6OmZyb21TdHJpbmcoZXhlYywgInZhbHVlIiksIG5leHRWYWx1ZSk7CiAgICAgICAg IGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpLCBlbnRyeSk7CisgICAgICAgIGlmIChVTkxJ S0VMWShzY29wZS5leGNlcHRpb24oKSkpCisgICAgICAgICAgICBicmVhazsKICAgICB9CiAKICAg ICBpdGVyYXRvckNsb3NlKGV4ZWMsIGl0ZXJhdG9yKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSmF2YVNjcmlwdENhbGxGcmFtZS5jcHAJ KHJldmlzaW9uIDIwODg5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNK YXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDYgKzEyOCw5IEBA IHN0YXRpYyBKU1ZhbHVlIHZhbHVlRm9yU2NvcGVMb2NhdGlvbihFeGUKIAogSlNWYWx1ZSBKU0ph dmFTY3JpcHRDYWxsRnJhbWU6OnNjb3BlRGVzY3JpcHRpb25zKEV4ZWNTdGF0ZSogZXhlYykKIHsK KyAgICBWTSYgdm0gPSBleGVjLT52bSgpOworICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVf VEhST1dfU0NPUEUodm0pOworCiAgICAgRGVidWdnZXJTY29wZSogc2NvcGVDaGFpbiA9IGltcGwo KS5zY29wZUNoYWluKCk7CiAgICAgaWYgKCFzY29wZUNoYWluKQogICAgICAgICByZXR1cm4ganNV bmRlZmluZWQoKTsKQEAgLTE0Myw2ICsxNDYsNyBAQCBKU1ZhbHVlIEpTSmF2YVNjcmlwdENhbGxG cmFtZTo6c2NvcGVEZXNjCiAgICAgICAgIGRlc2NyaXB0aW9uLT5wdXREaXJlY3QoZXhlYy0+dm0o KSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyhleGVjLCAibmFtZSIpLCBqc1N0cmluZyhleGVjLCBz Y29wZS0+bmFtZSgpKSk7CiAgICAgICAgIGRlc2NyaXB0aW9uLT5wdXREaXJlY3QoZXhlYy0+dm0o KSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyhleGVjLCAibG9jYXRpb24iKSwgdmFsdWVGb3JTY29w ZUxvY2F0aW9uKGV4ZWMsIHNjb3BlLT5sb2NhdGlvbigpKSk7CiAgICAgICAgIGFycmF5LT5wdXRE aXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBkZXNjcmlwdGlvbik7CisgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04odGhyb3dTY29wZSwgSlNWYWx1ZSgpKTsKICAgICB9CiAKICAgICByZXR1cm4g YXJyYXk7Cg== 295200 2016-11-18 15:16:26 -0800 2016-11-18 16:38:40 -0800 revised to have returns immediately following scope.release()s. bug-164959.patch text/plain 8386 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTAyKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE2LTExLTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggbWlzc2luZyBleGNlcHRpb24gY2hlY2tzIGluIEpTQyBpbnNwZWN0b3IgZmlsZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ5NTkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9K U0luamVjdGVkU2NyaXB0SG9zdC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRT Y3JpcHRIb3N0OjpnZXRJbnRlcm5hbFByb3BlcnRpZXMpOgorICAgICAgICAoSW5zcGVjdG9yOjpK U0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcEVudHJpZXMpOgorICAgICAgICAoSW5zcGVjdG9y OjpKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldEVudHJpZXMpOgorICAgICAgICAoSW5zcGVj dG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6aXRlcmF0b3JFbnRyaWVzKToKKyAgICAgICAgKiBp bnNwZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6 SlNKYXZhU2NyaXB0Q2FsbEZyYW1lOjpzY29wZURlc2NyaXB0aW9ucyk6CisKIDIwMTYtMTEtMTgg IEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBm aXggY2xvb3AuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0 ZWRTY3JpcHRIb3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5z cGVjdG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAkocmV2aXNpb24gMjA4ODkwKQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTI2OSwxNCArMjY5LDE5IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlw dEhvc3Q6OmdldEludGVybmEKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNW YWx1ZSgpKTsKICAgICAgICAgc3dpdGNoIChwcm9taXNlLT5zdGF0dXMoZXhlYy0+dm0oKSkpIHsK ICAgICAgICAgY2FzZSBKU1Byb21pc2U6OlN0YXR1czo6UGVuZGluZzoKKyAgICAgICAgICAgIHNj b3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBp bmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0ZXJhbCgic3Rh dHVzIiksIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInBlbmRpbmciKSkp KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEpTUHJvbWlzZTo6U3RhdHVzOjpG dWxmaWxsZWQ6CiAgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInN0YXR1cyIp LCBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlMaXRlcmFsKCJyZXNvbHZlZCIpKSkpOwor ICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKKyAgICAg ICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRl eChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0 ZXJhbCgicmVzdWx0IiksIHByb21pc2UtPnJlc3VsdChleGVjLT52bSgpKSkpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIGNhc2UgSlNQcm9taXNlOjpTdGF0dXM6OlJlamVjdGVkOgogICAg ICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdElu dGVybmFsUHJvcGVydHkoZXhlYywgQVNDSUlMaXRlcmFsKCJzdGF0dXMiKSwganNOb250cml2aWFs U3RyaW5nKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgicmVqZWN0ZWQiKSkpKTsKKyAgICAgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAgICAgICBzY29wZS5y ZWxlYXNlKCk7CiAgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInJlc3VsdCIp LCBwcm9taXNlLT5yZXN1bHQoZXhlYy0+dm0oKSkpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAg ICAgICB9CkBAIC0yODksOSArMjk0LDEzIEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6 OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5 KGV4ZWMsIG51bGxwdHIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1Zh bHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29u c3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAidGFyZ2V0RnVuY3Rpb24iLCBib3VuZEZ1bmN0 aW9uLT50YXJnZXRGdW5jdGlvbigpKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2Nv cGUsIEpTVmFsdWUoKSk7CiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRl eCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJib3VuZFRoaXMiLCBib3VuZEZ1 bmN0aW9uLT5ib3VuZFRoaXMoKSkpOwotICAgICAgICBpZiAoYm91bmRGdW5jdGlvbi0+Ym91bmRB cmdzKCkpCisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7Cisg ICAgICAgIGlmIChib3VuZEZ1bmN0aW9uLT5ib3VuZEFyZ3MoKSkgeworICAgICAgICAgICAgc2Nv cGUucmVsZWFzZSgpOwogICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgImJvdW5kQXJncyIsIGJvdW5k RnVuY3Rpb24tPmJvdW5kQXJncygpKSk7CisgICAgICAgIH0KICAgICAgICAgcmV0dXJuIGFycmF5 OwogICAgIH0KIApAQCAtMzAwLDYgKzMwOSw4IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFy cmF5KGV4ZWMsIG51bGxwdHIsIDIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBKU1ZhbHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgr KywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInRhcmdldCIp LCBwcm94eS0+dGFyZ2V0KCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg SlNWYWx1ZSgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVj LCBBU0NJSUxpdGVyYWwoImhhbmRsZXIiKSwgcHJveHktPmhhbmRsZXIoKSkpOwogICAgICAgICBy ZXR1cm4gYXJyYXk7CiAgICAgfQpAQCAtMzEzLDYgKzMyNCw4IEBAIEpTVmFsdWUgSlNJbmplY3Rl ZFNjcmlwdEhvc3Q6OmdldEludGVybmEKICAgICAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29u c3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyLCAyKTsKICAgICAgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAgICAgICAgICAgICBhcnJheS0+cHV0RGly ZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAi YXJyYXkiLCBpdGVyYXRlZFZhbHVlKSk7CisgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBKU1ZhbHVlKCkpOworICAgICAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAg ICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVy bmFsUHJvcGVydHkoZXhlYywgImtpbmQiLCBraW5kKSk7CiAgICAgICAgICAgICByZXR1cm4gYXJy YXk7CiAgICAgICAgIH0KQEAgLTMzNSw2ICszNDgsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3Jp cHRIb3N0OjpnZXRJbnRlcm5hCiAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1w dHlBcnJheShleGVjLCBudWxscHRyLCAyKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgSlNWYWx1ZSgpKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgIm1hcCIsIG1hcEl0ZXJhdG9y LT5pdGVyYXRlZFZhbHVlKCkpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg SlNWYWx1ZSgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVj LCAia2luZCIsIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBraW5kKSkpOwogICAgICAgICByZXR1 cm4gYXJyYXk7CiAgICAgfQpAQCAtMzU2LDYgKzM3MSw4IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNj cmlwdEhvc3Q6OmdldEludGVybmEKICAgICAgICAgSlNBcnJheSogYXJyYXkgPSBjb25zdHJ1Y3RF bXB0eUFycmF5KGV4ZWMsIG51bGxwdHIsIDIpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9O KHNjb3BlLCBKU1ZhbHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAic2V0Iiwgc2V0SXRlcmF0 b3ItPml0ZXJhdGVkVmFsdWUoKSkpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3Bl LCBKU1ZhbHVlKCkpOworICAgICAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgICAgIGFycmF5LT5w dXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4 ZWMsICJraW5kIiwganNOb250cml2aWFsU3RyaW5nKGV4ZWMsIGtpbmQpKSk7CiAgICAgICAgIHJl dHVybiBhcnJheTsKICAgICB9CkBAIC0zNjQsNiArMzgxLDcgQEAgSlNWYWx1ZSBKU0luamVjdGVk U2NyaXB0SG9zdDo6Z2V0SW50ZXJuYQogICAgICAgICB1bnNpZ25lZCBpbmRleCA9IDA7CiAgICAg ICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyLCAx KTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKKyAgICAg ICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAic3RyaW5nIiwgc3RyaW5n SXRlcmF0b3ItPml0ZXJhdGVkVmFsdWUoZXhlYykpKTsKICAgICAgICAgcmV0dXJuIGFycmF5Owog ICAgIH0KQEAgLTM3Miw2ICszOTAsNyBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0Ojpn ZXRJbnRlcm5hCiAgICAgICAgIHVuc2lnbmVkIGluZGV4ID0gMDsKICAgICAgICAgSlNBcnJheSog YXJyYXkgPSBjb25zdHJ1Y3RFbXB0eUFycmF5KGV4ZWMsIG51bGxwdHIsIDEpOwogICAgICAgICBS RVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOworICAgICAgICBzY29wZS5yZWxl YXNlKCk7CiAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25z dHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJvYmplY3QiLCBwcm9wZXJ0eU5hbWVJdGVyYXRv ci0+aXRlcmF0ZWRWYWx1ZSgpKSk7CiAgICAgICAgIHJldHVybiBhcnJheTsKICAgICB9CkBAIC00 MzYsNiArNDU1LDcgQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcEVudAog ICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXI6OmZyb21TdHJp bmcoZXhlYywgImtleSIpLCBpdC0+a2V5KTsKICAgICAgICAgZW50cnktPnB1dERpcmVjdChleGVj LT52bSgpLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKGV4ZWMsICJ2YWx1ZSIpLCBpdC0+dmFsdWUu Z2V0KCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgZmV0Y2hlZCsrLCBl bnRyeSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAg ICAgICAgIGlmIChudW1iZXJUb0ZldGNoICYmIGZldGNoZWQgPj0gbnVtYmVyVG9GZXRjaCkKICAg ICAgICAgICAgIGJyZWFrOwogICAgIH0KQEAgLTQ4Miw2ICs1MDIsNyBAQCBKU1ZhbHVlIEpTSW5q ZWN0ZWRTY3JpcHRIb3N0Ojp3ZWFrU2V0RW50CiAgICAgICAgIEpTT2JqZWN0KiBlbnRyeSA9IGNv bnN0cnVjdEVtcHR5T2JqZWN0KGV4ZWMpOwogICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMt PnZtKCksIElkZW50aWZpZXI6OmZyb21TdHJpbmcoZXhlYywgInZhbHVlIiksIGl0LT5rZXkpOwog ICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgZmV0Y2hlZCsrLCBlbnRyeSk7Cisg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAgICAgICAgIGlm IChudW1iZXJUb0ZldGNoICYmIGZldGNoZWQgPj0gbnVtYmVyVG9GZXRjaCkKICAgICAgICAgICAg IGJyZWFrOwogICAgIH0KQEAgLTU1Miw2ICs1NzMsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3Jp cHRIb3N0OjppdGVyYXRvckVuCiAgICAgICAgIEpTT2JqZWN0KiBlbnRyeSA9IGNvbnN0cnVjdEVt cHR5T2JqZWN0KGV4ZWMpOwogICAgICAgICBlbnRyeS0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElk ZW50aWZpZXI6OmZyb21TdHJpbmcoZXhlYywgInZhbHVlIiksIG5leHRWYWx1ZSk7CiAgICAgICAg IGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpLCBlbnRyeSk7CisgICAgICAgIGlmIChVTkxJ S0VMWShzY29wZS5leGNlcHRpb24oKSkpCisgICAgICAgICAgICBicmVhazsKICAgICB9CiAKICAg ICBpdGVyYXRvckNsb3NlKGV4ZWMsIGl0ZXJhdG9yKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSmF2YVNjcmlwdENhbGxGcmFtZS5jcHAJ KHJldmlzaW9uIDIwODg5MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNK YXZhU2NyaXB0Q2FsbEZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTI4LDYgKzEyOCw5IEBA IHN0YXRpYyBKU1ZhbHVlIHZhbHVlRm9yU2NvcGVMb2NhdGlvbihFeGUKIAogSlNWYWx1ZSBKU0ph dmFTY3JpcHRDYWxsRnJhbWU6OnNjb3BlRGVzY3JpcHRpb25zKEV4ZWNTdGF0ZSogZXhlYykKIHsK KyAgICBWTSYgdm0gPSBleGVjLT52bSgpOworICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVf VEhST1dfU0NPUEUodm0pOworCiAgICAgRGVidWdnZXJTY29wZSogc2NvcGVDaGFpbiA9IGltcGwo KS5zY29wZUNoYWluKCk7CiAgICAgaWYgKCFzY29wZUNoYWluKQogICAgICAgICByZXR1cm4ganNV bmRlZmluZWQoKTsKQEAgLTE0Myw2ICsxNDYsNyBAQCBKU1ZhbHVlIEpTSmF2YVNjcmlwdENhbGxG cmFtZTo6c2NvcGVEZXNjCiAgICAgICAgIGRlc2NyaXB0aW9uLT5wdXREaXJlY3QoZXhlYy0+dm0o KSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyhleGVjLCAibmFtZSIpLCBqc1N0cmluZyhleGVjLCBz Y29wZS0+bmFtZSgpKSk7CiAgICAgICAgIGRlc2NyaXB0aW9uLT5wdXREaXJlY3QoZXhlYy0+dm0o KSwgSWRlbnRpZmllcjo6ZnJvbVN0cmluZyhleGVjLCAibG9jYXRpb24iKSwgdmFsdWVGb3JTY29w ZUxvY2F0aW9uKGV4ZWMsIHNjb3BlLT5sb2NhdGlvbigpKSk7CiAgICAgICAgIGFycmF5LT5wdXRE aXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBkZXNjcmlwdGlvbik7CisgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04odGhyb3dTY29wZSwgSlNWYWx1ZSgpKTsKICAgICB9CiAKICAgICByZXR1cm4g YXJyYXk7Cg== 295219 2016-11-18 16:38:40 -0800 2016-11-19 00:03:56 -0800 patch for landing. bug-164959.patch text/plain 8822 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBA CisyMDE2LTExLTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggbWlzc2luZyBleGNlcHRpb24gY2hlY2tzIGluIEpTQyBpbnNwZWN0b3IgZmlsZXMuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ5NTkKKworICAg ICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKworICAgICAgICAqIGluc3BlY3Rvci9KU0lu amVjdGVkU2NyaXB0SG9zdC5jcHA6CisgICAgICAgIChJbnNwZWN0b3I6OkpTSW5qZWN0ZWRTY3Jp cHRIb3N0OjpnZXRJbnRlcm5hbFByb3BlcnRpZXMpOgorICAgICAgICAoSW5zcGVjdG9yOjpKU0lu amVjdGVkU2NyaXB0SG9zdDo6d2Vha01hcEVudHJpZXMpOgorICAgICAgICAoSW5zcGVjdG9yOjpK U0luamVjdGVkU2NyaXB0SG9zdDo6d2Vha1NldEVudHJpZXMpOgorICAgICAgICAoSW5zcGVjdG9y OjpKU0luamVjdGVkU2NyaXB0SG9zdDo6aXRlcmF0b3JFbnRyaWVzKToKKyAgICAgICAgKiBpbnNw ZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNK YXZhU2NyaXB0Q2FsbEZyYW1lOjpzY29wZURlc2NyaXB0aW9ucyk6CisKIDIwMTYtMTEtMTggIEpl cmVteSBKb25lcyAgPGplcmVteWpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBydW50aW1lIGZs YWcgdG8gZW5hYmxlIHBvaW50ZXIgbG9jay4gRW5hYmxlIHBvaW50ZXIgbG9jayBmZWF0dXJlIGZv ciBtYWMuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSW5qZWN0ZWRT Y3JpcHRIb3N0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL0pTSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAkocmV2aXNpb24gMjA4OTA1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTI2OSwxOSArMjY5LDI0IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhv c3Q6OmdldEludGVybmEKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1 ZSgpKTsKICAgICAgICAgc3dpdGNoIChwcm9taXNlLT5zdGF0dXMoZXhlYy0+dm0oKSkpIHsKICAg ICAgICAgY2FzZSBKU1Byb21pc2U6OlN0YXR1czo6UGVuZGluZzoKKyAgICAgICAgICAgIHNjb3Bl LnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRl eCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0ZXJhbCgic3RhdHVz IiksIGpzTm9udHJpdmlhbFN0cmluZyhleGVjLCBBU0NJSUxpdGVyYWwoInBlbmRpbmciKSkpKTsK LSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgcmV0dXJuIGFycmF5OwogICAgICAgICBj YXNlIEpTUHJvbWlzZTo6U3RhdHVzOjpGdWxmaWxsZWQ6CiAgICAgICAgICAgICBhcnJheS0+cHV0 RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVj LCBBU0NJSUxpdGVyYWwoInN0YXR1cyIpLCBqc05vbnRyaXZpYWxTdHJpbmcoZXhlYywgQVNDSUlM aXRlcmFsKCJyZXNvbHZlZCIpKSkpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgSlNWYWx1ZSgpKTsKKyAgICAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAg ICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5h bFByb3BlcnR5KGV4ZWMsIEFTQ0lJTGl0ZXJhbCgicmVzdWx0IiksIHByb21pc2UtPnJlc3VsdChl eGVjLT52bSgpKSkpOwotICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICByZXR1cm4gYXJy YXk7CiAgICAgICAgIGNhc2UgSlNQcm9taXNlOjpTdGF0dXM6OlJlamVjdGVkOgogICAgICAgICAg ICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVybmFs UHJvcGVydHkoZXhlYywgQVNDSUlMaXRlcmFsKCJzdGF0dXMiKSwganNOb250cml2aWFsU3RyaW5n KGV4ZWMsIEFTQ0lJTGl0ZXJhbCgicmVqZWN0ZWQiKSkpKTsKKyAgICAgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAgICAgICBzY29wZS5yZWxlYXNl KCk7CiAgICAgICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29u c3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCBBU0NJSUxpdGVyYWwoInJlc3VsdCIpLCBwcm9t aXNlLT5yZXN1bHQoZXhlYy0+dm0oKSkpKTsKLSAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgcmV0dXJuIGFycmF5OwogICAgICAgICB9CiAgICAgICAgIC8vIEZJWE1FOiA8aHR0cHM6Ly93 ZWJraXQub3JnL2IvMTQxNjY0PiBXZWIgSW5zcGVjdG9yOiBFUzY6IEltcHJvdmVkIFN1cHBvcnQg Zm9yIFByb21pc2VzIC0gUHJvbWlzZSBSZWFjdGlvbnMKLSAgICAgICAgcmV0dXJuIGFycmF5Owor ICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KIAogICAgIGlmIChK U0JvdW5kRnVuY3Rpb24qIGJvdW5kRnVuY3Rpb24gPSBqc0R5bmFtaWNDYXN0PEpTQm91bmRGdW5j dGlvbio+KHZhbHVlKSkgewpAQCAtMjg5LDkgKzI5NCwxNCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRT Y3JpcHRIb3N0OjpnZXRJbnRlcm5hCiAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0 RW1wdHlBcnJheShleGVjLCBudWxscHRyKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgSlNWYWx1ZSgpKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgInRhcmdldEZ1bmN0aW9uIiwg Ym91bmRGdW5jdGlvbi0+dGFyZ2V0RnVuY3Rpb24oKSkpOworICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgo ZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAiYm91bmRUaGlz IiwgYm91bmRGdW5jdGlvbi0+Ym91bmRUaGlzKCkpKTsKLSAgICAgICAgaWYgKGJvdW5kRnVuY3Rp b24tPmJvdW5kQXJncygpKQorICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1Zh bHVlKCkpOworICAgICAgICBpZiAoYm91bmRGdW5jdGlvbi0+Ym91bmRBcmdzKCkpIHsKKyAgICAg ICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRl eChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJib3VuZEFy Z3MiLCBib3VuZEZ1bmN0aW9uLT5ib3VuZEFyZ3MoKSkpOworICAgICAgICAgICAgcmV0dXJuIGFy cmF5OworICAgICAgICB9CiAgICAgICAgIHJldHVybiBhcnJheTsKICAgICB9CiAKQEAgLTMwMCw2 ICszMTAsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5hCiAgICAg ICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxscHRyLCAy KTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKICAgICAg ICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdEludGVybmFs UHJvcGVydHkoZXhlYywgQVNDSUlMaXRlcmFsKCJ0YXJnZXQiKSwgcHJveHktPnRhcmdldCgpKSk7 CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAg IHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgQVNDSUlMaXRlcmFsKCJoYW5k bGVyIiksIHByb3h5LT5oYW5kbGVyKCkpKTsKICAgICAgICAgcmV0dXJuIGFycmF5OwogICAgIH0K QEAgLTMxMyw2ICszMjUsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRl cm5hCiAgICAgICAgICAgICBKU0FycmF5KiBhcnJheSA9IGNvbnN0cnVjdEVtcHR5QXJyYXkoZXhl YywgbnVsbHB0ciwgMik7CiAgICAgICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBK U1ZhbHVlKCkpOwogICAgICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4 KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgImFycmF5IiwgaXRlcmF0ZWRWYWx1 ZSkpOworICAgICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsK KyAgICAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgICAgIGFycmF5LT5wdXREaXJl Y3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRlcm5hbFByb3BlcnR5KGV4ZWMsICJr aW5kIiwga2luZCkpOwogICAgICAgICAgICAgcmV0dXJuIGFycmF5OwogICAgICAgICB9CkBAIC0z MzUsNiArMzQ5LDggQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJuYQog ICAgICAgICBKU0FycmF5KiBhcnJheSA9IGNvbnN0cnVjdEVtcHR5QXJyYXkoZXhlYywgbnVsbHB0 ciwgMik7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CiAg ICAgICAgIGFycmF5LT5wdXREaXJlY3RJbmRleChleGVjLCBpbmRleCsrLCBjb25zdHJ1Y3RJbnRl cm5hbFByb3BlcnR5KGV4ZWMsICJtYXAiLCBtYXBJdGVyYXRvci0+aXRlcmF0ZWRWYWx1ZSgpKSk7 CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAg IHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGlu ZGV4KyssIGNvbnN0cnVjdEludGVybmFsUHJvcGVydHkoZXhlYywgImtpbmQiLCBqc05vbnRyaXZp YWxTdHJpbmcoZXhlYywga2luZCkpKTsKICAgICAgICAgcmV0dXJuIGFycmF5OwogICAgIH0KQEAg LTM1Niw2ICszNzIsOCBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpnZXRJbnRlcm5h CiAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1wdHlBcnJheShleGVjLCBudWxs cHRyLCAyKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsK ICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdElu dGVybmFsUHJvcGVydHkoZXhlYywgInNldCIsIHNldEl0ZXJhdG9yLT5pdGVyYXRlZFZhbHVlKCkp KTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKKyAgICAg ICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywg aW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0eShleGVjLCAia2luZCIsIGpzTm9udHJp dmlhbFN0cmluZyhleGVjLCBraW5kKSkpOwogICAgICAgICByZXR1cm4gYXJyYXk7CiAgICAgfQpA QCAtMzY0LDYgKzM4Miw3IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OmdldEludGVy bmEKICAgICAgICAgdW5zaWduZWQgaW5kZXggPSAwOwogICAgICAgICBKU0FycmF5KiBhcnJheSA9 IGNvbnN0cnVjdEVtcHR5QXJyYXkoZXhlYywgbnVsbHB0ciwgMSk7CiAgICAgICAgIFJFVFVSTl9J Rl9FWENFUFRJT04oc2NvcGUsIEpTVmFsdWUoKSk7CisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsK ICAgICAgICAgYXJyYXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGluZGV4KyssIGNvbnN0cnVjdElu dGVybmFsUHJvcGVydHkoZXhlYywgInN0cmluZyIsIHN0cmluZ0l0ZXJhdG9yLT5pdGVyYXRlZFZh bHVlKGV4ZWMpKSk7CiAgICAgICAgIHJldHVybiBhcnJheTsKICAgICB9CkBAIC0zNzIsNiArMzkx LDcgQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6Z2V0SW50ZXJuYQogICAgICAgICB1 bnNpZ25lZCBpbmRleCA9IDA7CiAgICAgICAgIEpTQXJyYXkqIGFycmF5ID0gY29uc3RydWN0RW1w dHlBcnJheShleGVjLCBudWxscHRyLCAxKTsKICAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihz Y29wZSwgSlNWYWx1ZSgpKTsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICBhcnJh eS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5kZXgrKywgY29uc3RydWN0SW50ZXJuYWxQcm9wZXJ0 eShleGVjLCAib2JqZWN0IiwgcHJvcGVydHlOYW1lSXRlcmF0b3ItPml0ZXJhdGVkVmFsdWUoKSkp OwogICAgICAgICByZXR1cm4gYXJyYXk7CiAgICAgfQpAQCAtNDM2LDYgKzQ1Niw3IEBAIEpTVmFs dWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OndlYWtNYXBFbnQKICAgICAgICAgZW50cnktPnB1dERp cmVjdChleGVjLT52bSgpLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKGV4ZWMsICJrZXkiKSwgaXQt PmtleSk7CiAgICAgICAgIGVudHJ5LT5wdXREaXJlY3QoZXhlYy0+dm0oKSwgSWRlbnRpZmllcjo6 ZnJvbVN0cmluZyhleGVjLCAidmFsdWUiKSwgaXQtPnZhbHVlLmdldCgpKTsKICAgICAgICAgYXJy YXktPnB1dERpcmVjdEluZGV4KGV4ZWMsIGZldGNoZWQrKywgZW50cnkpOworICAgICAgICBSRVRV Uk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOwogICAgICAgICBpZiAobnVtYmVyVG9G ZXRjaCAmJiBmZXRjaGVkID49IG51bWJlclRvRmV0Y2gpCiAgICAgICAgICAgICBicmVhazsKICAg ICB9CkBAIC00ODIsNiArNTAzLDcgQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6d2Vh a1NldEVudAogICAgICAgICBKU09iamVjdCogZW50cnkgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChl eGVjKTsKICAgICAgICAgZW50cnktPnB1dERpcmVjdChleGVjLT52bSgpLCBJZGVudGlmaWVyOjpm cm9tU3RyaW5nKGV4ZWMsICJ2YWx1ZSIpLCBpdC0+a2V5KTsKICAgICAgICAgYXJyYXktPnB1dERp cmVjdEluZGV4KGV4ZWMsIGZldGNoZWQrKywgZW50cnkpOworICAgICAgICBSRVRVUk5fSUZfRVhD RVBUSU9OKHNjb3BlLCBKU1ZhbHVlKCkpOwogICAgICAgICBpZiAobnVtYmVyVG9GZXRjaCAmJiBm ZXRjaGVkID49IG51bWJlclRvRmV0Y2gpCiAgICAgICAgICAgICBicmVhazsKICAgICB9CkBAIC01 NTIsNiArNTc0LDggQEAgSlNWYWx1ZSBKU0luamVjdGVkU2NyaXB0SG9zdDo6aXRlcmF0b3JFbgog ICAgICAgICBKU09iamVjdCogZW50cnkgPSBjb25zdHJ1Y3RFbXB0eU9iamVjdChleGVjKTsKICAg ICAgICAgZW50cnktPnB1dERpcmVjdChleGVjLT52bSgpLCBJZGVudGlmaWVyOjpmcm9tU3RyaW5n KGV4ZWMsICJ2YWx1ZSIpLCBuZXh0VmFsdWUpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5k ZXgoZXhlYywgaSwgZW50cnkpOworICAgICAgICBpZiAoVU5MSUtFTFkoc2NvcGUuZXhjZXB0aW9u KCkpKQorICAgICAgICAgICAgYnJlYWs7CiAgICAgfQogCiAgICAgaXRlcmF0b3JDbG9zZShleGVj LCBpdGVyYXRvcik7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSmF2 YVNjcmlwdENhbGxGcmFtZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3Jl L2luc3BlY3Rvci9KU0phdmFTY3JpcHRDYWxsRnJhbWUuY3BwCShyZXZpc2lvbiAyMDg5MDUpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0pTSmF2YVNjcmlwdENhbGxGcmFtZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEyOCw2ICsxMjgsOSBAQCBzdGF0aWMgSlNWYWx1ZSB2YWx1 ZUZvclNjb3BlTG9jYXRpb24oRXhlCiAKIEpTVmFsdWUgSlNKYXZhU2NyaXB0Q2FsbEZyYW1lOjpz Y29wZURlc2NyaXB0aW9ucyhFeGVjU3RhdGUqIGV4ZWMpCiB7CisgICAgVk0mIHZtID0gZXhlYy0+ dm0oKTsKKyAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKKwog ICAgIERlYnVnZ2VyU2NvcGUqIHNjb3BlQ2hhaW4gPSBpbXBsKCkuc2NvcGVDaGFpbigpOwogICAg IGlmICghc2NvcGVDaGFpbikKICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CkBAIC0xNDMs NiArMTQ2LDcgQEAgSlNWYWx1ZSBKU0phdmFTY3JpcHRDYWxsRnJhbWU6OnNjb3BlRGVzYwogICAg ICAgICBkZXNjcmlwdGlvbi0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXI6OmZyb21T dHJpbmcoZXhlYywgIm5hbWUiKSwganNTdHJpbmcoZXhlYywgc2NvcGUtPm5hbWUoKSkpOwogICAg ICAgICBkZXNjcmlwdGlvbi0+cHV0RGlyZWN0KGV4ZWMtPnZtKCksIElkZW50aWZpZXI6OmZyb21T dHJpbmcoZXhlYywgImxvY2F0aW9uIiksIHZhbHVlRm9yU2NvcGVMb2NhdGlvbihleGVjLCBzY29w ZS0+bG9jYXRpb24oKSkpOwogICAgICAgICBhcnJheS0+cHV0RGlyZWN0SW5kZXgoZXhlYywgaW5k ZXgrKywgZGVzY3JpcHRpb24pOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIEpTVmFsdWUoKSk7CiAgICAgfQogCiAgICAgcmV0dXJuIGFycmF5Owo=