92923 2012-08-01 17:07:16 -0700 DFG should distinguish between PutByVal's that clobber the world and ones that don't 2012-08-01 21:34:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 91933 1 fpizlo fpizlo barraclough fpizlo ggaren mhahnenberg oliver oldest_to_newest 684783 0 fpizlo 2012-08-01 17:07:16 -0700 Patch forthcoming. 684786 1 155929 fpizlo 2012-08-01 17:11:18 -0700 Created attachment 155929 the patch 684811 2 155929 mhahnenberg 2012-08-01 17:36:39 -0700 Comment on attachment 155929 the patch r=me 684850 3 fpizlo 2012-08-01 18:29:51 -0700 Landed in http://trac.webkit.org/changeset/124398 155929 2012-08-01 17:11:18 -0700 2012-08-01 17:36:39 -0700 the patch putbyvalsafe_patch_1.diff text/plain 17884 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTI0Mzg3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDEyLTA4LTAxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIHNob3VsZCBkaXN0aW5ndWlzaCBiZXR3ZWVuIFB1dEJ5VmFsJ3MgdGhhdCBjbG9iYmVyIHRo ZSB3b3JsZCBhbmQgb25lcyB0aGF0IGRvbid0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD05MjkyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgcGVyZm9ybWFuY2UtbmV1dHJhbC4gSSBhbHNvIGNv bmZpcm1lZCB0aGF0IGl0J3MgbmV1dHJhbCBpZiB3ZSBtYWtlIHRoZQorICAgICAgICBjbG9iYmVy aW5nIHZhcmlhbnQgKFB1dEJ5VmFsU2FmZSkgY2xvYmJlciBhbGwga25vd2xlZGdlIG9mIHdoYXQg aXMgYW4gYXJyYXksCisgICAgICAgIHdoaWNoIHNob3VsZCBmZWVkIG5pY2VseSBpbnRvIHdvcmsg b24gcmVtb3ZpbmcgdXNlcyBvZiBDbGFzc0luZm8uCisKKyAgICAgICAgKiBieXRlY29kZS9ERkdF eGl0UHJvZmlsZS5oOgorICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpBYnN0cmFjdFN0YXRlOjpleGVjdXRlKToKKyAgICAgICAgKiBkZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkJ5dGVDb2RlUGFyc2VyOjpw YXJzZUJsb2NrKToKKyAgICAgICAgKiBkZmcvREZHQ1NFUGhhc2UuY3BwOgorICAgICAgICAoSlND OjpERkc6OkNTRVBoYXNlOjpnZXRCeVZhbExvYWRFbGltaW5hdGlvbik6CisgICAgICAgIChKU0M6 OkRGRzo6Q1NFUGhhc2U6OmNoZWNrU3RydWN0dXJlTG9hZEVsaW1pbmF0aW9uKToKKyAgICAgICAg KEpTQzo6REZHOjpDU0VQaGFzZTo6c3RydWN0dXJlVHJhbnNpdGlvbldhdGNocG9pbnRFbGltaW5h dGlvbik6CisgICAgICAgIChKU0M6OkRGRzo6Q1NFUGhhc2U6OmdldEJ5T2Zmc2V0TG9hZEVsaW1p bmF0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpDU0VQaGFzZTo6cHV0QnlPZmZzZXRTdG9yZUVs aW1pbmF0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpDU0VQaGFzZTo6Z2V0UHJvcGVydHlTdG9y YWdlTG9hZEVsaW1pbmF0aW9uKToKKyAgICAgICAgKEpTQzo6REZHOjpDU0VQaGFzZTo6Z2V0SW5k ZXhlZFByb3BlcnR5U3RvcmFnZUxvYWRFbGltaW5hdGlvbik6CisgICAgICAgIChKU0M6OkRGRzo6 Q1NFUGhhc2U6OnBlcmZvcm1Ob2RlQ1NFKToKKyAgICAgICAgKiBkZmcvREZHRml4dXBQaGFzZS5j cHA6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBOb2RlKToKKyAgICAgICAg KiBkZmcvREZHR3JhcGguaDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFwaDo6YnlWYWxJc1B1cmUp OgorICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpjbG9iYmVyc1dvcmxkKToKKyAgICAgICAgKiBk ZmcvREZHTm9kZVR5cGUuaDoKKyAgICAgICAgKERGRyk6CisgICAgICAgICogZGZnL0RGR1ByZWRp Y3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpQcmVkaWN0aW9u UHJvcGFnYXRpb25QaGFzZTo6cHJvcGFnYXRlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRp dmVKSVQzMl82NC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3VsYXRpdmVKSVQ6OmNvbXBp bGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcDoKKyAgICAgICAgKEpT Qzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZSk6CisKIDIwMTItMDgtMDEgIFBhdHJpY2sg R2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVwbGFjZSBXVEY6Omdl dEN1cnJlbnRMb2NhbFRpbWUoKSB3aXRoIEdyZWdvcmlhbkRhdGVUaW1lOjpzZXRUb0N1cnJlbnRM b2NhbFRpbWUoKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0RGR0V4aXRQ cm9maWxlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0RG R0V4aXRQcm9maWxlLmgJKHJldmlzaW9uIDEyNDM3NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9ERkdFeGl0UHJvZmlsZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3 IEBAIGVudW0gRXhpdEtpbmQgewogICAgIEJhZENhY2hlLCAvLyBXZSBleGl0ZWQgYmVjYXVzZSBh biBpbmxpbmUgY2FjaGUgd2FzIHdyb25nLgogICAgIE92ZXJmbG93LCAvLyBXZSBleGl0ZWQgYmVj YXVzZSBvZiBvdmVyZmxvdy4KICAgICBOZWdhdGl2ZVplcm8sIC8vIFdlIGV4aXRlZCBiZWNhdXNl IHdlIGVuY291bnRlcmVkIG5lZ2F0aXZlIHplcm8uCisgICAgT3V0T2ZCb3VuZHMsIC8vIFdlIGhh ZCBhbiBvdXQtb2YtYm91bmRzIGFjY2VzcyB0byBhbiBhcnJheS4KICAgICBJbmFkZXF1YXRlQ292 ZXJhZ2UsIC8vIFdlIGV4aXRlZCBiZWNhdXNlIHdlIGVuZGVkIHVwIGluIGNvZGUgdGhhdCBkaWRu J3QgaGF2ZSBwcm9maWxpbmcgY292ZXJhZ2UuCiAgICAgQXJndW1lbnRzRXNjYXBlZCwgLy8gV2Ug ZXhpdGVkIGJlY2F1c2UgYXJndW1lbnRzIGVzY2FwZWQgYnV0IHdlIGRpZG4ndCBleHBlY3QgdGhl bSB0by4KICAgICBVbmNvdW50YWJsZSwgLy8gV2UgZXhpdGVkIGZvciBub25lIG9mIHRoZSBhYm92 ZSByZWFzb25zLCBhbmQgd2Ugc2hvdWxkIG5vdCBjb3VudCBpdC4gTW9zdCB1c2VzIG9mIHRoaXMg c2hvdWxkIGJlIHZpZXdlZCBhcyBhIEZJWE1FLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdBYnN0cmFjdFN0YXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwCShyZXZpc2lvbiAxMjQzNzYpCisrKyBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fic3RyYWN0U3RhdGUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC05NTAsNyArOTUwLDggQEAgYm9vbCBBYnN0cmFjdFN0YXRlOjpleGVjdXRlKHVuc2lnbmVk IGluZAogICAgIH0KICAgICAgICAgICAgIAogICAgIGNhc2UgUHV0QnlWYWw6Ci0gICAgY2FzZSBQ dXRCeVZhbEFsaWFzOiB7CisgICAgY2FzZSBQdXRCeVZhbEFsaWFzOgorICAgIGNhc2UgUHV0QnlW YWxTYWZlOiB7CiAgICAgICAgIG5vZGUuc2V0Q2FuRXhpdCh0cnVlKTsKIAogICAgICAgICBFZGdl IGNoaWxkMSA9IG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMCk7CkBAIC05NjYsNyArOTY3LDcg QEAgYm9vbCBBYnN0cmFjdFN0YXRlOjpleGVjdXRlKHVuc2lnbmVkIGluZAogICAgICAgICAgICAg fHwgbV9ncmFwaFtjaGlsZDFdLnNob3VsZFNwZWN1bGF0ZUFyZ3VtZW50cygpCiAjZW5kaWYKICAg ICAgICAgICAgICkgewotICAgICAgICAgICAgQVNTRVJUKG5vZGUub3AoKSA9PSBQdXRCeVZhbCk7 CisgICAgICAgICAgICBBU1NFUlQobm9kZS5vcCgpID09IFB1dEJ5VmFsIHx8IG5vZGUub3AoKSA9 PSBQdXRCeVZhbFNhZmUpOwogICAgICAgICAgICAgY2xvYmJlcldvcmxkKG5vZGUuY29kZU9yaWdp biwgaW5kZXhJbkJsb2NrKTsKICAgICAgICAgICAgIGZvck5vZGUobm9kZUluZGV4KS5tYWtlVG9w KCk7CiAgICAgICAgICAgICBicmVhazsKQEAgLTEwNTUsNyArMTA1Niw3IEBAIGJvb2wgQWJzdHJh Y3RTdGF0ZTo6ZXhlY3V0ZSh1bnNpZ25lZCBpbmQKICAgICAgICAgQVNTRVJUKG1fZ3JhcGhbY2hp bGQxXS5zaG91bGRTcGVjdWxhdGVBcnJheSgpKTsKICAgICAgICAgZm9yTm9kZShjaGlsZDEpLmZp bHRlcihTcGVjQXJyYXkpOwogICAgICAgICBmb3JOb2RlKGNoaWxkMikuZmlsdGVyKFNwZWNJbnQz Mik7Ci0gICAgICAgIGlmIChub2RlLm9wKCkgPT0gUHV0QnlWYWwpCisgICAgICAgIGlmIChub2Rl Lm9wKCkgPT0gUHV0QnlWYWxTYWZlKQogICAgICAgICAgICAgY2xvYmJlcldvcmxkKG5vZGUuY29k ZU9yaWdpbiwgaW5kZXhJbkJsb2NrKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpJbmRleDogU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAJKHJldmlz aW9uIDEyNDM3NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJz ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTUyLDEwICsyMTUyLDE0IEBAIGJvb2wgQnl0ZUNv ZGVQYXJzZXI6OnBhcnNlQmxvY2sodW5zaWduZWQKICAgICAgICAgICAgIE5vZGVJbmRleCBwcm9w ZXJ0eSA9IGdldChjdXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAg IE5vZGVJbmRleCB2YWx1ZSA9IGdldChjdXJyZW50SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kKTsK IAorICAgICAgICAgICAgYm9vbCBtYWtlU2FmZSA9CisgICAgICAgICAgICAgICAgbV9pbmxpbmVT dGFja1RvcC0+bV9wcm9maWxlZEJsb2NrLT5jb3VsZFRha2VTbG93Q2FzZShtX2N1cnJlbnRJbmRl eCkKKyAgICAgICAgICAgICAgICB8fCBtX2lubGluZVN0YWNrVG9wLT5tX2V4aXRQcm9maWxlLmhh c0V4aXRTaXRlKG1fY3VycmVudEluZGV4LCBPdXRPZkJvdW5kcyk7CisgICAgICAgICAgICAKICAg ICAgICAgICAgIGFkZFZhckFyZ0NoaWxkKGJhc2UpOwogICAgICAgICAgICAgYWRkVmFyQXJnQ2hp bGQocHJvcGVydHkpOwogICAgICAgICAgICAgYWRkVmFyQXJnQ2hpbGQodmFsdWUpOwotICAgICAg ICAgICAgYWRkVG9HcmFwaChOb2RlOjpWYXJBcmcsIFB1dEJ5VmFsLCBPcEluZm8oMCksIE9wSW5m bygwKSk7CisgICAgICAgICAgICBhZGRUb0dyYXBoKE5vZGU6OlZhckFyZywgbWFrZVNhZmUgPyBQ dXRCeVZhbFNhZmUgOiBQdXRCeVZhbCwgT3BJbmZvKDApLCBPcEluZm8oMCkpOwogCiAgICAgICAg ICAgICBORVhUX09QQ09ERShvcF9wdXRfYnlfdmFsKTsKICAgICAgICAgfQpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5jcHAJKHJldmlzaW9uIDEyNDM3NikKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ1NFUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0yODQsNyArMjg0LDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGluZGV4OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBQdXRCeVZh bDoKLSAgICAgICAgICAgIGNhc2UgUHV0QnlWYWxBbGlhczogeworICAgICAgICAgICAgY2FzZSBQ dXRCeVZhbEFsaWFzOgorICAgICAgICAgICAgY2FzZSBQdXRCeVZhbFNhZmU6IHsKICAgICAgICAg ICAgICAgICBpZiAoIW1fZ3JhcGguYnlWYWxJc1B1cmUobm9kZSkpCiAgICAgICAgICAgICAgICAg ICAgIHJldHVybiBOb05vZGU7CiAgICAgICAgICAgICAgICAgaWYgKG1fZ3JhcGgudmFyQXJnQ2hp bGQobm9kZSwgMCkgPT0gY2hpbGQxICYmIGNhbm9uaWNhbGl6ZShtX2dyYXBoLnZhckFyZ0NoaWxk KG5vZGUsIDEpKSA9PSBjYW5vbmljYWxpemUoY2hpbGQyKSkKQEAgLTM2Miw2ICszNjMsNyBAQCBw cml2YXRlOgogICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgY2FzZSBQdXRCeVZhbDoKICAg ICAgICAgICAgIGNhc2UgUHV0QnlWYWxBbGlhczoKKyAgICAgICAgICAgIGNhc2UgUHV0QnlWYWxT YWZlOgogICAgICAgICAgICAgICAgIGlmIChtX2dyYXBoLmJ5VmFsSXNQdXJlKG5vZGUpKSB7CiAg ICAgICAgICAgICAgICAgICAgIC8vIElmIFB1dEJ5VmFsIHNwZWN1bGF0ZXMgdGhhdCBpdCdzIGFj Y2Vzc2luZyBhbiBhcnJheSB3aXRoIGFuCiAgICAgICAgICAgICAgICAgICAgIC8vIGludGVnZXIg aW5kZXgsIHRoZW4gaXQncyBpbXBvc3NpYmxlIGZvciBpdCB0byBjYXVzZSBhIHN0cnVjdHVyZQpA QCAtNDA0LDYgKzQwNiw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAg ICBjYXNlIFB1dEJ5VmFsOgogICAgICAgICAgICAgY2FzZSBQdXRCeVZhbEFsaWFzOgorICAgICAg ICAgICAgY2FzZSBQdXRCeVZhbFNhZmU6CiAgICAgICAgICAgICAgICAgaWYgKG1fZ3JhcGguYnlW YWxJc1B1cmUobm9kZSkpIHsKICAgICAgICAgICAgICAgICAgICAgLy8gSWYgUHV0QnlWYWwgc3Bl Y3VsYXRlcyB0aGF0IGl0J3MgYWNjZXNzaW5nIGFuIGFycmF5IHdpdGggYW4KICAgICAgICAgICAg ICAgICAgICAgLy8gaW50ZWdlciBpbmRleCwgdGhlbiBpdCdzIGltcG9zc2libGUgZm9yIGl0IHRv IGNhdXNlIGEgc3RydWN0dXJlCkBAIC01MDcsNiArNTEwLDcgQEAgcHJpdmF0ZToKICAgICAgICAg ICAgICAgICAKICAgICAgICAgICAgIGNhc2UgUHV0QnlWYWw6CiAgICAgICAgICAgICBjYXNlIFB1 dEJ5VmFsQWxpYXM6CisgICAgICAgICAgICBjYXNlIFB1dEJ5VmFsU2FmZToKICAgICAgICAgICAg ICAgICBpZiAobV9ncmFwaC5ieVZhbElzUHVyZShub2RlKSkgewogICAgICAgICAgICAgICAgICAg ICAvLyBJZiBQdXRCeVZhbCBzcGVjdWxhdGVzIHRoYXQgaXQncyBhY2Nlc3NpbmcgYW4gYXJyYXkg d2l0aCBhbgogICAgICAgICAgICAgICAgICAgICAvLyBpbnRlZ2VyIGluZGV4LCB0aGVuIGl0J3Mg aW1wb3NzaWJsZSBmb3IgaXQgdG8gY2F1c2UgYSBzdHJ1Y3R1cmUKQEAgLTU1MSw2ICs1NTUsNyBA QCBwcml2YXRlOgogICAgICAgICAgICAgY2FzZSBQdXRCeVZhbDoKICAgICAgICAgICAgIGNhc2Ug UHV0QnlWYWxBbGlhczoKICAgICAgICAgICAgIGNhc2UgR2V0QnlWYWw6CisgICAgICAgICAgICBj YXNlIFB1dEJ5VmFsU2FmZToKICAgICAgICAgICAgICAgICBpZiAobV9ncmFwaC5ieVZhbElzUHVy ZShub2RlKSkgewogICAgICAgICAgICAgICAgICAgICAvLyBJZiBQdXRCeVZhbCBzcGVjdWxhdGVz IHRoYXQgaXQncyBhY2Nlc3NpbmcgYW4gYXJyYXkgd2l0aCBhbgogICAgICAgICAgICAgICAgICAg ICAvLyBpbnRlZ2VyIGluZGV4LCB0aGVuIGl0J3MgaW1wb3NzaWJsZSBmb3IgaXQgdG8gY2F1c2Ug YSBzdHJ1Y3R1cmUKQEAgLTYwMyw2ICs2MDgsNyBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAg IAogICAgICAgICAgICAgY2FzZSBQdXRCeVZhbDoKICAgICAgICAgICAgIGNhc2UgUHV0QnlWYWxB bGlhczoKKyAgICAgICAgICAgIGNhc2UgUHV0QnlWYWxTYWZlOgogICAgICAgICAgICAgICAgIGlm IChtX2dyYXBoLmJ5VmFsSXNQdXJlKG5vZGUpKSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIElm IFB1dEJ5VmFsIHNwZWN1bGF0ZXMgdGhhdCBpdCdzIGFjY2Vzc2luZyBhbiBhcnJheSB3aXRoIGFu CiAgICAgICAgICAgICAgICAgICAgIC8vIGludGVnZXIgaW5kZXgsIHRoZW4gaXQncyBpbXBvc3Np YmxlIGZvciBpdCB0byBjYXVzZSBhIHN0cnVjdHVyZQpAQCAtNjQzLDE1ICs2NDksNiBAQCBwcml2 YXRlOgogICAgICAgICAgICAgICAgIC8vIGNoYW5nZSB0aGUgcHJvcGVydHkgc3RvcmFnZSBwb2lu dGVyLgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIAotICAgICAgICAg ICAgY2FzZSBQdXRCeVZhbEFsaWFzOgotICAgICAgICAgICAgICAgIC8vIFB1dEJ5VmFsQWxpYXMg Y2FuJ3QgY2hhbmdlIHRoZSBpbmRleGVkIHN0b3JhZ2UgcG9pbnRlcgotICAgICAgICAgICAgICAg IGJyZWFrOwotICAgICAgICAgICAgICAgIAotICAgICAgICAgICAgY2FzZSBQdXRCeVZhbDoKLSAg ICAgICAgICAgICAgICBpZiAoaXNGaXhlZEluZGV4ZWRTdG9yYWdlT2JqZWN0U3BlY3VsYXRpb24o bV9ncmFwaFttX2dyYXBoLnZhckFyZ0NoaWxkKG5vZGUsIDApXS5wcmVkaWN0aW9uKCkpICYmIG1f Z3JhcGguYnlWYWxJc1B1cmUobm9kZSkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAg ICAgICAgICAgICAgIHJldHVybiBOb05vZGU7Ci0KICAgICAgICAgICAgIGRlZmF1bHQ6CiAgICAg ICAgICAgICAgICAgaWYgKG1fZ3JhcGguY2xvYmJlcnNXb3JsZChpbmRleCkpCiAgICAgICAgICAg ICAgICAgICAgIHJldHVybiBOb05vZGU7CkBAIC0xMDkzLDcgKzEwOTAsOCBAQCBwcml2YXRlOgog ICAgICAgICAgICAgICAgIHNldFJlcGxhY2VtZW50KGdldEJ5VmFsTG9hZEVsaW1pbmF0aW9uKG5v ZGUuY2hpbGQxKCkuaW5kZXgoKSwgbm9kZS5jaGlsZDIoKS5pbmRleCgpKSk7CiAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIAotICAgICAgICBjYXNlIFB1dEJ5VmFsOiB7CisgICAgICAg IGNhc2UgUHV0QnlWYWw6CisgICAgICAgIGNhc2UgUHV0QnlWYWxTYWZlOiB7CiAgICAgICAgICAg ICBFZGdlIGNoaWxkMSA9IG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMCk7CiAgICAgICAgICAg ICBFZGdlIGNoaWxkMiA9IG1fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMSk7CiAgICAgICAgICAg ICBpZiAoaXNBY3Rpb25hYmxlTXV0YWJsZUFycmF5U3BlY3VsYXRpb24obV9ncmFwaFtjaGlsZDFd LnByZWRpY3Rpb24oKSkKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQ aGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1 cFBoYXNlLmNwcAkocmV2aXNpb24gMTI0Mzc2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdGaXh1cFBoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzE0LDcgKzMxNCw4IEBAIHBy aXZhdGU6CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCi0gICAg ICAgIGNhc2UgUHV0QnlWYWw6IHsKKyAgICAgICAgY2FzZSBQdXRCeVZhbDoKKyAgICAgICAgY2Fz ZSBQdXRCeVZhbFNhZmU6IHsKICAgICAgICAgICAgIEVkZ2UgY2hpbGQxID0gbV9ncmFwaC52YXJB cmdDaGlsZChub2RlLCAwKTsKICAgICAgICAgICAgIEVkZ2UgY2hpbGQyID0gbV9ncmFwaC52YXJB cmdDaGlsZChub2RlLCAxKTsKICAgICAgICAgICAgIEVkZ2UgY2hpbGQzID0gbV9ncmFwaC52YXJB cmdDaGlsZChub2RlLCAyKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3Jh cGguaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgJ KHJldmlzaW9uIDEyNDM3NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGgu aAkod29ya2luZyBjb3B5KQpAQCAtNDc5LDYgKzQ3OSwxNSBAQCBwdWJsaWM6CiAgICAgICAgICAg ICBTcGVjdWxhdGVkVHlwZSBwcmVkaWN0aW9uID0gYXQodmFyQXJnQ2hpbGQobm9kZSwgMCkpLnBy ZWRpY3Rpb24oKTsKICAgICAgICAgICAgIGlmICghaXNBY3Rpb25hYmxlTXV0YWJsZUFycmF5U3Bl Y3VsYXRpb24ocHJlZGljdGlvbikpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAgICAgIAorICAgICAgICBj YXNlIFB1dEJ5VmFsU2FmZTogeworICAgICAgICAgICAgaWYgKCFhdCh2YXJBcmdDaGlsZChub2Rl LCAxKSkuc2hvdWxkU3BlY3VsYXRlSW50ZWdlcigpKQorICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgIFNwZWN1bGF0ZWRUeXBlIHByZWRpY3Rpb24gPSBhdCh2YXJBcmdD aGlsZChub2RlLCAwKSkucHJlZGljdGlvbigpOworICAgICAgICAgICAgaWYgKCFpc0FjdGlvbmFi bGVNdXRhYmxlQXJyYXlTcGVjdWxhdGlvbihwcmVkaWN0aW9uKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgICAgICAgICBpZiAoaXNBcnJheVNwZWN1bGF0aW9uKHByZWRpY3Rp b24pKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIHJldHVybiB0 cnVlOwpAQCAtNTI0LDYgKzUzMyw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybiAhaXNQ cmVkaWN0ZWROdW1lcmljYWwobm9kZSk7CiAgICAgICAgIGNhc2UgR2V0QnlWYWw6CiAgICAgICAg IGNhc2UgUHV0QnlWYWw6CisgICAgICAgIGNhc2UgUHV0QnlWYWxTYWZlOgogICAgICAgICBjYXNl IFB1dEJ5VmFsQWxpYXM6CiAgICAgICAgICAgICByZXR1cm4gIWJ5VmFsSXNQdXJlKG5vZGUpOwog ICAgICAgICBkZWZhdWx0OgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2Rl VHlwZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZVR5 cGUuaAkocmV2aXNpb24gMTI0Mzc2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdO b2RlVHlwZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMsNiArMTEzLDcgQEAgbmFtZXNwYWNlIEpT QyB7IG5hbWVzcGFjZSBERkcgewogICAgIC8qIG9wY29kZXMgdXNlIFZhckFyZ3MgYmVhdXNlIHRo ZXkgbWF5IGhhdmUgdXAgdG8gNCBjaGlsZHJlbi4gKi9cCiAgICAgbWFjcm8oR2V0QnlWYWwsIE5v ZGVSZXN1bHRKUyB8IE5vZGVNdXN0R2VuZXJhdGUgfCBOb2RlTWlnaHRDbG9iYmVyKSBcCiAgICAg bWFjcm8oUHV0QnlWYWwsIE5vZGVNdXN0R2VuZXJhdGUgfCBOb2RlSGFzVmFyQXJncyB8IE5vZGVN aWdodENsb2JiZXIpIFwKKyAgICBtYWNybyhQdXRCeVZhbFNhZmUsIE5vZGVNdXN0R2VuZXJhdGUg fCBOb2RlSGFzVmFyQXJncyB8IE5vZGVNaWdodENsb2JiZXIpIFwKICAgICBtYWNybyhQdXRCeVZh bEFsaWFzLCBOb2RlTXVzdEdlbmVyYXRlIHwgTm9kZUhhc1ZhckFyZ3MgfCBOb2RlTWlnaHRDbG9i YmVyKSBcCiAgICAgbWFjcm8oR2V0QnlJZCwgTm9kZVJlc3VsdEpTIHwgTm9kZU11c3RHZW5lcmF0 ZSB8IE5vZGVDbG9iYmVyc1dvcmxkKSBcCiAgICAgbWFjcm8oR2V0QnlJZEZsdXNoLCBOb2RlUmVz dWx0SlMgfCBOb2RlTXVzdEdlbmVyYXRlIHwgTm9kZUNsb2JiZXJzV29ybGQpIFwKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblByb3BhZ2F0aW9uUGhhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHUHJlZGljdGlvblBy b3BhZ2F0aW9uUGhhc2UuY3BwCShyZXZpc2lvbiAxMjQzNzYpCisrKyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR1ByZWRpY3Rpb25Qcm9wYWdhdGlvblBoYXNlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtNjM3LDYgKzYzNyw3IEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICAgICAgCiAgICAg ICAgIGNhc2UgUHV0QnlWYWw6CisgICAgICAgIGNhc2UgUHV0QnlWYWxTYWZlOgogICAgICAgICAg ICAgY2hhbmdlZCB8PSBtX2dyYXBoW21fZ3JhcGgudmFyQXJnQ2hpbGQobm9kZSwgMCldLm1lcmdl RmxhZ3MoTm9kZVVzZWRBc1ZhbHVlKTsKICAgICAgICAgICAgIGNoYW5nZWQgfD0gbV9ncmFwaFtt X2dyYXBoLnZhckFyZ0NoaWxkKG5vZGUsIDEpXS5tZXJnZUZsYWdzKE5vZGVVc2VkQXNOdW1iZXIg fCBOb2RlVXNlZEFzSW50KTsKICAgICAgICAgICAgIGNoYW5nZWQgfD0gbV9ncmFwaFttX2dyYXBo LnZhckFyZ0NoaWxkKG5vZGUsIDIpXS5tZXJnZUZsYWdzKE5vZGVVc2VkQXNWYWx1ZSk7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUMzJfNjQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQz Ml82NC5jcHAJKHJldmlzaW9uIDEyNDM3NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQzMl82NC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0ODMsNyArMjQ4 Myw4IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAgICAg YnJlYWs7CiAgICAgfQogCi0gICAgY2FzZSBQdXRCeVZhbDogeworICAgIGNhc2UgUHV0QnlWYWw6 CisgICAgY2FzZSBQdXRCeVZhbFNhZmU6IHsKICAgICAgICAgRWRnZSBjaGlsZDEgPSBtX2ppdC5n cmFwaCgpLnZhckFyZ0NoaWxkKG5vZGUsIDApOwogICAgICAgICBFZGdlIGNoaWxkMiA9IG1faml0 LmdyYXBoKCkudmFyQXJnQ2hpbGQobm9kZSwgMSk7CiAgICAgICAgIEVkZ2UgY2hpbGQzID0gbV9q aXQuZ3JhcGgoKS52YXJBcmdDaGlsZChub2RlLCAyKTsKQEAgLTI1OTksMTIgKzI2MDAsMTQgQEAg dm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAgICAgICBpZiAoIWlz QXJyYXlTcGVjdWxhdGlvbihtX3N0YXRlLmZvck5vZGUoY2hpbGQxKS5tX3R5cGUpKQogICAgICAg ICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlU291cmNlOjp1bmJveGVkQ2Vs bChiYXNlUmVnKSwgY2hpbGQxLCBtX2ppdC5icmFuY2hQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVx dWFsLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0NlbGw6OmNsYXNzSW5mb09m ZnNldCgpKSwgTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJkpTQXJyYXk6OnNfaW5mbykp KTsKIAorICAgICAgICBNYWNyb0Fzc2VtYmxlcjo6SnVtcCBiZXlvbmRBcnJheUJvdW5kcyA9IG1f aml0LmJyYW5jaDMyKE1hY3JvQXNzZW1ibGVyOjpBYm92ZU9yRXF1YWwsIHByb3BlcnR5UmVnLCBN YWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0FycmF5Ojp2ZWN0b3JMZW5ndGhPZmZz ZXQoKSkpOworICAgICAgICBpZiAobm9kZS5vcCgpID09IFB1dEJ5VmFsKQorICAgICAgICAgICAg c3BlY3VsYXRpb25DaGVjayhPdXRPZkJvdW5kcywgSlNWYWx1ZVJlZ3MoKSwgTm9Ob2RlLCBiZXlv bmRBcnJheUJvdW5kcyk7CisKICAgICAgICAgYmFzZS51c2UoKTsKICAgICAgICAgcHJvcGVydHku dXNlKCk7CiAgICAgICAgIHZhbHVlLnVzZSgpOwogICAgICAgICAKLSAgICAgICAgTWFjcm9Bc3Nl bWJsZXI6Okp1bXAgYmV5b25kQXJyYXlCb3VuZHMgPSBtX2ppdC5icmFuY2gzMihNYWNyb0Fzc2Vt Ymxlcjo6QWJvdmVPckVxdWFsLCBwcm9wZXJ0eVJlZywgTWFjcm9Bc3NlbWJsZXI6OkFkZHJlc3Mo YmFzZVJlZywgSlNBcnJheTo6dmVjdG9yTGVuZ3RoT2Zmc2V0KCkpKTsKLQogICAgICAgICAvLyBH ZXQgdGhlIGFycmF5IHN0b3JhZ2UuCiAgICAgICAgIEdQUlJlZyBzdG9yYWdlUmVnID0gc2NyYXRj aFJlZzsKICAgICAgICAgbV9qaXQubG9hZFB0cihNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNl UmVnLCBKU0FycmF5OjpzdG9yYWdlT2Zmc2V0KCkpLCBzdG9yYWdlUmVnKTsKQEAgLTI2MjYsMTIg KzI2MjksMTQgQEAgdm9pZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZShOb2RlJiBub2RlKQogICAg ICAgICBtX2ppdC5zdG9yZTMyKHZhbHVlVGFnUmVnLCBNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4 KHN0b3JhZ2VSZWcsIHByb3BlcnR5UmVnLCBNYWNyb0Fzc2VtYmxlcjo6VGltZXNFaWdodCwgT0JK RUNUX09GRlNFVE9GKEFycmF5U3RvcmFnZSwgbV92ZWN0b3JbMF0pICsgT0JKRUNUX09GRlNFVE9G KEpTVmFsdWUsIHUuYXNCaXRzLnRhZykpKTsKICAgICAgICAgbV9qaXQuc3RvcmUzMih2YWx1ZVBh eWxvYWRSZWcsIE1hY3JvQXNzZW1ibGVyOjpCYXNlSW5kZXgoc3RvcmFnZVJlZywgcHJvcGVydHlS ZWcsIE1hY3JvQXNzZW1ibGVyOjpUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9y YWdlLCBtX3ZlY3RvclswXSkgKyBPQkpFQ1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMucGF5 bG9hZCkpKTsKICAgICAgICAgCi0gICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAotICAgICAg ICAgICAgc2xvd1BhdGhDYWxsKAotICAgICAgICAgICAgICAgIGJleW9uZEFycmF5Qm91bmRzLCB0 aGlzLAotICAgICAgICAgICAgICAgIG1faml0LmNvZGVCbG9jaygpLT5pc1N0cmljdE1vZGUoKSA/ IG9wZXJhdGlvblB1dEJ5VmFsQmV5b25kQXJyYXlCb3VuZHNTdHJpY3QgOiBvcGVyYXRpb25QdXRC eVZhbEJleW9uZEFycmF5Qm91bmRzTm9uU3RyaWN0LAotICAgICAgICAgICAgICAgIE5vUmVzdWx0 LCBiYXNlUmVnLCBwcm9wZXJ0eVJlZywgdmFsdWVUYWdSZWcsIHZhbHVlUGF5bG9hZFJlZykpOwot CisgICAgICAgIGlmIChub2RlLm9wKCkgPT0gUHV0QnlWYWxTYWZlKSB7CisgICAgICAgICAgICBh ZGRTbG93UGF0aEdlbmVyYXRvcigKKyAgICAgICAgICAgICAgICBzbG93UGF0aENhbGwoCisgICAg ICAgICAgICAgICAgICAgIGJleW9uZEFycmF5Qm91bmRzLCB0aGlzLAorICAgICAgICAgICAgICAg ICAgICBtX2ppdC5jb2RlQmxvY2soKS0+aXNTdHJpY3RNb2RlKCkgPyBvcGVyYXRpb25QdXRCeVZh bEJleW9uZEFycmF5Qm91bmRzU3RyaWN0IDogb3BlcmF0aW9uUHV0QnlWYWxCZXlvbmRBcnJheUJv dW5kc05vblN0cmljdCwKKyAgICAgICAgICAgICAgICAgICAgTm9SZXN1bHQsIGJhc2VSZWcsIHBy b3BlcnR5UmVnLCB2YWx1ZVRhZ1JlZywgdmFsdWVQYXlsb2FkUmVnKSk7CisgICAgICAgIH0KKyAg ICAgICAgICAgIAogICAgICAgICBub1Jlc3VsdChtX2NvbXBpbGVJbmRleCwgVXNlQ2hpbGRyZW5D YWxsZWRFeHBsaWNpdGx5KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQpJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVDY0LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklUNjQuY3BwCShyZXZpc2lv biAxMjQzNzYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklU NjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTA4LDcgKzI1MDgsOCBAQCB2b2lkIFNwZWN1bGF0 aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAg IGNhc2UgUHV0QnlWYWw6IHsKKyAgICBjYXNlIFB1dEJ5VmFsOgorICAgIGNhc2UgUHV0QnlWYWxT YWZlOiB7CiAgICAgICAgIEVkZ2UgY2hpbGQxID0gbV9qaXQuZ3JhcGgoKS52YXJBcmdDaGlsZChu b2RlLCAwKTsKICAgICAgICAgRWRnZSBjaGlsZDIgPSBtX2ppdC5ncmFwaCgpLnZhckFyZ0NoaWxk KG5vZGUsIDEpOwogICAgICAgICBFZGdlIGNoaWxkMyA9IG1faml0LmdyYXBoKCkudmFyQXJnQ2hp bGQobm9kZSwgMik7CkBAIC0yNjc1LDEzICsyNjc2LDE1IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGUoTm9kZSYgbm9kZSkKICAgICAgICAgLy8gSWYgd2UgaGF2ZSBwcmVkaWN0ZWQgdGhl IGJhc2UgdG8gYmUgdHlwZSBhcnJheSwgd2UgY2FuIHNraXAgdGhlIGNoZWNrLgogICAgICAgICBp ZiAoIWlzQXJyYXlTcGVjdWxhdGlvbihtX3N0YXRlLmZvck5vZGUoY2hpbGQxKS5tX3R5cGUpKQog ICAgICAgICAgICAgc3BlY3VsYXRpb25DaGVjayhCYWRUeXBlLCBKU1ZhbHVlUmVncyhiYXNlUmVn KSwgY2hpbGQxLCBtX2ppdC5icmFuY2hQdHIoTWFjcm9Bc3NlbWJsZXI6Ok5vdEVxdWFsLCBNYWNy b0Fzc2VtYmxlcjo6QWRkcmVzcyhiYXNlUmVnLCBKU0NlbGw6OmNsYXNzSW5mb09mZnNldCgpKSwg TWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJkpTQXJyYXk6OnNfaW5mbykpKTsKKyAgICAg ICAgCisgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wIGJleW9uZEFycmF5Qm91bmRzID0gbV9q aXQuYnJhbmNoMzIoTWFjcm9Bc3NlbWJsZXI6OkFib3ZlT3JFcXVhbCwgcHJvcGVydHlSZWcsIE1h Y3JvQXNzZW1ibGVyOjpBZGRyZXNzKGJhc2VSZWcsIEpTQXJyYXk6OnZlY3Rvckxlbmd0aE9mZnNl dCgpKSk7CisgICAgICAgIGlmIChub2RlLm9wKCkgPT0gUHV0QnlWYWwpCisgICAgICAgICAgICBz cGVjdWxhdGlvbkNoZWNrKE91dE9mQm91bmRzLCBKU1ZhbHVlUmVncygpLCBOb05vZGUsIGJleW9u ZEFycmF5Qm91bmRzKTsKIAogICAgICAgICBiYXNlLnVzZSgpOwogICAgICAgICBwcm9wZXJ0eS51 c2UoKTsKICAgICAgICAgdmFsdWUudXNlKCk7CiAgICAgICAgIAotICAgICAgICBNYWNyb0Fzc2Vt Ymxlcjo6SnVtcCBiZXlvbmRBcnJheUJvdW5kcyA9IG1faml0LmJyYW5jaDMyKE1hY3JvQXNzZW1i bGVyOjpBYm92ZU9yRXF1YWwsIHByb3BlcnR5UmVnLCBNYWNyb0Fzc2VtYmxlcjo6QWRkcmVzcyhi YXNlUmVnLCBKU0FycmF5Ojp2ZWN0b3JMZW5ndGhPZmZzZXQoKSkpOwotCiAgICAgICAgIC8vIEdl dCB0aGUgYXJyYXkgc3RvcmFnZS4KICAgICAgICAgR1BSUmVnIHN0b3JhZ2VSZWcgPSBzY3JhdGNo UmVnOwogICAgICAgICBtX2ppdC5sb2FkUHRyKE1hY3JvQXNzZW1ibGVyOjpBZGRyZXNzKGJhc2VS ZWcsIEpTQXJyYXk6OnN0b3JhZ2VPZmZzZXQoKSksIHN0b3JhZ2VSZWcpOwpAQCAtMjcwMiwxMSAr MjcwNSwxMyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlKE5vZGUmIG5vZGUpCiAgICAg ICAgIC8vIFN0b3JlIHRoZSB2YWx1ZSB0byB0aGUgYXJyYXkuCiAgICAgICAgIG1faml0LnN0b3Jl UHRyKHZhbHVlUmVnLCBNYWNyb0Fzc2VtYmxlcjo6QmFzZUluZGV4KHN0b3JhZ2VSZWcsIHByb3Bl cnR5UmVnLCBNYWNyb0Fzc2VtYmxlcjo6U2NhbGVQdHIsIE9CSkVDVF9PRkZTRVRPRihBcnJheVN0 b3JhZ2UsIG1fdmVjdG9yWzBdKSkpOwogCi0gICAgICAgIGFkZFNsb3dQYXRoR2VuZXJhdG9yKAot ICAgICAgICAgICAgc2xvd1BhdGhDYWxsKAotICAgICAgICAgICAgICAgIGJleW9uZEFycmF5Qm91 bmRzLCB0aGlzLAotICAgICAgICAgICAgICAgIG1faml0LmNvZGVCbG9jaygpLT5pc1N0cmljdE1v ZGUoKSA/IG9wZXJhdGlvblB1dEJ5VmFsQmV5b25kQXJyYXlCb3VuZHNTdHJpY3QgOiBvcGVyYXRp b25QdXRCeVZhbEJleW9uZEFycmF5Qm91bmRzTm9uU3RyaWN0LAotICAgICAgICAgICAgICAgIE5v UmVzdWx0LCBiYXNlUmVnLCBwcm9wZXJ0eVJlZywgdmFsdWVSZWcpKTsKKyAgICAgICAgaWYgKG5v ZGUub3AoKSA9PSBQdXRCeVZhbFNhZmUpIHsKKyAgICAgICAgICAgIGFkZFNsb3dQYXRoR2VuZXJh dG9yKAorICAgICAgICAgICAgICAgIHNsb3dQYXRoQ2FsbCgKKyAgICAgICAgICAgICAgICAgICAg YmV5b25kQXJyYXlCb3VuZHMsIHRoaXMsCisgICAgICAgICAgICAgICAgICAgIG1faml0LmNvZGVC bG9jaygpLT5pc1N0cmljdE1vZGUoKSA/IG9wZXJhdGlvblB1dEJ5VmFsQmV5b25kQXJyYXlCb3Vu ZHNTdHJpY3QgOiBvcGVyYXRpb25QdXRCeVZhbEJleW9uZEFycmF5Qm91bmRzTm9uU3RyaWN0LAor ICAgICAgICAgICAgICAgICAgICBOb1Jlc3VsdCwgYmFzZVJlZywgcHJvcGVydHlSZWcsIHZhbHVl UmVnKSk7CisgICAgICAgIH0KIAogICAgICAgICBub1Jlc3VsdChtX2NvbXBpbGVJbmRleCwgVXNl Q2hpbGRyZW5DYWxsZWRFeHBsaWNpdGx5KTsKICAgICAgICAgYnJlYWs7Cg==