121202 2013-09-11 19:18:34 -0700 FixupPhase's setUseKindAndUnboxBlahbittyblah and fixDoubleEdge methods should be merged and given intuitive names 2013-09-11 21:47:35 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 121064 1 fpizlo fpizlo barraclough ggaren mark.lam mhahnenberg msaboff oliver sam oldest_to_newest 928099 0 fpizlo 2013-09-11 19:18:34 -0700 Patch forthcoming. 928104 1 211384 fpizlo 2013-09-11 19:22:11 -0700 Created attachment 211384 the patch 928115 2 211384 ggaren 2013-09-11 19:55:48 -0700 Comment on attachment 211384 the patch r=me 928141 3 fpizlo 2013-09-11 21:47:35 -0700 Landed in http://trac.webkit.org/changeset/155590 211384 2013-09-11 19:22:11 -0700 2013-09-11 19:55:48 -0700 the patch blah.patch text/plain 35876 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTU1NTg1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBA CisyMDEzLTA5LTExICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Rml4dXBQaGFzZSdzIHNldFVzZUtpbmRBbmRVbmJveEJsYWhiaXR0eWJsYWggYW5kIGZpeERvdWJs ZUVkZ2UgbWV0aG9kcyBzaG91bGQgYmUgbWVyZ2VkIGFuZCBnaXZlbiBpbnR1aXRpdmUgbmFtZXMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTIwMgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAg R290IHJpZCBvZiBhIG1ldGhvZCB3aG9zZSBuYW1lIHdhcyBzbyBkZXNjcmlwdGl2ZSB0aGF0IEkg Y291bGRuJ3QgZXZlciByZW1lbWJlcgorICAgICAgICBpdC4gQW5kIGRlc3BpdGUgdGhlIGRlc2Ny aXB0aXZlIG5hbWUsIEkgYWx3YXlzIGhhZCB0byBsb29rIGF0IGl0cyBpbXBsZW1lbnRhdGlvbgor ICAgICAgICB0byByZW1pbmQgbXlzZWxmIHdoYXQgaXQgZGlkLCBhbnl3YXkuCisgICAgICAgIAor ICAgICAgICBOb3cgdGhhdCBtZXRob2QgaXMgY2FsbGVkIGZpeEVkZ2UoKS4gVGhpcyBpcyBhIGdv b2QgbmFtZSBiZWNhdXNlIHdlJ3JlIGluIGEgcGhhc2UKKyAgICAgICAgY2FsbGVkIEZpeHVwUGhh c2UsIGFuZCB3ZSBjYWxsIHRoaXMgZml4RWRnZSgpIG1ldGhvZCBvbiBwcmV0dHkgbXVjaCBldmVy eSBlZGdlLgorICAgICAgICBGb3IgdGhlIEludDQ4IHdvcmssIGl0IG1ha2VzIG1vcmUgc2Vuc2Ug Zm9yIHRoaXMgbWV0aG9kIHRvIGJlIGEga2luZCBvZiBob29rIGludG8KKyAgICAgICAgd2hpY2gg d2UgY2FuIHBsYWNlIHZhcmlvdXMgdGhpbmdzOiBpdCdzIGp1c3QgYSB3YXkgb2Ygb2JzZXJ2aW5n IGVkZ2VzIHRoYXQgbmVlZAorICAgICAgICBhdHRlbnRpb24uCisgICAgICAgIAorICAgICAgICBB cyBwYXJ0IG9mIHRoaXMgcmVmYWN0b3JpbmcsIEkgYWxzbyBmb2xkIGZpeERvdWJsZUVkZ2UgaW50 byBmaXhFZGdlLiBUaGlzIG1ha2VzCisgICAgICAgIHNlbnNlIGJlY2F1c2UgcHJldmlvdXNseSBp dCB3YXMgbmV2ZXIgY29ycmVjdCB0byBjYWxsIGZpeERvdWJsZUVkZ2Ugd2l0aCBub24tCisgICAg ICAgIGRvdWJsZSB1c2Uga2luZHM7IGFuZCBjb252ZXJzZWx5IGl0IHdhcyBuZXZlciBjb3JyZWN0 IHRvIGNhbGwgZml4RWRnZSB3aXRoIGRvdWJsZQorICAgICAgICB1c2Uga2luZHMuCisgICAgICAg IAorICAgICAgICBBbHNvIEkgZm91bmQgdGhhdCBpc0RvdWJsZSgpIGluIERGR1VzZUtpbmQuaCB3 b3VsZCByZXR1cm4gdHJ1ZSBmb3IgS25vd25JbnQzMlVzZS4KKyAgICAgICAgVGhhdCdzIGFsbW9z dCBjZXJ0YWlubHkgd3JvbmcsIGFuZCByZW1vdmluZyB0aGF0IGJlaGF2aW9yIGRvZXNuJ3QgZmFp bCBhbnkgdGVzdHMuCisgICAgICAgIEknbSBhc3N1bWluZyB0aGF0IHdhcyBqdXN0IGEgYnVnLgor CisgICAgICAgICogZGZnL0RGR0ZpeHVwUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkZp eHVwUGhhc2U6OmZpeHVwTm9kZSk6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4 dXBUb1ByaW1pdGl2ZSk6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBUb1N0 cmluZyk6CisgICAgICAgIChKU0M6OkRGRzo6Rml4dXBQaGFzZTo6Zml4dXBTZXRMb2NhbHNJbkJs b2NrKToKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXhFZGdlKToKKyAgICAgICAg KEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXhJbnRFZGdlKToKKyAgICAgICAgKEpTQzo6REZHOjpG aXh1cFBoYXNlOjphdHRlbXB0VG9NYWtlSW50ZWdlckFkZCk6CisgICAgICAgIChKU0M6OkRGRzo6 Rml4dXBQaGFzZTo6Y29udmVydFRvR2V0QXJyYXlMZW5ndGgpOgorICAgICAgICAoSlNDOjpERkc6 OkZpeHVwUGhhc2U6OmF0dGVtcHRUb01ha2VHZXRUeXBlZEFycmF5Qnl0ZU9mZnNldCk6CisgICAg ICAgICogZGZnL0RGR1VzZUtpbmQuaDoKKyAgICAgICAgKEpTQzo6REZHOjppc0RvdWJsZSk6CisK IDIwMTMtMDktMTEgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxlLmNvbT4KIAogICAgICAgICBS ZW1vdmUgbmVlZHNEYXRhRm9ybWF0Q29udmVyc2lvbiBiZWNhdXNlIGl0IGlzIHVudXNlZC4KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAkocmV2aXNp b24gMTU1NTc0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDcgKzEwOCw3IEBAIHByaXZhdGU6CiAgICAgICAgIH0K ICAgICAgICAgICAgIAogICAgICAgICBjYXNlIFVJbnQzMlRvTnVtYmVyOiB7Ci0gICAgICAgICAg ICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25JbnQzMlVzZT4obm9kZS0+Y2hp bGQxKCkpOworICAgICAgICAgICAgZml4RWRnZTxLbm93bkludDMyVXNlPihub2RlLT5jaGlsZDEo KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC0xMTks MjIgKzExOSwyMiBAQCBwcml2YXRlOgogICAgICAgICAgICAgCiAgICAgICAgIGNhc2UgVmFsdWVU b0ludDMyOiB7CiAgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0 ZUludDMyKCkpIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFi bGU8SW50MzJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPElu dDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgbm9kZS0+c2V0T3BBbmRE ZWZhdWx0RmxhZ3MoSWRlbnRpdHkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3Vs ZFNwZWN1bGF0ZU51bWJlcigpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94 SWZQcm9maXRhYmxlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAg IGZpeEVkZ2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAKICAgICAgICAgICAgIGlmIChub2RlLT5j aGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlQm9vbGVhbigpKSB7Ci0gICAgICAgICAgICAgICAgc2V0 VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMSgpKTsK KyAgICAgICAgICAgICAgICBmaXhFZGdlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAotICAgICAg ICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPE5vdENlbGxVc2U+KG5vZGUtPmNo aWxkMSgpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8Tm90Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkp OwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtMTQ3LDgg KzE0Nyw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBpZiAoYXR0ZW1wdFRvTWFrZUludGVnZXJB ZGQobm9kZSkpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBpZiAoTm9kZTo6 c2hvdWxkU3BlY3VsYXRlTnVtYmVyRXhwZWN0aW5nRGVmaW5lZChub2RlLT5jaGlsZDEoKS5ub2Rl KCksIG5vZGUtPmNoaWxkMigpLm5vZGUoKSkpIHsKLSAgICAgICAgICAgICAgICBmaXhEb3VibGVF ZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgIGZpeERvdWJs ZUVkZ2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAgZml4RWRn ZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPE51 bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgfQogICAgICAgICAgICAgCkBAIC0xODcsMjggKzE4NywyOCBAQCBwcml2YXRlOgogICAg ICAgICBjYXNlIEFyaXRoU3ViOiB7CiAgICAgICAgICAgICBpZiAoYXR0ZW1wdFRvTWFrZUludGVn ZXJBZGQobm9kZSkpCiAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBmaXhEb3Vi bGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgZml4RG91Ymxl RWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8TnVt YmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51bWJlclVzZT4o bm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAg ICAgIAogICAgICAgICBjYXNlIEFyaXRoTmVnYXRlOiB7CiAgICAgICAgICAgICBpZiAobV9ncmFw aC5uZWdhdGVTaG91bGRTcGVjdWxhdGVJbnQzMihub2RlKSkgewotICAgICAgICAgICAgICAgIHNl dFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOwor ICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGZpeERvdWJsZUVk Z2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51bWJl clVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgICAgICBjYXNlIEFyaXRoTXVsOiB7CiAgICAgICAgICAgICBpZiAobV9n cmFwaC5tdWxTaG91bGRTcGVjdWxhdGVJbnQzMihub2RlKSkgewotICAgICAgICAgICAgICAgIHNl dFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOwot ICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4o bm9kZS0+Y2hpbGQyKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KG5vZGUt PmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGls ZDIoKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICBmaXhEb3VibGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAg Zml4RG91YmxlRWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgIGZp eEVkZ2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51 bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0K IApAQCAtMjE3LDggKzIxNyw4IEBAIHByaXZhdGU6CiAgICAgICAgICAgICBpZiAoTm9kZTo6c2hv dWxkU3BlY3VsYXRlSW50MzJGb3JBcml0aG1ldGljKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9k ZS0+Y2hpbGQyKCkubm9kZSgpKQogICAgICAgICAgICAgICAgICYmIG5vZGUtPmNhblNwZWN1bGF0 ZUludDMyKCkpIHsKICAgICAgICAgICAgICAgICBpZiAoaXNYODYoKSB8fCBpc0FSTXY3cygpKSB7 Ci0gICAgICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQz MlVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5k VW5ib3hJZlByb2ZpdGFibGU8SW50MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAg ICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAg ICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpbmplY3RJ bnQzMlRvRG91YmxlTm9kZShub2RlLT5jaGlsZDEoKSk7CkBAIC0yMzMsOCArMjMzLDggQEAgcHJp dmF0ZToKICAgICAgICAgICAgICAgICBub2RlLT5jaGlsZHJlbi5pbml0aWFsaXplKEVkZ2UobmV3 RGl2aXNpb24sIEtub3duTnVtYmVyVXNlKSwgRWRnZSgpLCBFZGdlKCkpOwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgZml4RG91YmxlRWRnZTxOdW1i ZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgICAgIGZpeERvdWJsZUVkZ2U8TnVtYmVy VXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51bWJlclVzZT4obm9k ZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgZml4RWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxk MigpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgICAgICAKQEAgLTI0 Miw0NyArMjQyLDQ3IEBAIHByaXZhdGU6CiAgICAgICAgIGNhc2UgQXJpdGhNYXg6IHsKICAgICAg ICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxhdGVJbnQzMkZvckFyaXRobWV0aWMobm9kZS0+ Y2hpbGQxKCkubm9kZSgpLCBub2RlLT5jaGlsZDIoKS5ub2RlKCkpCiAgICAgICAgICAgICAgICAg JiYgbm9kZS0+Y2FuU3BlY3VsYXRlSW50MzIoKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtp bmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAg ICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+ Y2hpbGQyKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KG5vZGUtPmNoaWxk MSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGlsZDIoKSk7 CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBmaXhE b3VibGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgZml4RG91 YmxlRWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8 TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51bWJlclVz ZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAg ICAgICAgIAogICAgICAgICBjYXNlIEFyaXRoQWJzOiB7CiAgICAgICAgICAgICBpZiAobm9kZS0+ Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUludDMyRm9yQXJpdGhtZXRpYygpCiAgICAgICAgICAg ICAgICAgJiYgbm9kZS0+Y2FuU3BlY3VsYXRlSW50MzIoKSkgewotICAgICAgICAgICAgICAgIHNl dFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOwor ICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGZpeERvdWJsZUVk Z2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPE51bWJl clVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAg ICAgICAgICAgIAogICAgICAgICBjYXNlIEFyaXRoU3FydDogewotICAgICAgICAgICAgZml4RG91 YmxlRWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8 TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogICAgICAgICAgICAgCiAgICAgICAgIGNhc2UgTG9naWNhbE5vdDogewogICAgICAgICAgICAg aWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVCb29sZWFuKCkpCi0gICAgICAgICAg ICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNo aWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxk MSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxh dGVPYmplY3RPck90aGVyKCkpCi0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQ cm9maXRhYmxlPE9iamVjdE9yT3RoZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAg ICAgICBmaXhFZGdlPE9iamVjdE9yT3RoZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAg ICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVJbnQzMigpKQotICAg ICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9k ZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KG5vZGUtPmNo aWxkMSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVj dWxhdGVOdW1iZXIoKSkKLSAgICAgICAgICAgICAgICBmaXhEb3VibGVFZGdlPE51bWJlclVzZT4o bm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8TnVtYmVyVXNlPihub2Rl LT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAg CiAgICAgICAgIGNhc2UgVHlwZU9mOiB7CiAgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCkt PnNob3VsZFNwZWN1bGF0ZVN0cmluZygpKQotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRV bmJveElmUHJvZml0YWJsZTxTdHJpbmdVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAg ICAgICBmaXhFZGdlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgZWxz ZSBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUNlbGwoKSkKLSAgICAgICAgICAg ICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8Q2VsbFVzZT4obm9kZS0+Y2hpbGQx KCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtMjk2LDQ1ICsy OTYsNDUgQEAgcHJpdmF0ZToKICAgICAgICAgY2FzZSBDb21wYXJlR3JlYXRlcjoKICAgICAgICAg Y2FzZSBDb21wYXJlR3JlYXRlckVxOiB7CiAgICAgICAgICAgICBpZiAoTm9kZTo6c2hvdWxkU3Bl Y3VsYXRlSW50MzIobm9kZS0+Y2hpbGQxKCkubm9kZSgpLCBub2RlLT5jaGlsZDIoKS5ub2RlKCkp KSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMy VXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94 SWZQcm9maXRhYmxlPEludDMyVXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAg Zml4RWRnZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVk Z2U8SW50MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxhdGVOdW1iZXIo bm9kZS0+Y2hpbGQxKCkubm9kZSgpLCBub2RlLT5jaGlsZDIoKS5ub2RlKCkpKSB7Ci0gICAgICAg ICAgICAgICAgZml4RG91YmxlRWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKLSAgICAg ICAgICAgICAgICBmaXhEb3VibGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOworICAg ICAgICAgICAgICAgIGZpeEVkZ2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAg ICAgICAgICAgZml4RWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChub2RlLT5vcCgpICE9 IENvbXBhcmVFcSkKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGlmIChOb2Rl OjpzaG91bGRTcGVjdWxhdGVCb29sZWFuKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9kZS0+Y2hp bGQyKCkubm9kZSgpKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJv Zml0YWJsZTxCb29sZWFuVXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0 VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsK KyAgICAgICAgICAgICAgICBmaXhFZGdlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAg ICAgICAgICAgICAgICBmaXhFZGdlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChub2RlLT5j aGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nSWRlbnQoKSAmJiBub2RlLT5jaGlsZDIoKS0+ c2hvdWxkU3BlY3VsYXRlU3RyaW5nSWRlbnQoKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtp bmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdJZGVudFVzZT4obm9kZS0+Y2hpbGQxKCkpOwot ICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdJZGVu dFVzZT4obm9kZS0+Y2hpbGQyKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8U3RyaW5nSWRl bnRVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPFN0cmluZ0lk ZW50VXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICB9CiAgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZVN0 cmluZygpICYmIG5vZGUtPmNoaWxkMigpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmcoKSAmJiBHUFJJ bmZvOjpudW1iZXJPZlJlZ2lzdGVycyA+PSA3KSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAg ICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdVc2U+KG5vZGUt PmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPFN0cmluZ1VzZT4obm9kZS0+Y2hp bGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8U3RyaW5nVXNlPihub2RlLT5jaGlsZDIo KSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBp ZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZU9iamVjdCgpICYmIG5vZGUtPmNoaWxk MigpLT5zaG91bGRTcGVjdWxhdGVPYmplY3QoKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtp bmRBbmRVbmJveElmUHJvZml0YWJsZTxPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKLSAgICAg ICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8T2JqZWN0VXNlPihub2Rl LT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxPYmplY3RVc2U+KG5vZGUtPmNo aWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQy KCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg aWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVPYmplY3QoKSAmJiBub2RlLT5jaGls ZDIoKS0+c2hvdWxkU3BlY3VsYXRlT2JqZWN0T3JPdGhlcigpKSB7Ci0gICAgICAgICAgICAgICAg c2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkp OwotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxPYmplY3RP ck90aGVyVXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxPYmpl Y3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPE9iamVjdE9y T3RoZXJVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRl T2JqZWN0T3JPdGhlcigpICYmIG5vZGUtPmNoaWxkMigpLT5zaG91bGRTcGVjdWxhdGVPYmplY3Qo KSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxPYmpl Y3RPck90aGVyVXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQyKCkpOworICAgICAg ICAgICAgICAgIGZpeEVkZ2U8T2JqZWN0T3JPdGhlclVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAg ICAgICAgICAgICAgIGZpeEVkZ2U8T2JqZWN0VXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAg ICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKQEAgLTM0 Niw0MCArMzQ2LDQwIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAKICAgICAgICAgY2FzZSBDb21w YXJlU3RyaWN0RXE6IHsKICAgICAgICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxhdGVCb29s ZWFuKG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgbm9kZS0+Y2hpbGQyKCkubm9kZSgpKSkgewotICAg ICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxCb29sZWFuVXNlPihu b2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9m aXRhYmxlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBmaXhF ZGdlPEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdl PEJvb2xlYW5Vc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChOb2RlOjpzaG91bGRTcGVjdWxhdGVJbnQzMihu b2RlLT5jaGlsZDEoKS5ub2RlKCksIG5vZGUtPmNoaWxkMigpLm5vZGUoKSkpIHsKLSAgICAgICAg ICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50MzJVc2U+KG5vZGUtPmNo aWxkMSgpKTsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8 SW50MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEludDMy VXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4o bm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQog ICAgICAgICAgICAgaWYgKE5vZGU6OnNob3VsZFNwZWN1bGF0ZU51bWJlcihub2RlLT5jaGlsZDEo KS5ub2RlKCksIG5vZGUtPmNoaWxkMigpLm5vZGUoKSkpIHsKLSAgICAgICAgICAgICAgICBmaXhE b3VibGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgIGZp eERvdWJsZUVkZ2U8TnVtYmVyVXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAg Zml4RWRnZTxOdW1iZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhF ZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVj dWxhdGVTdHJpbmdJZGVudCgpICYmIG5vZGUtPmNoaWxkMigpLT5zaG91bGRTcGVjdWxhdGVTdHJp bmdJZGVudCgpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRh YmxlPFN0cmluZ0lkZW50VXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0 VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPFN0cmluZ0lkZW50VXNlPihub2RlLT5jaGlsZDIo KSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxTdHJpbmdJZGVudFVzZT4obm9kZS0+Y2hpbGQx KCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8U3RyaW5nSWRlbnRVc2U+KG5vZGUtPmNoaWxk MigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAg IGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nKCkgJiYgbm9kZS0+Y2hp bGQyKCktPnNob3VsZFNwZWN1bGF0ZVN0cmluZygpICYmIEdQUkluZm86Om51bWJlck9mUmVnaXN0 ZXJzID49IDcpIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFi bGU8U3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQyKCkpOworICAgICAg ICAgICAgICAgIGZpeEVkZ2U8U3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAg ICAgICAgZml4RWRnZTxTdHJpbmdVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+ c2hvdWxkU3BlY3VsYXRlT2JqZWN0KCkgJiYgbm9kZS0+Y2hpbGQyKCktPnNob3VsZFNwZWN1bGF0 ZU9iamVjdCgpKSB7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRh YmxlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgICAgIHNldFVzZUtp bmRBbmRVbmJveElmUHJvZml0YWJsZTxPYmplY3RVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAg ICAgICAgICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAg ICAgICAgIGZpeEVkZ2U8T2JqZWN0VXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQog CiAgICAgICAgIGNhc2UgU3RyaW5nRnJvbUNoYXJDb2RlOgotICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAg ICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBicmVh azsKIAogICAgICAgICBjYXNlIFN0cmluZ0NoYXJBdDoKQEAgLTM4Nyw4ICszODcsOCBAQCBwcml2 YXRlOgogICAgICAgICAgICAgLy8gQ3VycmVudGx5IHdlIGhhdmUgbm8gZ29vZCB3YXkgb2YgcmVm aW5pbmcgdGhlc2UuCiAgICAgICAgICAgICBBU1NFUlQobm9kZS0+YXJyYXlNb2RlKCkgPT0gQXJy YXlNb2RlKEFycmF5OjpTdHJpbmcpKTsKICAgICAgICAgICAgIGJsZXNzQXJyYXlPcGVyYXRpb24o bm9kZS0+Y2hpbGQxKCksIG5vZGUtPmNoaWxkMigpLCBub2RlLT5jaGlsZDMoKSk7Ci0gICAgICAg ICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5j aGlsZDEoKSk7Ci0gICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50 MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNl Pihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5j aGlsZDIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCkBAIC00MjksMTQgKzQy OSwxNCBAQCBwcml2YXRlOgogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2Fz ZSBBcnJheTo6R2VuZXJpYzoKICNpZiBVU0UoSlNWQUxVRTMyXzY0KQotICAgICAgICAgICAgICAg IHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxDZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7 IC8vIFNwZWN1bGF0aW5nIGNlbGwgZHVlIHRvIHJlZ2lzdGVyIHByZXNzdXJlIG9uIDMyLWJpdC4K KyAgICAgICAgICAgICAgICBmaXhFZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsgLy8gU3Bl Y3VsYXRpbmcgY2VsbCBkdWUgdG8gcmVnaXN0ZXIgcHJlc3N1cmUgb24gMzItYml0LgogI2VuZGlm CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIEFycmF5OjpGb3JjZUV4 aXQ6CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBkZWZhdWx0OgotICAgICAg ICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxLbm93bkNlbGxVc2U+KG5v ZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2Zp dGFibGU8SW50MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdl PEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8 SW50MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIApAQCAtNDY5LDE4ICs0NjksMTggQEAgcHJpdmF0ZToKICAg ICAgICAgICAgICAgICAvLyBEdWUgdG8gcmVnaXN0ZXIgcHJlc3N1cmUgb24gMzItYml0LCB3ZSBz cGVjdWxhdGUgY2VsbCBhbmQKICAgICAgICAgICAgICAgICAvLyBpZ25vcmUgdGhlIGJhc2UtaXMt bm90LWNlbGwgY2FzZSBlbnRpcmVseSBieSBsZXR0aW5nIHRoZQogICAgICAgICAgICAgICAgIC8v IGJhc2VsaW5lIEpJVCBoYW5kbGUgaXQuCi0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVu Ym94SWZQcm9maXRhYmxlPENlbGxVc2U+KGNoaWxkMSk7CisgICAgICAgICAgICAgICAgZml4RWRn ZTxDZWxsVXNlPihjaGlsZDEpOwogI2VuZGlmCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICBjYXNlIEFycmF5OjpJbnQzMjoKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5k VW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihjaGlsZDEpOwotICAgICAgICAgICAgICAg IHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4oY2hpbGQyKTsKLSAgICAg ICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50MzJVc2U+KGNoaWxk Myk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxLbm93bkNlbGxVc2U+KGNoaWxkMSk7CisgICAg ICAgICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4oY2hpbGQyKTsKKyAgICAgICAgICAgICAgICBm aXhFZGdlPEludDMyVXNlPihjaGlsZDMpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICAgICAgY2FzZSBBcnJheTo6RG91YmxlOgotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRV bmJveElmUHJvZml0YWJsZTxLbm93bkNlbGxVc2U+KGNoaWxkMSk7Ci0gICAgICAgICAgICAgICAg c2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihjaGlsZDIpOwotICAgICAg ICAgICAgICAgIGZpeERvdWJsZUVkZ2U8UmVhbE51bWJlclVzZT4oY2hpbGQzKTsKKyAgICAgICAg ICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4oY2hpbGQxKTsKKyAgICAgICAgICAgICAgICBm aXhFZGdlPEludDMyVXNlPihjaGlsZDIpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8UmVhbE51 bWJlclVzZT4oY2hpbGQzKTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNh c2UgQXJyYXk6OkludDhBcnJheToKICAgICAgICAgICAgIGNhc2UgQXJyYXk6OkludDE2QXJyYXk6 CkBAIC00ODksMjIgKzQ4OSwyMiBAQCBwcml2YXRlOgogICAgICAgICAgICAgY2FzZSBBcnJheTo6 VWludDhDbGFtcGVkQXJyYXk6CiAgICAgICAgICAgICBjYXNlIEFycmF5OjpVaW50MTZBcnJheToK ICAgICAgICAgICAgIGNhc2UgQXJyYXk6OlVpbnQzMkFycmF5OgotICAgICAgICAgICAgICAgIHNl dFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxLbm93bkNlbGxVc2U+KGNoaWxkMSk7Ci0gICAg ICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihjaGls ZDIpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNlPihjaGlsZDEpOworICAg ICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KGNoaWxkMik7CiAgICAgICAgICAgICAgICAg aWYgKGNoaWxkMy0+c2hvdWxkU3BlY3VsYXRlSW50MzIoKSkKLSAgICAgICAgICAgICAgICAgICAg c2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihjaGlsZDMpOworICAgICAg ICAgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihjaGlsZDMpOwogICAgICAgICAgICAgICAg IGVsc2UKLSAgICAgICAgICAgICAgICAgICAgZml4RG91YmxlRWRnZTxOdW1iZXJVc2U+KGNoaWxk Myk7CisgICAgICAgICAgICAgICAgICAgIGZpeEVkZ2U8TnVtYmVyVXNlPihjaGlsZDMpOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBBcnJheTo6RmxvYXQzMkFycmF5 OgogICAgICAgICAgICAgY2FzZSBBcnJheTo6RmxvYXQ2NEFycmF5OgotICAgICAgICAgICAgICAg IHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxLbm93bkNlbGxVc2U+KGNoaWxkMSk7Ci0g ICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihj aGlsZDIpOwotICAgICAgICAgICAgICAgIGZpeERvdWJsZUVkZ2U8TnVtYmVyVXNlPihjaGlsZDMp OworICAgICAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNlPihjaGlsZDEpOworICAgICAg ICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+KGNoaWxkMik7CisgICAgICAgICAgICAgICAgZml4 RWRnZTxOdW1iZXJVc2U+KGNoaWxkMyk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg ICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0 YWJsZTxLbm93bkNlbGxVc2U+KGNoaWxkMSk7Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFu ZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihjaGlsZDIpOworICAgICAgICAgICAgICAgIGZp eEVkZ2U8S25vd25DZWxsVXNlPihjaGlsZDEpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50 MzJVc2U+KGNoaWxkMik7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICBicmVhazsKQEAgLTUyNiwxNCArNTI2LDE0IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICAgICAgICAgIFNwZWNJbnQzMiwKICAgICAgICAgICAgICAgICAgICAgbm9kZS0+Y2hpbGQy KCktPnByZWRpY3Rpb24oKSkpOwogICAgICAgICAgICAgYmxlc3NBcnJheU9wZXJhdGlvbihub2Rl LT5jaGlsZDEoKSwgRWRnZSgpLCBub2RlLT5jaGlsZDMoKSk7Ci0gICAgICAgICAgICBzZXRVc2VL aW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7Cisg ICAgICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAg ICAgICAgCiAgICAgICAgICAgICBzd2l0Y2ggKG5vZGUtPmFycmF5TW9kZSgpLnR5cGUoKSkgewog ICAgICAgICAgICAgY2FzZSBBcnJheTo6SW50MzI6Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihub2RlLT5jaGlsZDIoKSk7CisgICAgICAg ICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBBcnJheTo6RG91YmxlOgotICAgICAgICAgICAg ICAgIGZpeERvdWJsZUVkZ2U8UmVhbE51bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOworICAgICAg ICAgICAgICAgIGZpeEVkZ2U8UmVhbE51bWJlclVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAg ICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICBi cmVhazsKQEAgLTU0MywyNiArNTQzLDI2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAKICAgICAg ICAgY2FzZSBBcnJheVBvcDogewogICAgICAgICAgICAgYmxlc3NBcnJheU9wZXJhdGlvbihub2Rl LT5jaGlsZDEoKSwgRWRnZSgpLCBub2RlLT5jaGlsZDIoKSk7Ci0gICAgICAgICAgICBzZXRVc2VL aW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7Cisg ICAgICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAg ICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICBjYXNlIFJlZ0V4 cEV4ZWM6CiAgICAgICAgIGNhc2UgUmVnRXhwVGVzdDogewotICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAg ICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxDZWxsVXNlPihub2RlLT5jaGlsZDIo KSk7CisgICAgICAgICAgICBmaXhFZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAg ICAgICAgIGZpeEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICBjYXNlIEJyYW5jaDogewogICAg ICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVCb29sZWFuKCkpCi0g ICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEJvb2xlYW5Vc2U+ KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEJvb2xlYW5Vc2U+KG5v ZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91 bGRTcGVjdWxhdGVPYmplY3RPck90aGVyKCkpCi0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFu ZFVuYm94SWZQcm9maXRhYmxlPE9iamVjdE9yT3RoZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAg ICAgICAgICAgICAgICBmaXhFZGdlPE9iamVjdE9yT3RoZXJVc2U+KG5vZGUtPmNoaWxkMSgpKTsK ICAgICAgICAgICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVJbnQz MigpKQotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQz MlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8SW50MzJVc2U+ KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKG5vZGUtPmNoaWxkMSgpLT5z aG91bGRTcGVjdWxhdGVOdW1iZXIoKSkKLSAgICAgICAgICAgICAgICBmaXhEb3VibGVFZGdlPE51 bWJlclVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8TnVtYmVy VXNlPihub2RlLT5jaGlsZDEoKSk7CiAKICAgICAgICAgICAgIE5vZGUqIGxvZ2ljYWxOb3QgPSBu b2RlLT5jaGlsZDEoKS5ub2RlKCk7CiAgICAgICAgICAgICBpZiAobG9naWNhbE5vdC0+b3AoKSA9 PSBMb2dpY2FsTm90KSB7CkBAIC02MDUsMTcgKzYwNSwxNyBAQCBwcml2YXRlOgogICAgICAgICAg ICAgc3dpdGNoIChkYXRhLT5raW5kKSB7CiAgICAgICAgICAgICBjYXNlIFN3aXRjaEltbToKICAg ICAgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUludDMyKCkp Ci0gICAgICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQz MlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgICAgICBmaXhFZGdlPEludDMy VXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICBjYXNlIFN3aXRjaENoYXI6CiAgICAgICAgICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5z aG91bGRTcGVjdWxhdGVTdHJpbmcoKSkKLSAgICAgICAgICAgICAgICAgICAgc2V0VXNlS2luZEFu ZFVuYm94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAg ICAgICAgICAgICBmaXhFZGdlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBTd2l0Y2hTdHJpbmc6CiAgICAgICAgICAg ICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmdJZGVudCgpKQot ICAgICAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8U3RyaW5n SWRlbnRVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICAgICAgZml4RWRnZTxT dHJpbmdJZGVudFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgICAgIGVsc2UgaWYg KG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmcoKSkKLSAgICAgICAgICAgICAg ICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hp bGQxKCkpOworICAgICAgICAgICAgICAgICAgICBmaXhFZGdlPFN0cmluZ1VzZT4obm9kZS0+Y2hp bGQxKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAg ICAgYnJlYWs7CkBAIC02MzIsNyArNjMyLDcgQEAgcHJpdmF0ZToKICAgICAgICAgfQogICAgICAg ICAgICAgCiAgICAgICAgIGNhc2UgTmV3U3RyaW5nT2JqZWN0OiB7Ci0gICAgICAgICAgICBzZXRV c2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25TdHJpbmdVc2U+KG5vZGUtPmNoaWxkMSgp KTsKKyAgICAgICAgICAgIGZpeEVkZ2U8S25vd25TdHJpbmdVc2U+KG5vZGUtPmNoaWxkMSgpKTsK ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgICAgICAKQEAgLTY1NywxMSAr NjU3LDExIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBj YXNlIEFMTF9JTlQzMl9JTkRFWElOR19UWVBFUzoKICAgICAgICAgICAgICAgICBmb3IgKHVuc2ln bmVkIG9wZXJhbmRJbmRleCA9IDA7IG9wZXJhbmRJbmRleCA8IG5vZGUtPm51bUNoaWxkcmVuKCk7 ICsrb3BlcmFuZEluZGV4KQotICAgICAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJ ZlByb2ZpdGFibGU8SW50MzJVc2U+KG1fZ3JhcGgubV92YXJBcmdDaGlsZHJlbltub2RlLT5maXJz dENoaWxkKCkgKyBvcGVyYW5kSW5kZXhdKTsKKyAgICAgICAgICAgICAgICAgICAgZml4RWRnZTxJ bnQzMlVzZT4obV9ncmFwaC5tX3ZhckFyZ0NoaWxkcmVuW25vZGUtPmZpcnN0Q2hpbGQoKSArIG9w ZXJhbmRJbmRleF0pOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBB TExfRE9VQkxFX0lOREVYSU5HX1RZUEVTOgogICAgICAgICAgICAgICAgIGZvciAodW5zaWduZWQg b3BlcmFuZEluZGV4ID0gMDsgb3BlcmFuZEluZGV4IDwgbm9kZS0+bnVtQ2hpbGRyZW4oKTsgKytv cGVyYW5kSW5kZXgpCi0gICAgICAgICAgICAgICAgICAgIGZpeERvdWJsZUVkZ2U8UmVhbE51bWJl clVzZT4obV9ncmFwaC5tX3ZhckFyZ0NoaWxkcmVuW25vZGUtPmZpcnN0Q2hpbGQoKSArIG9wZXJh bmRJbmRleF0pOworICAgICAgICAgICAgICAgICAgICBmaXhFZGdlPFJlYWxOdW1iZXJVc2U+KG1f Z3JhcGgubV92YXJBcmdDaGlsZHJlbltub2RlLT5maXJzdENoaWxkKCkgKyBvcGVyYW5kSW5kZXhd KTsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgQUxMX0NPTlRJR1VP VVNfSU5ERVhJTkdfVFlQRVM6CiAgICAgICAgICAgICBjYXNlIEFMTF9BUlJBWV9TVE9SQUdFX0lO REVYSU5HX1RZUEVTOgpAQCAtNjc1LDcgKzY3NSw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAK ICAgICAgICAgY2FzZSBOZXdUeXBlZEFycmF5OiB7CiAgICAgICAgICAgICBpZiAobm9kZS0+Y2hp bGQxKCktPnNob3VsZFNwZWN1bGF0ZUludDMyKCkpIHsKLSAgICAgICAgICAgICAgICBzZXRVc2VL aW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50MzJVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAg ICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAg ICAgICAgbm9kZS0+Y2xlYXJGbGFncyhOb2RlTXVzdEdlbmVyYXRlIHwgTm9kZUNsb2JiZXJzV29y bGQpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQpAQCAtNjgzLDcgKzY4 Myw3IEBAIHByaXZhdGU6CiAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICBjYXNlIE5l d0FycmF5V2l0aFNpemU6IHsKLSAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0 YWJsZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgZml4RWRnZTxJbnQz MlVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAg ICAgICAgICAgIApAQCAtNjkyLDcgKzY5Miw3IEBAIHByaXZhdGU6CiAKICAgICAgICAgICAgIGlm IChpc090aGVyU3BlY3VsYXRpb24obm9kZS0+Y2hpbGQxKCktPnByZWRpY3Rpb24oKSkpIHsKICAg ICAgICAgICAgICAgICBpZiAoZWNtYU1vZGUgPT0gU3RyaWN0TW9kZSkgewotICAgICAgICAgICAg ICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8T3RoZXJVc2U+KG5vZGUtPmNo aWxkMSgpKTsKKyAgICAgICAgICAgICAgICAgICAgZml4RWRnZTxPdGhlclVzZT4obm9kZS0+Y2hp bGQxKCkpOwogICAgICAgICAgICAgICAgICAgICBub2RlLT5jb252ZXJ0VG9JZGVudGl0eSgpOwog ICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgICAgICB9CkBAIC03MDYsNyAr NzA2LDcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIAogICAgICAgICAg ICAgaWYgKGlzRmluYWxPYmplY3RTcGVjdWxhdGlvbihub2RlLT5jaGlsZDEoKS0+cHJlZGljdGlv bigpKSkgewotICAgICAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxG aW5hbE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8 RmluYWxPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgICAgICBub2RlLT5j b252ZXJ0VG9JZGVudGl0eSgpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAg fQpAQCAtNzE2LDcgKzcxNiw3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAKICAgICAgICAgY2Fz ZSBHZXRNeUFyZ3VtZW50QnlWYWw6CiAgICAgICAgIGNhc2UgR2V0TXlBcmd1bWVudEJ5VmFsU2Fm ZTogewotICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNl Pihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5j aGlsZDEoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCkBA IC03MzAsNyArNzMwLDcgQEAgcHJpdmF0ZToKICAgICAgICAgY2FzZSBBbGxvY2F0ZVByb3BlcnR5 U3RvcmFnZToKICAgICAgICAgY2FzZSBSZWFsbG9jYXRlUHJvcGVydHlTdG9yYWdlOgogICAgICAg ICBjYXNlIEdldFNjb3BlOiB7Ci0gICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2Zp dGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdl PEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICAgICAgICAgIApAQCAtNzUxLDcgKzc1MSw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICAgICAgYXR0ZW1wdFRvTWFrZUdldFR5cGVkQXJyYXlCeXRlT2Zmc2V0KG5vZGUpOwogICAg ICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAg ICAgIGZpeEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIH0KICAgICAgICAgICAgIApAQCAtNzY0LDE3ICs3NjQsMTcgQEAgcHJpdmF0ZToK ICAgICAgICAgY2FzZSBDaGVja0hhc0luc3RhbmNlOgogICAgICAgICBjYXNlIENyZWF0ZVRoaXM6 CiAgICAgICAgIGNhc2UgR2V0QnV0dGVyZmx5OiB7Ci0gICAgICAgICAgICBzZXRVc2VLaW5kQW5k VW5ib3hJZlByb2ZpdGFibGU8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAg Zml4RWRnZTxDZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICBicmVhazsKICAg ICAgICAgfQogICAgICAgICAgICAgCiAgICAgICAgIGNhc2UgQ2hlY2tBcnJheTogewogICAgICAg ICAgICAgc3dpdGNoIChub2RlLT5hcnJheU1vZGUoKS50eXBlKCkpIHsKICAgICAgICAgICAgIGNh c2UgQXJyYXk6OlN0cmluZzoKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlBy b2ZpdGFibGU8U3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICAgICAgZml4 RWRnZTxTdHJpbmdVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIGRlZmF1bHQ6Ci0gICAgICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94 SWZQcm9maXRhYmxlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgICAgICBm aXhFZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGJyZWFrOwpAQCAtNzgyLDIzICs3ODIsMjMgQEAg cHJpdmF0ZToKICAgICAgICAgICAgIAogICAgICAgICBjYXNlIEFycmF5aWZ5OgogICAgICAgICBj YXNlIEFycmF5aWZ5VG9TdHJ1Y3R1cmU6IHsKLSAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJv eElmUHJvZml0YWJsZTxDZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhF ZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIGlmIChub2RlLT5jaGls ZDIoKSkKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50 MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgICAgICAgICBmaXhFZGdlPEludDMyVXNl Pihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAg ICAgICAgCiAgICAgICAgIGNhc2UgR2V0QnlPZmZzZXQ6IHsKICAgICAgICAgICAgIGlmICghbm9k ZS0+Y2hpbGQxKCktPmhhc1N0b3JhZ2VSZXN1bHQoKSkKLSAgICAgICAgICAgICAgICBzZXRVc2VL aW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7Ci0g ICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihu b2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxLbm93bkNlbGxVc2U+KG5v ZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNlPihub2RlLT5j aGlsZDIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCiAg ICAgICAgIGNhc2UgUHV0QnlPZmZzZXQ6IHsKICAgICAgICAgICAgIGlmICghbm9kZS0+Y2hpbGQx KCktPmhhc1N0b3JhZ2VSZXN1bHQoKSkKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5i b3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7Ci0gICAgICAgICAg ICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8S25vd25DZWxsVXNlPihub2RlLT5jaGls ZDIoKSk7CisgICAgICAgICAgICAgICAgZml4RWRnZTxLbm93bkNlbGxVc2U+KG5vZGUtPmNoaWxk MSgpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDIoKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICAgICAgCkBAIC04MDYsOCAr ODA2LDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGFwcGVhcnMgYnJv a2VuOiBDaGVja0hhc0luc3RhbmNlIGFscmVhZHkgZG9lcyBhbiB1bmNvbmRpdGlvbmFsIGNlbGwK ICAgICAgICAgICAgIC8vIGNoZWNrLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTA3NDc5CiAgICAgICAgICAgICBpZiAoIShub2RlLT5jaGlsZDEoKS0+cHJlZGljdGlv bigpICYgflNwZWNDZWxsKSkKLSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlBy b2ZpdGFibGU8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICAgICAgc2V0VXNlS2lu ZEFuZFVuYm94SWZQcm9maXRhYmxlPENlbGxVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAg ICAgICAgICBmaXhFZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGZp eEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICAgICAgICAgIApAQCAtODE1LDcgKzgxNSw3IEBAIHByaXZhdGU6CiAgICAgICAg ICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGF0IHNvbWUgcG9pbnQgaGF2ZSBhcnJheSBwcm9maWxp bmcgb24gb3BfaW4sIGluIHdoaWNoCiAgICAgICAgICAgICAvLyBjYXNlIHdlIHdvdWxkIGJlIGFi bGUgdG8gdHVybiB0aGlzIGludG8gYSBraW5kIG9mIEdldEJ5VmFsLgogICAgICAgICAgICAgCi0g ICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8Q2VsbFVzZT4obm9kZS0+ Y2hpbGQyKCkpOworICAgICAgICAgICAgZml4RWRnZTxDZWxsVXNlPihub2RlLT5jaGlsZDIoKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCkBAIC0xMDA1LDI3ICsxMDA1LDI3IEBA IHByaXZhdGU6CiAgICAgdm9pZCBmaXh1cFRvUHJpbWl0aXZlKE5vZGUqIG5vZGUpCiAgICAgewog ICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUludDMyKCkpIHsKLSAg ICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9kZS0+ Y2hpbGQxKCkpOworICAgICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkp OwogICAgICAgICAgICAgbm9kZS0+Y29udmVydFRvSWRlbnRpdHkoKTsKICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5z aG91bGRTcGVjdWxhdGVTdHJpbmcoKSkgewotICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94 SWZQcm9maXRhYmxlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgZml4 RWRnZTxTdHJpbmdVc2U+KG5vZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgIG5vZGUtPmNvbnZl cnRUb0lkZW50aXR5KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAg CiAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxkU3BlY3VsYXRlU3RyaW5nT2JqZWN0 KCkKICAgICAgICAgICAgICYmIGNhbk9wdGltaXplU3RyaW5nT2JqZWN0QWNjZXNzKG5vZGUtPmNv ZGVPcmlnaW4pKSB7Ci0gICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8 U3RyaW5nT2JqZWN0VXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBmaXhFZGdlPFN0 cmluZ09iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgbm9kZS0+Y29udmVy dFRvVG9TdHJpbmcoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICAK ICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmdPclN0cmlu Z09iamVjdCgpCiAgICAgICAgICAgICAmJiBjYW5PcHRpbWl6ZVN0cmluZ09iamVjdEFjY2Vzcyhu b2RlLT5jb2RlT3JpZ2luKSkgewotICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9m aXRhYmxlPFN0cmluZ09yU3RyaW5nT2JqZWN0VXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAg ICAgICBmaXhFZGdlPFN0cmluZ09yU3RyaW5nT2JqZWN0VXNlPihub2RlLT5jaGlsZDEoKSk7CiAg ICAgICAgICAgICBub2RlLT5jb252ZXJ0VG9Ub1N0cmluZygpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CkBAIC0xMDM0LDI1ICsxMDM0LDI1IEBAIHByaXZhdGU6CiAgICAgdm9pZCBm aXh1cFRvU3RyaW5nKE5vZGUqIG5vZGUpCiAgICAgewogICAgICAgICBpZiAobm9kZS0+Y2hpbGQx KCktPnNob3VsZFNwZWN1bGF0ZVN0cmluZygpKSB7Ci0gICAgICAgICAgICBzZXRVc2VLaW5kQW5k VW5ib3hJZlByb2ZpdGFibGU8U3RyaW5nVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAg ICBmaXhFZGdlPFN0cmluZ1VzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgbm9kZS0+ Y29udmVydFRvSWRlbnRpdHkoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAg ICAgICAKICAgICAgICAgaWYgKG5vZGUtPmNoaWxkMSgpLT5zaG91bGRTcGVjdWxhdGVTdHJpbmdP YmplY3QoKQogICAgICAgICAgICAgJiYgY2FuT3B0aW1pemVTdHJpbmdPYmplY3RBY2Nlc3Mobm9k ZS0+Y29kZU9yaWdpbikpIHsKLSAgICAgICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0 YWJsZTxTdHJpbmdPYmplY3RVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGZpeEVk Z2U8U3RyaW5nT2JqZWN0VXNlPihub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmIChub2RlLT5jaGlsZDEoKS0+c2hvdWxk U3BlY3VsYXRlU3RyaW5nT3JTdHJpbmdPYmplY3QoKQogICAgICAgICAgICAgJiYgY2FuT3B0aW1p emVTdHJpbmdPYmplY3RBY2Nlc3Mobm9kZS0+Y29kZU9yaWdpbikpIHsKLSAgICAgICAgICAgIHNl dFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxTdHJpbmdPclN0cmluZ09iamVjdFVzZT4obm9k ZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgZml4RWRnZTxTdHJpbmdPclN0cmluZ09iamVjdFVz ZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg ICAgIAogICAgICAgICBpZiAobm9kZS0+Y2hpbGQxKCktPnNob3VsZFNwZWN1bGF0ZUNlbGwoKSkg ewotICAgICAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPENlbGxVc2U+KG5v ZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGZpeEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQx KCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpAQCAtMTE3NSwxNiAr MTE3NSwxNiBAQCBwcml2YXRlOgogICAgICAgICAgICAgY2FzZSBGbHVzaGVkSlNWYWx1ZToKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIGNhc2UgRmx1c2hlZERvdWJsZToKLSAg ICAgICAgICAgICAgICBmaXhEb3VibGVFZGdlPE51bWJlclVzZT4obm9kZS0+Y2hpbGQxKCksIEZv cndhcmRTcGVjdWxhdGlvbik7CisgICAgICAgICAgICAgICAgZml4RWRnZTxOdW1iZXJVc2U+KG5v ZGUtPmNoaWxkMSgpLCBGb3J3YXJkU3BlY3VsYXRpb24pOwogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICAgICAgY2FzZSBGbHVzaGVkSW50MzI6Ci0gICAgICAgICAgICAgICAgc2V0VXNl S2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEludDMyVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAg ICAgICAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBGbHVzaGVkQ2VsbDoKLSAgICAgICAgICAg ICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8Q2VsbFVzZT4obm9kZS0+Y2hpbGQx KCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8Q2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwog ICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBGbHVzaGVkQm9vbGVhbjoK LSAgICAgICAgICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8Qm9vbGVhblVz ZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgICAgIGZpeEVkZ2U8Qm9vbGVhblVzZT4o bm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgZGVm YXVsdDoKICAgICAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVF9OT1RfUkVBQ0hFRCgpOwpAQCAt MTMyOSw4ICsxMzI5LDEzIEBAIHByaXZhdGU6CiAgICAgLy8gU2V0IHRoZSB1c2Uga2luZCBvZiB0 aGUgZWRnZS4gSW4gdGhlIGZ1dHVyZSAoaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExMDQzMyksCiAgICAgLy8gdGhpcyBjYW4gYmUgdXNlZCB0byBub3RpZnkgdGhlIEdl dExvY2FsIHRoYXQgdGhlIHZhcmlhYmxlIGlzIHByb2ZpdGFibGUgdG8gdW5ib3guCiAgICAgdGVt cGxhdGU8VXNlS2luZCB1c2VLaW5kPgotICAgIHZvaWQgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9m aXRhYmxlKEVkZ2UmIGVkZ2UpCisgICAgdm9pZCBmaXhFZGdlKEVkZ2UmIGVkZ2UsIFNwZWN1bGF0 aW9uRGlyZWN0aW9uIGRpcmVjdGlvbiA9IEJhY2t3YXJkU3BlY3VsYXRpb24pCiAgICAgeworICAg ICAgICBpZiAoaXNEb3VibGUodXNlS2luZCkgJiYgZWRnZS0+c2hvdWxkU3BlY3VsYXRlSW50MzJG b3JBcml0aG1ldGljKCkpIHsKKyAgICAgICAgICAgIGluamVjdEludDMyVG9Eb3VibGVOb2RlKGVk Z2UsIHVzZUtpbmQsIGRpcmVjdGlvbik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KyAgICAgICAgCiAgICAgICAgIG9ic2VydmVVc2VLaW5kT25Ob2RlPHVzZUtpbmQ+KGVkZ2Uubm9k ZSgpKTsKICAgICAgICAgZWRnZS5zZXRVc2VLaW5kKHVzZUtpbmQpOwogICAgIH0KQEAgLTEzMzks NyArMTM0NCw3IEBAIHByaXZhdGU6CiAgICAgewogICAgICAgICBOb2RlKiBub2RlID0gZWRnZS5u b2RlKCk7CiAgICAgICAgIGlmIChub2RlLT5vcCgpICE9IFZhbHVlVG9JbnQzMikgewotICAgICAg ICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEtub3duSW50MzJVc2U+KGVkZ2Up OworICAgICAgICAgICAgZml4RWRnZTxLbm93bkludDMyVXNlPihlZGdlKTsKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQogICAgICAgICAKQEAgLTEzNTQsMTkgKzEzNTksNiBAQCBwcml2 YXRlOgogICAgICAgICBlZGdlID0gbmV3RWRnZTsKICAgICB9CiAgICAgCi0gICAgdGVtcGxhdGU8 VXNlS2luZCB1c2VLaW5kPgotICAgIHZvaWQgZml4RG91YmxlRWRnZShFZGdlJiBlZGdlLCBTcGVj dWxhdGlvbkRpcmVjdGlvbiBkaXJlY3Rpb24gPSBCYWNrd2FyZFNwZWN1bGF0aW9uKQotICAgIHsK LSAgICAgICAgQVNTRVJUKHVzZUtpbmQgPT0gTnVtYmVyVXNlIHx8IHVzZUtpbmQgPT0gS25vd25O dW1iZXJVc2UgfHwgdXNlS2luZCA9PSBSZWFsTnVtYmVyVXNlKTsKLSAgICAgICAgCi0gICAgICAg IGlmIChlZGdlLT5wcmVkaWN0aW9uKCkgJiBTcGVjRG91YmxlKSB7Ci0gICAgICAgICAgICBzZXRV c2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8dXNlS2luZD4oZWRnZSk7Ci0gICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgCi0gICAgICAgIGluamVjdEludDMyVG9Eb3VibGVO b2RlKGVkZ2UsIHVzZUtpbmQsIGRpcmVjdGlvbik7Ci0gICAgfQotCiAgICAgdm9pZCBpbmplY3RJ bnQzMlRvRG91YmxlTm9kZShFZGdlJiBlZGdlLCBVc2VLaW5kIHVzZUtpbmQgPSBOdW1iZXJVc2Us IFNwZWN1bGF0aW9uRGlyZWN0aW9uIGRpcmVjdGlvbiA9IEJhY2t3YXJkU3BlY3VsYXRpb24pCiAg ICAgewogICAgICAgICBOb2RlKiByZXN1bHQgPSBtX2luc2VydGlvblNldC5pbnNlcnROb2RlKApA QCAtMTQzMCw4ICsxNDIyLDggQEAgcHJpdmF0ZToKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgCiAgICAgICAgIHRydW5jYXRlQ29uc3RhbnRzSWZOZWNlc3Nhcnkobm9kZSwgbW9k ZSk7Ci0gICAgICAgIHNldFVzZUtpbmRBbmRVbmJveElmUHJvZml0YWJsZTxJbnQzMlVzZT4obm9k ZS0+Y2hpbGQxKCkpOwotICAgICAgICBzZXRVc2VLaW5kQW5kVW5ib3hJZlByb2ZpdGFibGU8SW50 MzJVc2U+KG5vZGUtPmNoaWxkMigpKTsKKyAgICAgICAgZml4RWRnZTxJbnQzMlVzZT4obm9kZS0+ Y2hpbGQxKCkpOworICAgICAgICBmaXhFZGdlPEludDMyVXNlPihub2RlLT5jaGlsZDIoKSk7CiAg ICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICAgICAKQEAgLTE1MTQsNyArMTUwNiw3IEBAIHBy aXZhdGU6CiAgICAgewogICAgICAgICBub2RlLT5zZXRPcChHZXRBcnJheUxlbmd0aCk7CiAgICAg ICAgIG5vZGUtPmNsZWFyRmxhZ3MoTm9kZU11c3RHZW5lcmF0ZSB8IE5vZGVDbG9iYmVyc1dvcmxk KTsKLSAgICAgICAgc2V0VXNlS2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEtub3duQ2VsbFVzZT4o bm9kZS0+Y2hpbGQxKCkpOworICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hp bGQxKCkpOwogICAgICAgICBub2RlLT5zZXRBcnJheU1vZGUoYXJyYXlNb2RlKTsKICAgICAgICAg ICAgIAogICAgICAgICBOb2RlKiBzdG9yYWdlID0gY2hlY2tBcnJheShhcnJheU1vZGUsIG5vZGUt PmNvZGVPcmlnaW4sIG5vZGUtPmNoaWxkMSgpLm5vZGUoKSwgMCwgbGVuZ3RoTmVlZHNTdG9yYWdl KTsKQEAgLTE1NDcsNyArMTUzOSw3IEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAgICBub2Rl LT5zZXRPcChHZXRUeXBlZEFycmF5Qnl0ZU9mZnNldCk7CiAgICAgICAgIG5vZGUtPmNsZWFyRmxh Z3MoTm9kZU11c3RHZW5lcmF0ZSB8IE5vZGVDbG9iYmVyc1dvcmxkKTsKLSAgICAgICAgc2V0VXNl S2luZEFuZFVuYm94SWZQcm9maXRhYmxlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwor ICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOwogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH VXNlS2luZC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHVXNl S2luZC5oCShyZXZpc2lvbiAxNTU1NzQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1VzZUtpbmQuaAkod29ya2luZyBjb3B5KQpAQCAtMTM3LDcgKzEzNyw2IEBAIEFMV0FZU19JTkxJ TkUgYm9vbCBpc051bWVyaWNhbChVc2VLaW5kIGsKIEFMV0FZU19JTkxJTkUgYm9vbCBpc0RvdWJs ZShVc2VLaW5kIGtpbmQpCiB7CiAgICAgc3dpdGNoIChraW5kKSB7Ci0gICAgY2FzZSBLbm93bklu dDMyVXNlOgogICAgIGNhc2UgUmVhbE51bWJlclVzZToKICAgICBjYXNlIE51bWJlclVzZToKICAg ICBjYXNlIEtub3duTnVtYmVyVXNlOgo=