84660 2012-04-23 17:32:44 -0700 [V8] Pass Isolate to setDOMException() in CodeGeneratorV8.pm 2012-04-24 09:41:23 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84074 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 608229 0 haraken 2012-04-23 17:32:44 -0700 The objective is to pass Isolate around in V8 bindings. In this bug we pass Isolate to setDOMException() in CodeGeneratorV8.pm. 608231 1 138471 haraken 2012-04-23 17:35:39 -0700 Created attachment 138471 Patch 608762 2 138471 webkit.review.bot 2012-04-24 09:41:00 -0700 Comment on attachment 138471 Patch Clearing flags on attachment: 138471 Committed r115073: <http://trac.webkit.org/changeset/115073> 608763 3 webkit.review.bot 2012-04-24 09:41:23 -0700 All reviewed patches have been landed. Closing bug. 138471 2012-04-23 17:35:39 -0700 2012-04-24 09:40:59 -0700 Patch bug-84660-20120423173538.patch text/plain 16750 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0OTYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDJmYmY2NTY0YzQwODYw MTU3YzgwN2Y2YWFlZjkzMjQ5MDQ0ZjYxMC4uM2YyYTJmNjBiZTIxYTI5NDMwZGY4MDdhZmE5YTJi NWI5OTEzMzJkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEyLTA0LTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFBhc3MgSXNv bGF0ZSB0byBzZXRET01FeGNlcHRpb24oKSBpbiBDb2RlR2VuZXJhdG9yVjgucG0KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg0NjYwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG9iamVjdGl2ZSBpcyB0 byBwYXNzIElzb2xhdGUgYXJvdW5kIGluIFY4IGJpbmRpbmdzLgorICAgICAgICBUaGlzIHBhdGNo IHBhc3NlcyBJc29sYXRlIHRvIHNldERPTUV4Y2VwdGlvbigpIGluIENvZGVHZW5lcmF0b3JWOC5w bS4KKworICAgICAgICBUZXN0OiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdEV2ZW50VGFyZ2V0 LmlkbAorICAgICAgICAgICAgICBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKKyAg ICAgICAgICAgICAgYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RJbnRlcmZhY2UuaWRsCisKKyAg ICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbTogTW9kaWZpZWQgYXMg ZGVzY3JpYmVkIGFib3ZlLgorICAgICAgICAoR2VuZXJhdGVTZXRET01FeGNlcHRpb24pOgorICAg ICAgICAoR2VuZXJhdGVOb3JtYWxBdHRyR2V0dGVyKToKKyAgICAgICAgKEdlbmVyYXRlTm9ybWFs QXR0clNldHRlcik6CisgICAgICAgIChHZW5lcmF0ZUZ1bmN0aW9uQ2FsbGJhY2spOgorICAgICAg ICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAoR2VuZXJhdGVGdW5jdGlvbkNh bGxTdHJpbmcpOgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2 ZW50VGFyZ2V0LmNwcDoKKyAgICAgICAgVXBkYXRlZCBydW4tYmluZGluZ3MtdGVzdHMgcmVzdWx0 cy4KKyAgICAgICAgKFdlYkNvcmU6OlRlc3RFdmVudFRhcmdldFY4SW50ZXJuYWw6Oml0ZW1DYWxs YmFjayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0RXZlbnRUYXJnZXRWOEludGVybmFsOjpkaXNw YXRjaEV2ZW50Q2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9W OFRlc3RJbnRlcmZhY2UuY3BwOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlRlc3RJbnRlcmZh Y2VWOEludGVybmFsOjpzdXBwbGVtZW50YWxNZXRob2QyQ2FsbGJhY2spOgorICAgICAgICAqIGJp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwOiBEaXR0by4KKyAgICAgICAgKFdl YkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjphdHRyV2l0aEdldHRlckV4Y2VwdGlvbkF0dHJHZXR0 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6OmF0dHJXaXRoR2V0dGVy RXhjZXB0aW9uQXR0clNldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5h bDo6YXR0cldpdGhTZXR0ZXJFeGNlcHRpb25BdHRyU2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlRlc3RPYmpWOEludGVybmFsOjpzdHJpbmdBdHRyV2l0aEdldHRlckV4Y2VwdGlvbkF0dHJHZXR0 ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6OnN0cmluZ0F0dHJXaXRo R2V0dGVyRXhjZXB0aW9uQXR0clNldHRlcik6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJ bnRlcm5hbDo6c3RyaW5nQXR0cldpdGhTZXR0ZXJFeGNlcHRpb25BdHRyU2V0dGVyKToKKyAgICAg ICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjp3aXRoU2NyaXB0U3RhdGVBdHRyaWJ1dGVS YWlzZXNBdHRyR2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjp3 aXRoU2NyaXB0U3RhdGVBdHRyaWJ1dGVSYWlzZXNBdHRyU2V0dGVyKToKKyAgICAgICAgKFdlYkNv cmU6OlRlc3RPYmpWOEludGVybmFsOjp3aXRoU2NyaXB0RXhlY3V0aW9uQ29udGV4dEF0dHJpYnV0 ZVJhaXNlc0F0dHJHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6 OndpdGhTY3JpcHRFeGVjdXRpb25Db250ZXh0QXR0cmlidXRlUmFpc2VzQXR0clNldHRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6d2l0aFNjcmlwdEV4ZWN1dGlvbkNv bnRleHRBbmRTY3JpcHRTdGF0ZUF0dHJpYnV0ZVJhaXNlc0F0dHJHZXR0ZXIpOgorICAgICAgICAo V2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6OndpdGhTY3JpcHRFeGVjdXRpb25Db250ZXh0QW5k U2NyaXB0U3RhdGVBdHRyaWJ1dGVSYWlzZXNBdHRyU2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlRlc3RPYmpWOEludGVybmFsOjptZXRob2RUaGF0UmVxdWlyZXNBbGxBcmdzQW5kVGhyb3dzQ2Fs bGJhY2spOgorICAgICAgICAoV2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6Om1ldGhvZFdpdGhF eGNlcHRpb25DYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6 d2l0aFNjcmlwdFN0YXRlVm9pZEV4Y2VwdGlvbkNhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6 OlRlc3RPYmpWOEludGVybmFsOjp3aXRoU2NyaXB0U3RhdGVPYmpFeGNlcHRpb25DYWxsYmFjayk6 CisgICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6d2l0aFNjcmlwdEV4ZWN1dGlv bkNvbnRleHRBbmRTY3JpcHRTdGF0ZU9iakV4Y2VwdGlvbkNhbGxiYWNrKToKKyAgICAgICAgKFdl YkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjpnZXRTVkdEb2N1bWVudENhbGxiYWNrKToKKyAgICAg ICAgKFdlYkNvcmU6OlRlc3RPYmpWOEludGVybmFsOjpzdHJpY3RGdW5jdGlvbkNhbGxiYWNrKToK KwogMjAxMi0wNC0yMyAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4K IAogICAgICAgICBDdXQgZGVwZW5kZW5jeSBvbiBSZW5kZXJMYXllcjo6c2Nyb2xsUmVjdFRvVmlz aWJsZSBvdXRzaWRlIHJlbmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCA5MmYzMzYxYjhmODQ1YjEyZDdmM2FjOWRl NzU2YzcwMTQ1ZmI0OGUxLi43ZjE5NjdkMGEyMDEzMzYxNzQ2MWM2NTBmOGU4OTk2OTNiOGE4NGNl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JWOC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JWOC5wbQpAQCAtNjM2LDEwICs2MzYsMTEgQEAgc3ViIEdlbmVyYXRlSGVhZGVyQ3VzdG9tQ2Fs bAogc3ViIEdlbmVyYXRlU2V0RE9NRXhjZXB0aW9uCiB7CiAgICAgbXkgJGluZGVudCA9IHNoaWZ0 OworICAgIG15ICRnZXRJc29sYXRlID0gc2hpZnQ7CiAgICAgbXkgJHJlc3VsdCA9ICIiOwogCiAg ICAgJHJlc3VsdCAuPSAkaW5kZW50IC4gImlmIChVTkxJS0VMWShlYykpIHtcbiI7Ci0gICAgJHJl c3VsdCAuPSAkaW5kZW50IC4gIiAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpO1xuIjsK KyAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAiICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihl YywgJGdldElzb2xhdGUpO1xuIjsKICAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAiICAgIHJldHVy biB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtcbiI7CiAgICAgJHJlc3VsdCAuPSAkaW5kZW50IC4g In1cbiI7CiAKQEAgLTg4OSw3ICs4OTAsNyBAQCBFTkQKICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgJG5hdGl2ZVR5cGUgdiA9ICRnZXR0 ZXJTdHJpbmc7XG4iKTsKICAgICAgICAgfQotICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xz LCBHZW5lcmF0ZVNldERPTUV4Y2VwdGlvbigiICAgICIpKTsKKyAgICAgICAgcHVzaChAaW1wbENv bnRlbnREZWNscywgR2VuZXJhdGVTZXRET01FeGNlcHRpb24oIiAgICAiLCAiaW5mby5HZXRJc29s YXRlKCkiKSk7CiAKICAgICAgICAgaWYgKCRjb2RlR2VuZXJhdG9yLT5FeHRlbmRlZEF0dHJpYnV0 ZUNvbnRhaW5zKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNh bGxXaXRoIn0sICJTY3JpcHRTdGF0ZSIpKSB7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dERlY2xzLCAiICAgIGlmIChzdGF0ZS5oYWRFeGNlcHRpb24oKSlcbiIpOwpAQCAtMTA2Miw3ICsx MDYzLDcgQEAgRU5ECiAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiRXhjZXB0aW9uQ29k ZS5oIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICRzdmdOYXRp dmVUeXBlKiB3cmFwcGVyID0gVjgke2ltcGxDbGFzc05hbWV9Ojp0b05hdGl2ZShpbmZvLkhvbGRl cigpKTtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBpZiAo d3JhcHBlci0+cm9sZSgpID09IEFuaW1WYWxSb2xlKSB7XG4iKTsKLSAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihOT19N T0RJRklDQVRJT05fQUxMT1dFRF9FUlIpO1xuIik7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudERlY2xzLCAiICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oTk9fTU9ESUZJQ0FU SU9OX0FMTE9XRURfRVJSLCBpbmZvLkdldElzb2xhdGUoKSk7XG4iKTsKICAgICAgICAgICAgIHB1 c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybjtcbiIpOwogICAgICAgICAgICAg cHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICB9XG4iKTsKICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50RGVjbHMsICIgICAgJHN2Z1dyYXBwZWROYXRpdmVUeXBlJiBpbXBJbnN0YW5jZSA9 IHdyYXBwZXItPnByb3BlcnR5UmVmZXJlbmNlKCk7XG4iKTsKQEAgLTExNzksNyArMTE4MCw3IEBA IEVORAogCiAgICAgaWYgKCR1c2VFeGNlcHRpb25zKSB7CiAgICAgICAgIHB1c2goQGltcGxDb250 ZW50RGVjbHMsICIgICAgaWYgKFVOTElLRUxZKGVjKSlcbiIpOwotICAgICAgICBwdXNoKEBpbXBs Q29udGVudERlY2xzLCAiICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpO1xuIik7 CisgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIFY4UHJveHk6OnNldERP TUV4Y2VwdGlvbihlYywgaW5mby5HZXRJc29sYXRlKCkpO1xuIik7CiAgICAgfQogCiAgICAgaWYg KCRjb2RlR2VuZXJhdG9yLT5FeHRlbmRlZEF0dHJpYnV0ZUNvbnRhaW5zKCRhdHRyaWJ1dGUtPnNp Z25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNhbGxXaXRoIn0sICJTY3JpcHRTdGF0ZSIp KSB7CkBAIC0xMzk3LDcgKzEzOTgsNyBAQCBFTkQKICAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1 ZGVzKCJFeGNlcHRpb25Db2RlLmgiKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVj bHMsICIgICAgJG5hdGl2ZUNsYXNzTmFtZSB3cmFwcGVyID0gVjgke2ltcGxDbGFzc05hbWV9Ojp0 b05hdGl2ZShhcmdzLkhvbGRlcigpKTtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnREZWNscywgIiAgICBpZiAod3JhcHBlci0+cm9sZSgpID09IEFuaW1WYWxSb2xlKSB7XG4iKTsK LSAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIFY4UHJveHk6OnNl dERPTUV4Y2VwdGlvbihOT19NT0RJRklDQVRJT05fQUxMT1dFRF9FUlIpO1xuIik7CisgICAgICAg ICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgICAgICBWOFByb3h5OjpzZXRET01FeGNl cHRpb24oTk9fTU9ESUZJQ0FUSU9OX0FMTE9XRURfRVJSLCBhcmdzLkdldElzb2xhdGUoKSk7XG4i KTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgICAgIHJldHVybiB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnREZWNscywgIiAgICB9XG4iKTsKICAgICAgICAgICAgIG15ICRzdmdXcmFwcGVkTmF0aXZlVHlw ZSA9ICRjb2RlR2VuZXJhdG9yLT5HZXRTVkdXcmFwcGVkVHlwZU5lZWRpbmdUZWFyT2ZmKCRpbXBs Q2xhc3NOYW1lKTsKQEAgLTE0NTQsNyArMTQ1NSw3IEBAIEVORAogICAgIGlmICgkcmFpc2VzRXhj ZXB0aW9ucykgewogICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIH1cbiIpOwog ICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIGZhaWw6XG4iKTsKLSAgICAgICAg cHVzaChAaW1wbENvbnRlbnREZWNscywgIiAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMp O1xuIik7CisgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7XG4iKTsKICAgICAgICAgcHVzaChA aW1wbENvbnRlbnREZWNscywgIiAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7XG4i KTsKICAgICB9CiAKQEAgLTE2NjgsNyArMTY2OSw3IEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnND aGVjawogICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIgICAgaWYgKGFy Z3MuTGVuZ3RoKCkgPiAkcGFyYW1JbmRleCAmJiAhJHBhcmFtZXRlck5hbWUuaXNVbmRlZmluZWRP ck51bGwoKSAmJiAhJHBhcmFtZXRlck5hbWUuaXNPYmplY3QoKSkge1xuIjsKICAgICAgICAgICAg ICAgIGlmIChAeyRmdW5jdGlvbi0+cmFpc2VzRXhjZXB0aW9uc30pIHsKICAgICAgICAgICAgICAg ICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICAgICAgZWMgPSBUWVBFX01JU01BVENI X0VSUjtcbiI7Ci0gICAgICAgICAgICAgICAgICAgJHBhcmFtZXRlckNoZWNrU3RyaW5nIC49ICIg ICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7XG4iOworICAgICAgICAgICAgICAg ICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAuPSAiICAgICAgICBWOFByb3h5OjpzZXRET01FeGNl cHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTtcbiI7CiAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAkcGFyYW1ldGVyQ2hlY2tTdHJpbmcgLj0gIiAgICAgICAgcmV0dXJuIHRocm93 RXJyb3IoXCJOb3QgYW4gb2JqZWN0LlwiLCBWOFByb3h5OjpUeXBlRXJyb3IpO1xuIjsKICAgICAg ICAgICAgICAgICRwYXJhbWV0ZXJDaGVja1N0cmluZyAuPSAiICAgIH1cbiI7CkBAIC0zMjg2LDcg KzMyODcsNyBAQCBzdWIgR2VuZXJhdGVGdW5jdGlvbkNhbGxTdHJpbmcoKQogICAgICAgICB9IGVs c2lmICgkY29kZUdlbmVyYXRvci0+SXNTVkdUeXBlTmVlZGluZ1RlYXJPZmYoJHBhcmFtZXRlci0+ dHlwZSkgYW5kIG5vdCAkaW1wbENsYXNzTmFtZSA9fiAvTGlzdCQvKSB7CiAgICAgICAgICAgICBw dXNoIEBhcmd1bWVudHMsICIkcGFyYW1OYW1lLT5wcm9wZXJ0eVJlZmVyZW5jZSgpIjsKICAgICAg ICAgICAgICRyZXN1bHQgLj0gJGluZGVudCAuICJpZiAoISRwYXJhbU5hbWUpIHtcbiI7Ci0gICAg ICAgICAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAiICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlv bihXZWJDb3JlOjpUWVBFX01JU01BVENIX0VSUik7XG4iOworICAgICAgICAgICAgJHJlc3VsdCAu PSAkaW5kZW50IC4gIiAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oV2ViQ29yZTo6VFlQRV9N SVNNQVRDSF9FUlIsIGFyZ3MuR2V0SXNvbGF0ZSgpKTtcbiI7CiAgICAgICAgICAgICAkcmVzdWx0 IC49ICRpbmRlbnQgLiAiICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTtcbiI7CiAg ICAgICAgICAgICAkcmVzdWx0IC49ICRpbmRlbnQgLiAifVxuIjsKICAgICAgICAgfSBlbHNpZiAo JHBhcmFtZXRlci0+dHlwZSBlcSAiU1ZHTWF0cml4IiBhbmQgJGltcGxDbGFzc05hbWUgZXEgIlNW R1RyYW5zZm9ybUxpc3QiKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50VGFyZ2V0LmNwcAppbmRleCAwNjg3ZmRk ZjE2Yzk4NjJlOGFkNTQ4OTVmYTAwZjQwNzdiNjUwZTVkLi4yMDAwOGQ5YjE4M2U2ODliYWNhNjk1 MzY3NDlhODVkNDZjNGZjZDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudFRhcmdldC5jcHAKQEAgLTU4LDcg KzU4LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBpdGVtQ2FsbGJhY2soY29uc3Qg djg6OkFyZ3VtZW50cyYgYXJncykKICAgICByZXR1cm4gdG9WOChpbXAtPml0ZW0oaW5kZXgpKTsK ICAgICB9CiAgICAgZmFpbDoKLSAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAg IFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIHJl dHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KIApAQCAtOTksNyArOTksNyBAQCBzdGF0 aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGRpc3BhdGNoRXZlbnRDYWxsYmFjayhjb25zdCB2ODo6 QXJndW1lbnRzJiBhcmdzKQogICAgIHJldHVybiB2OEJvb2xlYW4ocmVzdWx0KTsKICAgICB9CiAg ICAgZmFpbDoKLSAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgIFY4UHJveHk6 OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIHJldHVybiB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcAppbmRleCAxYjBi ZjgzMzVhOTg0NWE5YTAwMWViMTI2ZDlmOGYxNDc3MjEzNTg2Li5kNjQ0ZGY5M2JmNDNlNmFkYTlm ZjEzNDk2YzA5ZmE1ZGJkNGFkODRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcApAQCAtMTM5LDcg KzEzOSw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gc3VwcGxlbWVudGFsTWV0aG9k MkNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyCiAgICAgcmV0dXJuIHRvVjgocmVzdWx0 LnJlbGVhc2UoKSwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIH0KICAgICBmYWlsOgotICAgIFY4 UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9u KGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVl PigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RPYmouY3BwCmluZGV4IGZhM2NhZWU4ZGU1NTA1MDI2MzIzNjA0NzAxMTA5MDZi NzVlYWRhYTIuLmQzNDNiNGMxY2U0ZmU2MDJhZTRmMTA1M2ZjZDU3OGY5NmEzOTllYWEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmou Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RP YmouY3BwCkBAIC02MjYsNyArNjI2LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBh dHRyV2l0aEdldHRlckV4Y2VwdGlvbkF0dHJHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHIKICAgICBF eGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBpbnQgdiA9IGltcC0+YXR0cldpdGhHZXR0ZXJFeGNl cHRpb24oZWMpOwogICAgIGlmIChVTkxJS0VMWShlYykpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBp bmZvLkdldElzb2xhdGUoKSk7CiAgICAgICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4o KTsKICAgICB9CiAgICAgcmV0dXJuIHY4OjpJbnRlZ2VyOjpOZXcodik7CkBAIC02NDAsNyArNjQw LDcgQEAgc3RhdGljIHZvaWQgYXR0cldpdGhHZXR0ZXJFeGNlcHRpb25BdHRyU2V0dGVyKHY4OjpM b2NhbDx2ODo6U3RyaW5nPiBuYW1lLCB2ODo6TG8KICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsK ICAgICBpbXAtPnNldEF0dHJXaXRoR2V0dGVyRXhjZXB0aW9uKHYsIGVjKTsKICAgICBpZiAoVU5M SUtFTFkoZWMpKQotICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgICAg ICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGluZm8uR2V0SXNvbGF0ZSgpKTsKICAgICBy ZXR1cm47CiB9CiAKQEAgLTY1OSw3ICs2NTksNyBAQCBzdGF0aWMgdm9pZCBhdHRyV2l0aFNldHRl ckV4Y2VwdGlvbkF0dHJTZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hbWUsIHY4OjpMbwog ICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIGltcC0+c2V0QXR0cldpdGhTZXR0ZXJFeGNl cHRpb24odiwgZWMpOwogICAgIGlmIChVTkxJS0VMWShlYykpCi0gICAgICAgIFY4UHJveHk6OnNl dERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywg aW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJldHVybjsKIH0KIApAQCAtNjcwLDcgKzY3MCw3IEBA IHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gc3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRp b25BdHRyR2V0dGVyKHY4OjpMb2NhbDx2CiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7CiAgICAg U3RyaW5nIHYgPSBpbXAtPnN0cmluZ0F0dHJXaXRoR2V0dGVyRXhjZXB0aW9uKGVjKTsKICAgICBp ZiAoVU5MSUtFTFkoZWMpKSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7 CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgaW5mby5HZXRJc29sYXRlKCkp OwogICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiAgICAgfQogICAgIHJl dHVybiB2OFN0cmluZyh2LCBpbmZvLkdldElzb2xhdGUoKSk7CkBAIC02ODQsNyArNjg0LDcgQEAg c3RhdGljIHZvaWQgc3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRpb25BdHRyU2V0dGVyKHY4OjpM b2NhbDx2ODo6U3RyaW5nPiBuYW1lLAogICAgIEV4Y2VwdGlvbkNvZGUgZWMgPSAwOwogICAgIGlt cC0+c2V0U3RyaW5nQXR0cldpdGhHZXR0ZXJFeGNlcHRpb24odiwgZWMpOwogICAgIGlmIChVTkxJ S0VMWShlYykpCi0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAg IFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgaW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJl dHVybjsKIH0KIApAQCAtNzAzLDcgKzcwMyw3IEBAIHN0YXRpYyB2b2lkIHN0cmluZ0F0dHJXaXRo U2V0dGVyRXhjZXB0aW9uQXR0clNldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwKICAg ICBFeGNlcHRpb25Db2RlIGVjID0gMDsKICAgICBpbXAtPnNldFN0cmluZ0F0dHJXaXRoU2V0dGVy RXhjZXB0aW9uKHYsIGVjKTsKICAgICBpZiAoVU5MSUtFTFkoZWMpKQotICAgICAgICBWOFByb3h5 OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgICAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24o ZWMsIGluZm8uR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm47CiB9CiAKQEAgLTc2Myw3ICs3NjMs NyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHdpdGhTY3JpcHRTdGF0ZUF0dHJpYnV0 ZVJhaXNlc0F0dHJHZXR0ZXIodjg6OkxvY2FsPAogICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5l ZCgpOwogICAgIFJlZlB0cjxUZXN0T2JqPiB2ID0gaW1wLT53aXRoU2NyaXB0U3RhdGVBdHRyaWJ1 dGVSYWlzZXMoc3RhdGUsIGVjKTsKICAgICBpZiAoVU5MSUtFTFkoZWMpKSB7Ci0gICAgICAgIFY4 UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2Vw dGlvbihlYywgaW5mby5HZXRJc29sYXRlKCkpOwogICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2 ODo6VmFsdWU+KCk7CiAgICAgfQogICAgIGlmIChzdGF0ZS5oYWRFeGNlcHRpb24oKSkKQEAgLTc4 Miw3ICs3ODIsNyBAQCBzdGF0aWMgdm9pZCB3aXRoU2NyaXB0U3RhdGVBdHRyaWJ1dGVSYWlzZXNB dHRyU2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLAogICAgICAgICByZXR1cm47CiAg ICAgaW1wLT5zZXRXaXRoU2NyaXB0U3RhdGVBdHRyaWJ1dGVSYWlzZXMoc3RhdGUsIFdURjo6Z2V0 UHRyKHYpLCBlYyk7CiAgICAgaWYgKFVOTElLRUxZKGVjKSkKLSAgICAgICAgVjhQcm94eTo6c2V0 RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBp bmZvLkdldElzb2xhdGUoKSk7CiAgICAgaWYgKHN0YXRlLmhhZEV4Y2VwdGlvbigpKQogICAgICAg ICB0aHJvd0Vycm9yKHN0YXRlLmV4Y2VwdGlvbigpKTsKICAgICByZXR1cm47CkBAIC03OTgsNyAr Nzk4LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB3aXRoU2NyaXB0RXhlY3V0aW9u Q29udGV4dEF0dHJpYnV0ZVJhaXNlc0F0dHJHZXR0ZXIKICAgICAgICAgcmV0dXJuIHY4OjpVbmRl ZmluZWQoKTsKICAgICBSZWZQdHI8VGVzdE9iaj4gdiA9IGltcC0+d2l0aFNjcmlwdEV4ZWN1dGlv bkNvbnRleHRBdHRyaWJ1dGVSYWlzZXMoc2NyaXB0Q29udGV4dCwgZWMpOwogICAgIGlmIChVTkxJ S0VMWShlYykpIHsKLSAgICAgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICAg ICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBpbmZvLkdldElzb2xhdGUoKSk7CiAgICAg ICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKICAgICB9CiAgICAgcmV0dXJuIHRv Vjgodi5yZWxlYXNlKCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKQEAgLTgxNSw3ICs4MTUsNyBAQCBz dGF0aWMgdm9pZCB3aXRoU2NyaXB0RXhlY3V0aW9uQ29udGV4dEF0dHJpYnV0ZVJhaXNlc0F0dHJT ZXR0ZXIodjg6OkxvY2FsPHY4OjpTdAogICAgICAgICByZXR1cm47CiAgICAgaW1wLT5zZXRXaXRo U2NyaXB0RXhlY3V0aW9uQ29udGV4dEF0dHJpYnV0ZVJhaXNlcyhzY3JpcHRDb250ZXh0LCBXVEY6 OmdldFB0cih2KSwgZWMpOwogICAgIGlmIChVTkxJS0VMWShlYykpCi0gICAgICAgIFY4UHJveHk6 OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihl YywgaW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJldHVybjsKIH0KIApAQCAtODYyLDcgKzg2Miw3 IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gd2l0aFNjcmlwdEV4ZWN1dGlvbkNvbnRl eHRBbmRTY3JpcHRTdGF0ZUF0dHJpYnV0ZVJhCiAgICAgICAgIHJldHVybiB2ODo6VW5kZWZpbmVk KCk7CiAgICAgUmVmUHRyPFRlc3RPYmo+IHYgPSBpbXAtPndpdGhTY3JpcHRFeGVjdXRpb25Db250 ZXh0QW5kU2NyaXB0U3RhdGVBdHRyaWJ1dGVSYWlzZXMoc3RhdGUsIHNjcmlwdENvbnRleHQsIGVj KTsKICAgICBpZiAoVU5MSUtFTFkoZWMpKSB7Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2Vw dGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgaW5mby5HZXRJ c29sYXRlKCkpOwogICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiAgICAg fQogICAgIGlmIChzdGF0ZS5oYWRFeGNlcHRpb24oKSkKQEAgLTg4NCw3ICs4ODQsNyBAQCBzdGF0 aWMgdm9pZCB3aXRoU2NyaXB0RXhlY3V0aW9uQ29udGV4dEFuZFNjcmlwdFN0YXRlQXR0cmlidXRl UmFpc2VzQXR0clNldHRlcih2OAogICAgICAgICByZXR1cm47CiAgICAgaW1wLT5zZXRXaXRoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dEFuZFNjcmlwdFN0YXRlQXR0cmlidXRlUmFpc2VzKHN0YXRlLCBz Y3JpcHRDb250ZXh0LCBXVEY6OmdldFB0cih2KSwgZWMpOwogICAgIGlmIChVTkxJS0VMWShlYykp Ci0gICAgICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgICAgIFY4UHJveHk6 OnNldERPTUV4Y2VwdGlvbihlYywgaW5mby5HZXRJc29sYXRlKCkpOwogICAgIGlmIChzdGF0ZS5o YWRFeGNlcHRpb24oKSkKICAgICAgICAgdGhyb3dFcnJvcihzdGF0ZS5leGNlcHRpb24oKSk7CiAg ICAgcmV0dXJuOwpAQCAtMTMxNCw3ICsxMzE0LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBtZXRob2RUaGF0UmVxdWlyZXNBbGxBcmdzQW5kVGhyb3dzQ2FsbGJhY2soY29uc3QgdjgK ICAgICByZXR1cm4gdG9WOChyZXN1bHQucmVsZWFzZSgpLCBhcmdzLkdldElzb2xhdGUoKSk7CiAg ICAgfQogICAgIGZhaWw6Ci0gICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICBW OFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1 cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiB9CiAKQEAgLTEzNzcsNyArMTM3Nyw3IEBAIHN0 YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gbWV0aG9kV2l0aEV4Y2VwdGlvbkNhbGxiYWNrKGNv bnN0IHY4OjpBcmd1bWVudHMmIGFyCiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigp OwogICAgIH0KICAgICBmYWlsOgotICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7Cisg ICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAg cmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogfQogCkBAIC0xNDQwLDcgKzE0NDAsNyBA QCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHdpdGhTY3JpcHRTdGF0ZVZvaWRFeGNlcHRp b25DYWxsYmFjayhjb25zdCB2ODo6QXJndQogICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4oKTsKICAgICB9CiAgICAgZmFpbDoKLSAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMp OworICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwog ICAgIHJldHVybiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KIApAQCAtMTQ1OSw3ICsxNDU5 LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB3aXRoU2NyaXB0U3RhdGVPYmpFeGNl cHRpb25DYWxsYmFjayhjb25zdCB2ODo6QXJndW0KICAgICByZXR1cm4gdG9WOChyZXN1bHQucmVs ZWFzZSgpLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgfQogICAgIGZhaWw6Ci0gICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjKTsKKyAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMs IGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7 CiB9CiAKQEAgLTE1MDYsNyArMTUwNiw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g d2l0aFNjcmlwdEV4ZWN1dGlvbkNvbnRleHRBbmRTY3JpcHRTdGF0ZU9iakV4Y2VwdGlvCiAgICAg cmV0dXJuIHRvVjgocmVzdWx0LnJlbGVhc2UoKSwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIH0K ICAgICBmYWlsOgotICAgIFY4UHJveHk6OnNldERPTUV4Y2VwdGlvbihlYyk7CisgICAgVjhQcm94 eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4 OjpIYW5kbGU8djg6OlZhbHVlPigpOwogfQogCkBAIC0xODk1LDcgKzE4OTUsNyBAQCBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldFNWR0RvY3VtZW50Q2FsbGJhY2soY29uc3Qgdjg6OkFy Z3VtZW50cyYgYXJncykKICAgICByZXR1cm4gdG9WOChyZXN1bHQucmVsZWFzZSgpKTsKICAgICB9 CiAgICAgZmFpbDoKLSAgICBWOFByb3h5OjpzZXRET01FeGNlcHRpb24oZWMpOworICAgIFY4UHJv eHk6OnNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIHJldHVybiB2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4oKTsKIH0KIApAQCAtMTk5Myw3ICsxOTkzLDcgQEAgc3RhdGlj IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBzdHJpY3RGdW5jdGlvbkNhbGxiYWNrKGNvbnN0IHY4OjpB cmd1bWVudHMmIGFyZ3MpCiAgICAgcmV0dXJuIHRvVjgocmVzdWx0LnJlbGVhc2UoKSwgYXJncy5H ZXRJc29sYXRlKCkpOwogICAgIH0KICAgICBmYWlsOgotICAgIFY4UHJveHk6OnNldERPTUV4Y2Vw dGlvbihlYyk7CisgICAgVjhQcm94eTo6c2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdzLkdldElzb2xh dGUoKSk7CiAgICAgcmV0dXJuIHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogfQogCg==