107679 2013-01-23 05:26:54 -0800 [V8] Add an optional Isolate parameter to GetTemplate() and GetRawTemplate() 2013-01-23 17:03:14 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth eric.carlson feature-media-reviews japhet webkit.review.bot oldest_to_newest 814130 0 haraken 2013-01-23 05:26:54 -0800 It is important to pass an Isolate to GetTemplate() and GetRawTemplate(). To proceed the work incrementally, this patch adds an optional Isolate parameter to GetTemplate() and GetRawTemplate(). Once all call sites are updated, the Isolate parameter will be made mandatory. 814136 1 184209 haraken 2013-01-23 05:43:02 -0800 Created attachment 184209 Patch 814851 2 184209 webkit.review.bot 2013-01-23 17:03:11 -0800 Comment on attachment 184209 Patch Clearing flags on attachment: 184209 Committed r140616: <http://trac.webkit.org/changeset/140616> 814852 3 webkit.review.bot 2013-01-23 17:03:14 -0800 All reviewed patches have been landed. Closing bug. 184209 2013-01-23 05:43:02 -0800 2013-01-23 17:03:11 -0800 Patch bug-107679-20130123223955.patch text/plain 46783 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwNTAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTAxMmQ2N2IwZGFkNDNj YTgwNjVmOGE2MzgwNmUwNmE0MjVmYzA1ZC4uY2I1YTQ4YmFiMDFkNDc4Y2FkYmNlM2E4YzM1YmM0 OWUxNzdmYzc2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDk2IEBACisyMDEzLTAxLTIzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIEFkZCBhbiBv cHRpb25hbCBJc29sYXRlIHBhcmFtZXRlciB0byBHZXRUZW1wbGF0ZSgpIGFuZCBHZXRSYXdUZW1w bGF0ZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDc2NzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ dCBpcyBpbXBvcnRhbnQgdG8gcGFzcyBhbiBJc29sYXRlIHRvIEdldFRlbXBsYXRlKCkgYW5kIEdl dFJhd1RlbXBsYXRlKCkuCisgICAgICAgIFRvIHByb2NlZWQgdGhlIHdvcmsgaW5jcmVtZW50YWxs eSwgdGhpcyBwYXRjaCBhZGRzIGFuIG9wdGlvbmFsIElzb2xhdGUgcGFyYW1ldGVyCisgICAgICAg IHRvIEdldFRlbXBsYXRlKCkgYW5kIEdldFJhd1RlbXBsYXRlKCkuIE9uY2UgYWxsIGNhbGwgc2l0 ZXMgYXJlIHVwZGF0ZWQsIHRoZQorICAgICAgICBJc29sYXRlIHBhcmFtZXRlciB3aWxsIGJlIG1h ZGUgbWFuZGF0b3J5LgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3Iu CisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAg ICAgKEdlbmVyYXRlSGVhZGVyKToKKyAgICAgICAgKEdlbmVyYXRlTmFtZWRDb25zdHJ1Y3RvckNh bGxiYWNrKToKKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOgorICAgICAgICAqIGJp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOEZsb2F0NjRBcnJheS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOEZsb2F0NjRBcnJheTo6R2V0UmF3VGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 VjhGbG9hdDY0QXJyYXk6OkdldFRlbXBsYXRlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L3Rlc3QvVjgvVjhGbG9hdDY0QXJyYXkuaDoKKyAgICAgICAgKFY4RmxvYXQ2NEFycmF5KToKKyAg ICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0QWN0aXZlRE9NT2JqZWN0LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdEFjdGl2ZURPTU9iamVjdDo6R2V0UmF3VGVtcGxh dGUpOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0QWN0aXZlRE9NT2JqZWN0OjpHZXRUZW1wbGF0 ZSk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEFjdGl2ZURPTU9i amVjdC5oOgorICAgICAgICAoVjhUZXN0QWN0aXZlRE9NT2JqZWN0KToKKyAgICAgICAgKiBiaW5k aW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q3VzdG9tTmFtZWRHZXR0ZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6VjhUZXN0Q3VzdG9tTmFtZWRHZXR0ZXI6OkdldFJhd1RlbXBsYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlY4VGVzdEN1c3RvbU5hbWVkR2V0dGVyOjpHZXRUZW1wbGF0ZSk6Cisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEN1c3RvbU5hbWVkR2V0dGVy Lmg6CisgICAgICAgIChWOFRlc3RDdXN0b21OYW1lZEdldHRlcik6CisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0b3IuY3BwOgorICAgICAgICAo V2ViQ29yZTo6VjhUZXN0RXZlbnRDb25zdHJ1Y3Rvcjo6R2V0UmF3VGVtcGxhdGUpOgorICAgICAg ICAoV2ViQ29yZTo6VjhUZXN0RXZlbnRDb25zdHJ1Y3Rvcjo6R2V0VGVtcGxhdGUpOgorICAgICAg ICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudENvbnN0cnVjdG9yLmg6Cisg ICAgICAgIChWOFRlc3RFdmVudENvbnN0cnVjdG9yKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhU ZXN0RXZlbnRUYXJnZXQ6OkdldFJhd1RlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVz dEV2ZW50VGFyZ2V0OjpHZXRUZW1wbGF0ZSk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L1Y4L1Y4VGVzdEV2ZW50VGFyZ2V0Lmg6CisgICAgICAgIChWOFRlc3RFdmVudFRhcmdldCk6 CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV4Y2VwdGlvbi5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RFeGNlcHRpb246OkdldFJhd1RlbXBsYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlY4VGVzdEV4Y2VwdGlvbjo6R2V0VGVtcGxhdGUpOgorICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFeGNlcHRpb24uaDoKKyAgICAgICAgKFY4 VGVzdEV4Y2VwdGlvbik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVz dEludGVyZmFjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RJbnRlcmZhY2U6OkdldFJh d1RlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdEludGVyZmFjZTo6R2V0VGVtcGxh dGUpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RJbnRlcmZhY2Uu aDoKKyAgICAgICAgKFY4VGVzdEludGVyZmFjZSk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VjhUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6R2V0UmF3VGVtcGxhdGUpOgorICAg ICAgICAoV2ViQ29yZTo6VjhUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6R2V0VGVtcGxhdGUp OgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RNZWRpYVF1ZXJ5TGlz dExpc3RlbmVyLmg6CisgICAgICAgIChWOFRlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyKToKKyAg ICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TmFtZWRDb25zdHJ1Y3Rvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3ROYW1lZENvbnN0cnVjdG9yQ29uc3RydWN0b3I6 OkdldFRlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdE5hbWVkQ29uc3RydWN0b3I6 OkdldFJhd1RlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdE5hbWVkQ29uc3RydWN0 b3I6OkdldFRlbXBsYXRlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhU ZXN0TmFtZWRDb25zdHJ1Y3Rvci5oOgorICAgICAgICAoVjhUZXN0TmFtZWRDb25zdHJ1Y3RvckNv bnN0cnVjdG9yKToKKyAgICAgICAgKFY4VGVzdE5hbWVkQ29uc3RydWN0b3IpOgorICAgICAgICAq IGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROb2RlLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlY4VGVzdE5vZGU6OkdldFJhd1RlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVz dE5vZGU6OkdldFRlbXBsYXRlKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0Tm9kZS5oOgorICAgICAgICAoVjhUZXN0Tm9kZSk6CisgICAgICAgICogYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RP Ymo6OkdldFJhd1RlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdE9iajo6R2V0VGVt cGxhdGUpOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouaDoK KyAgICAgICAgKFY4VGVzdE9iaik6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4 L1Y4VGVzdE92ZXJsb2FkZWRDb25zdHJ1Y3RvcnMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhU ZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9yczo6R2V0UmF3VGVtcGxhdGUpOgorICAgICAgICAoV2Vi Q29yZTo6VjhUZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9yczo6R2V0VGVtcGxhdGUpOgorICAgICAg ICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3Jz Lmg6CisgICAgICAgIChWOFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3JzKToKKyAgICAgICAgKiBi aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJm YWNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUlu dGVyZmFjZTo6R2V0UmF3VGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0U2VyaWFs aXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlOjpHZXRUZW1wbGF0ZSk6CisgICAgICAgICogYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZS5o OgorICAgICAgICAoVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlKToKKyAgICAg ICAgKiBiaW5kaW5ncy92OC9XcmFwcGVyVHlwZUluZm8uaDoKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6V3JhcHBlclR5cGVJbmZvOjpnZXRUZW1wbGF0ZSk6CisgICAgICAg ICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlY4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yOjpHZXRUZW1w bGF0ZSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEltYWdlRWxlbWVudENv bnN0cnVjdG9yLmg6CisgICAgICAgIChWOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvcik6CisK IDIwMTMtMDEtMjIgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAg ICAgICBVc2UgYSBwbGF0Zm9ybSBzdHJhdGVneSBmb3IgbG9jYWwgc3RvcmFnZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCA1 MWQ3ZjM3OTk4NTg4ZjY3YTg3NTA4MjMxZmRhZDEwZDY1ZDE1MDhjLi4xMDk3NWY2ZmM2ZDk0MDVi ZDU2ZDM0OTE2OTE0OTAyODQ3NWVlMmU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQpAQCAtMzI1LDcgKzMyNSw3IEBAIHN1YiBH ZW5lcmF0ZUhlYWRlcgogICAgICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCA8PEVORCk7CiBjbGFz cyBWOCR7bmF0aXZlVHlwZX1Db25zdHJ1Y3RvciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHY4OjpQ ZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSgpOworICAgIHN0YXRp YyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVtcGxhdGUodjg6Oklz b2xhdGUqKTsKICAgICBzdGF0aWMgV3JhcHBlclR5cGVJbmZvIGluZm87CiB9OwogCkBAIC0zNTUs OCArMzU1LDggQEAgRU5ECiAKICAgICBwdXNoKEBoZWFkZXJDb250ZW50LCA8PEVORCk7CiAgICAg c3RhdGljIGJvb2wgSGFzSW5zdGFuY2Uodjg6OkhhbmRsZTx2ODo6VmFsdWU+KTsKLSAgICBzdGF0 aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJhd1RlbXBsYXRlKCk7 Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1w bGF0ZSgpOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4g R2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CisgICAgc3RhdGljIHY4OjpQZXJzaXN0 ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAwKTsK ICAgICBzdGF0aWMgJHtuYXRpdmVUeXBlfSogdG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0 PiBvYmplY3QpCiAgICAgewogICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDwke25hdGl2 ZVR5cGV9Kj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9N V3JhcHBlck9iamVjdEluZGV4KSk7CkBAIC0yMTY4LDggKzIxNjgsMTAgQEAgRU5ECiAKICAgICBw dXNoKEBpbXBsQ29udGVudCwgPDxFTkQpOwogCi12ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25U ZW1wbGF0ZT4gJHt2OEludGVyZmFjZU5hbWV9Q29uc3RydWN0b3I6OkdldFRlbXBsYXRlKCkKK3Y4 OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiAke3Y4SW50ZXJmYWNlTmFtZX1Db25z dHJ1Y3Rvcjo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7CisgICAgaWYgKCFp c29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKICAg ICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IGNhY2hlZFRlbXBs YXRlOwogICAgIGlmICghY2FjaGVkVGVtcGxhdGUuSXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g Y2FjaGVkVGVtcGxhdGU7CkBAIC0zMDU2LDkgKzMwNTgsMTEgQEAgRU5ECiAgICAgcmV0dXJuIGRl c2M7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiAke3Y4SW50ZXJm YWNlTmFtZX06OkdldFJhd1RlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRl bXBsYXRlPiAke3Y4SW50ZXJmYWNlTmFtZX06OkdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiBp c29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRh OjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklz b2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJ c29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1wbGF0 ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5maW5kKCZpbmZv KTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZW5kKCkpCiAgICAg ICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpAQCAtMzA2OSw5ICszMDczLDExIEBAIHY4OjpQZXJz aXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiAke3Y4SW50ZXJmYWNlTmFtZX06OkdldFJhd1Rl bXBsYXRlKCkKICAgICByZXR1cm4gdGVtcGw7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5j dGlvblRlbXBsYXRlPiAke3Y4SW50ZXJmYWNlTmFtZX06OkdldFRlbXBsYXRlKCkKK3Y4OjpQZXJz aXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiAke3Y4SW50ZXJmYWNlTmFtZX06OkdldFRlbXBs YXRlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEg PSBWOFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAg ICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVE YXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklz b2xhdGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+dGVtcGxhdGVN YXAoKS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnRlbXBsYXRlTWFwKCku ZW5kKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4RmxvYXQ2NEFycmF5LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOEZsb2F0NjRBcnJheS5jcHAK aW5kZXggNGRhYWYzNTExZmQ3OGFmNGQ3MGUyMTRjNmQ2MGIwYTFjYmM3MWE2Yy4uYzBjMGJiZmZl Njk0ZjNiM2I0ZDU5NWQ5MjM1NDkyMGZhZWU1NTM0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4RmxvYXQ2NEFycmF5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhGbG9hdDY0QXJyYXkuY3BwCkBA IC0xMDksOSArMTA5LDExIEBAIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1w bGF0ZT4gQ29uZmlndXJlVjhGbG9hdDY0QXJyYXlUZW1wbGF0ZSh2ODo6CiAgICAgcmV0dXJuIGRl c2M7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOEZsb2F0NjRB cnJheTo6R2V0UmF3VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxh dGU+IFY4RmxvYXQ2NEFycmF5OjpHZXRSYXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogaXNvbGF0ZSkK IHsKLSAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVu dCgpOworICAgIGlmICghaXNvbGF0ZSkKKyAgICAgICAgaXNvbGF0ZSA9IHY4OjpJc29sYXRlOjpH ZXRDdXJyZW50KCk7CisgICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURh dGE6OmZyb20oaXNvbGF0ZSk7CiAgICAgVjhQZXJJc29sYXRlRGF0YTo6VGVtcGxhdGVNYXA6Oml0 ZXJhdG9yIHJlc3VsdCA9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZmluZCgmaW5mbyk7CiAgICAg aWYgKHJlc3VsdCAhPSBkYXRhLT5yYXdUZW1wbGF0ZU1hcCgpLmVuZCgpKQogICAgICAgICByZXR1 cm4gcmVzdWx0LT52YWx1ZTsKQEAgLTEyMiw5ICsxMjQsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8djg6 OkZ1bmN0aW9uVGVtcGxhdGU+IFY4RmxvYXQ2NEFycmF5OjpHZXRSYXdUZW1wbGF0ZSgpCiAgICAg cmV0dXJuIHRlbXBsOwogfQogCi12ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4g VjhGbG9hdDY0QXJyYXk6OkdldFRlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlv blRlbXBsYXRlPiBWOEZsb2F0NjRBcnJheTo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xh dGUpCiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1 cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0 ZTo6R2V0Q3VycmVudCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xh dGVEYXRhOjpmcm9tKGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFw OjppdGVyYXRvciByZXN1bHQgPSBkYXRhLT50ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAg IGlmIChyZXN1bHQgIT0gZGF0YS0+dGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJu IHJlc3VsdC0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvVjgvVjhGbG9hdDY0QXJyYXkuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9WOC9WOEZsb2F0NjRBcnJheS5oCmluZGV4IDljNDdmNTI0ODNhYWY4YWNlMDY5 Yjk1YTI1NThlYzJlYzAxYjEyOGUuLjk2OTZmYmFiZTMyMThhM2VmY2Q2MzM5MDlkZmQwNTgxYmQ1 NjUwYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9W OC9WOEZsb2F0NjRBcnJheS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv dGVzdC9WOC9WOEZsb2F0NjRBcnJheS5oCkBAIC0zNiw4ICszNiw4IEBAIGNsYXNzIFY4RmxvYXQ2 NEFycmF5IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgYm9vbCBoYXNEZXBlbmRlbnRMaWZl dGltZSA9IFY4QXJyYXlCdWZmZXJWaWV3OjpoYXNEZXBlbmRlbnRMaWZldGltZTsKICAgICBzdGF0 aWMgYm9vbCBIYXNJbnN0YW5jZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4pOwotICAgIHN0YXRpYyB2 ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUoKTsKLSAg ICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRl KCk7CisgICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRS YXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAwKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8 djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKHY4OjpJc29sYXRlKiA9IDApOwogICAg IHN0YXRpYyBGbG9hdDY0QXJyYXkqIHRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2Jq ZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8RmxvYXQ2NEFycmF5 Kj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9NV3JhcHBl ck9iamVjdEluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvVjgvVjhUZXN0QWN0aXZlRE9NT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RBY3RpdmVET01PYmplY3QuY3BwCmluZGV4IDFh NjAyMDViODkwOGU0OTZmNDBkMWNjNDQyMjZkYTI5ZTAwNjFiZTYuLmNkOTM5NGIxNzhjOWI0YTcz YjI1MGIwMDlhMmZlNjY4YjFiODdhYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RBY3RpdmVET01PYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RBY3RpdmVET01PYmplY3Qu Y3BwCkBAIC0xMzcsOSArMTM3LDExIEBAIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rp b25UZW1wbGF0ZT4gQ29uZmlndXJlVjhUZXN0QWN0aXZlRE9NT2JqZWN0VGVtcGxhCiAgICAgcmV0 dXJuIGRlc2M7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRl c3RBY3RpdmVET01PYmplY3Q6OkdldFJhd1RlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpG dW5jdGlvblRlbXBsYXRlPiBWOFRlc3RBY3RpdmVET01PYmplY3Q6OkdldFJhd1RlbXBsYXRlKHY4 OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBl cklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29s YXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBk YXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVE YXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAo KS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCku ZW5kKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpAQCAtMTUwLDkgKzE1MiwxMSBA QCB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0QWN0aXZlRE9NT2Jq ZWN0OjpHZXRSYXdUZW1wbGF0ZSgpCiAgICAgcmV0dXJuIHRlbXBsOwogfQogCi12ODo6UGVyc2lz dGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0QWN0aXZlRE9NT2JqZWN0OjpHZXRUZW1w bGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0QWN0aXZl RE9NT2JqZWN0OjpHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKLSAgICBWOFBl cklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgpOworICAgIGlm ICghaXNvbGF0ZSkKKyAgICAgICAgaXNvbGF0ZSA9IHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCk7 CisgICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmZyb20oaXNv bGF0ZSk7CiAgICAgVjhQZXJJc29sYXRlRGF0YTo6VGVtcGxhdGVNYXA6Oml0ZXJhdG9yIHJlc3Vs dCA9IGRhdGEtPnRlbXBsYXRlTWFwKCkuZmluZCgmaW5mbyk7CiAgICAgaWYgKHJlc3VsdCAhPSBk YXRhLT50ZW1wbGF0ZU1hcCgpLmVuZCgpKQogICAgICAgICByZXR1cm4gcmVzdWx0LT52YWx1ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RBY3RpdmVET01PYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RBY3RpdmVET01PYmplY3QuaAppbmRleCBmYWVkMDM4MTE5OWMwMTRkZjdjYTdh YjQ4MzZiOTgyNmIyM2ZlMDQ3Li40YTQyMzcxMTFjYmM5YTJlMWZjNDE3ZmExMjllOGRhNjMwMjJk NTVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0QWN0aXZlRE9NT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy90ZXN0L1Y4L1Y4VGVzdEFjdGl2ZURPTU9iamVjdC5oCkBAIC0zNSw4ICszNSw4IEBAIGNs YXNzIFY4VGVzdEFjdGl2ZURPTU9iamVjdCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IGJv b2wgaGFzRGVwZW5kZW50TGlmZXRpbWUgPSBmYWxzZTsKICAgICBzdGF0aWMgYm9vbCBIYXNJbnN0 YW5jZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4pOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2 ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUoKTsKLSAgICBzdGF0aWMgdjg6OlBl cnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKCk7CisgICAgc3RhdGlj IHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSh2ODo6 SXNvbGF0ZSogPSAwKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVt cGxhdGU+IEdldFRlbXBsYXRlKHY4OjpJc29sYXRlKiA9IDApOwogICAgIHN0YXRpYyBUZXN0QWN0 aXZlRE9NT2JqZWN0KiB0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKICAg ICB7CiAgICAgICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFRlc3RBY3RpdmVET01PYmplY3Qq PihvYmplY3QtPkdldEFsaWduZWRQb2ludGVyRnJvbUludGVybmFsRmllbGQodjhET01XcmFwcGVy T2JqZWN0SW5kZXgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9WOC9WOFRlc3RDdXN0b21OYW1lZEdldHRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q3VzdG9tTmFtZWRHZXR0ZXIuY3BwCmluZGV4 IDkwYTAwZDk3NDk5N2VhZDQ0YWRkMGIwN2MyOTdjOTlhOTdkN2I1NDguLmI3YmM3NWNhZWRhZDg1 NjVkMjIxNjMwNmJkOTJmMmEzMzI0MDI5OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDdXN0b21OYW1lZEdldHRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEN1c3RvbU5hbWVk R2V0dGVyLmNwcApAQCAtNzUsOSArNzUsMTEgQEAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpG dW5jdGlvblRlbXBsYXRlPiBDb25maWd1cmVWOFRlc3RDdXN0b21OYW1lZEdldHRlclRlbXAKICAg ICByZXR1cm4gZGVzYzsKIH0KIAotdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+ IFY4VGVzdEN1c3RvbU5hbWVkR2V0dGVyOjpHZXRSYXdUZW1wbGF0ZSgpCit2ODo6UGVyc2lzdGVu dDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0Q3VzdG9tTmFtZWRHZXR0ZXI6OkdldFJhd1Rl bXBsYXRlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRh dGEgPSBWOFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAg ICAgICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xh dGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBl cklzb2xhdGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVt cGxhdGVNYXAoKS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBs YXRlTWFwKCkuZW5kKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpAQCAtODgsOSAr OTAsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdEN1c3Rv bU5hbWVkR2V0dGVyOjpHZXRSYXdUZW1wbGF0ZSgpCiAgICAgcmV0dXJuIHRlbXBsOwogfQogCi12 ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0Q3VzdG9tTmFtZWRHZXR0 ZXI6OkdldFRlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBW OFRlc3RDdXN0b21OYW1lZEdldHRlcjo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUp CiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJl bnQoKTsKKyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6 R2V0Q3VycmVudCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVE YXRhOjpmcm9tKGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjpp dGVyYXRvciByZXN1bHQgPSBkYXRhLT50ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlm IChyZXN1bHQgIT0gZGF0YS0+dGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJl c3VsdC0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRz L3Rlc3QvVjgvVjhUZXN0Q3VzdG9tTmFtZWRHZXR0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDdXN0b21OYW1lZEdldHRlci5oCmluZGV4IDlhYjAx NGM2OTk0ZWM5OGU0YTE0MjY4YzA3MzM2MjQzNDNmZGRjNzguLmM2NDVhNzkwODUyYThmMGIwYzk0 MmY3YmU3NTZiZTQ1NzVhMGI4MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDdXN0b21OYW1lZEdldHRlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDdXN0b21OYW1lZEdldHRlci5o CkBAIC0zNSw4ICszNSw4IEBAIGNsYXNzIFY4VGVzdEN1c3RvbU5hbWVkR2V0dGVyIHsKIHB1Ymxp YzoKICAgICBzdGF0aWMgY29uc3QgYm9vbCBoYXNEZXBlbmRlbnRMaWZldGltZSA9IGZhbHNlOwog ICAgIHN0YXRpYyBib29sIEhhc0luc3RhbmNlKHY4OjpIYW5kbGU8djg6OlZhbHVlPik7Ci0gICAg c3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0 ZSgpOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0 VGVtcGxhdGUoKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxh dGU+IEdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiA9IDApOworICAgIHN0YXRpYyB2ODo6UGVy c2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqID0g MCk7CiAgICAgc3RhdGljIFRlc3RDdXN0b21OYW1lZEdldHRlciogdG9OYXRpdmUodjg6OkhhbmRs ZTx2ODo6T2JqZWN0PiBvYmplY3QpCiAgICAgewogICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRf Y2FzdDxUZXN0Q3VzdG9tTmFtZWRHZXR0ZXIqPihvYmplY3QtPkdldEFsaWduZWRQb2ludGVyRnJv bUludGVybmFsRmllbGQodjhET01XcmFwcGVyT2JqZWN0SW5kZXgpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudENvbnN0cnVj dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RF dmVudENvbnN0cnVjdG9yLmNwcAppbmRleCA1ZmE2Y2UwZDFkNTVkM2U4ODRjNzFmODQ4Nzk4MGQ0 ZTQzOTQzNjY3Li5jZDcyYjQ4MGUyMjQ0MDU5MWYzZWEyNDI2NmU1NmZmMzE4MjI4NTcyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXZl bnRDb25zdHJ1Y3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0b3IuY3BwCkBAIC0xMDcsOSArMTA3LDExIEBAIHN0 YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gQ29uZmlndXJlVjhUZXN0 RXZlbnRDb25zdHJ1Y3RvclRlbXBsCiAgICAgcmV0dXJuIGRlc2M7CiB9CiAKLXY4OjpQZXJzaXN0 ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RFdmVudENvbnN0cnVjdG9yOjpHZXRSYXdU ZW1wbGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0RXZl bnRDb25zdHJ1Y3Rvcjo6R2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0g ICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsK KyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3Vy cmVudCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpm cm9tKGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRv ciByZXN1bHQgPSBkYXRhLT5yYXdUZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChy ZXN1bHQgIT0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJl c3VsdC0+dmFsdWU7CkBAIC0xMjAsOSArMTIyLDExIEBAIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5j dGlvblRlbXBsYXRlPiBWOFRlc3RFdmVudENvbnN0cnVjdG9yOjpHZXRSYXdUZW1wbGF0ZSgpCiAg ICAgcmV0dXJuIHRlbXBsOwogfQogCi12ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0 ZT4gVjhUZXN0RXZlbnRDb25zdHJ1Y3Rvcjo6R2V0VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8 djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdEV2ZW50Q29uc3RydWN0b3I6OkdldFRlbXBsYXRl KHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBW OFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBp c29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRh KiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xh dGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+dGVtcGxhdGVNYXAo KS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnRlbXBsYXRlTWFwKCkuZW5k KCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0b3IuaCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudENvbnN0 cnVjdG9yLmgKaW5kZXggMDJiMWE2NWViODRkZTgzYWU0NjE2YWQzNzFhYWQyOTUxNzg2OGJlYi4u YjJhZTYxNjMyNjE4ODFjMDVmZDgxZGIzMGJiZjg5NDJjNzIwNDNjZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50Q29uc3RydWN0 b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0 RXZlbnRDb25zdHJ1Y3Rvci5oCkBAIC0zNiw4ICszNiw4IEBAIGNsYXNzIFY4VGVzdEV2ZW50Q29u c3RydWN0b3IgewogcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBib29sIGhhc0RlcGVuZGVudExp ZmV0aW1lID0gZmFsc2U7CiAgICAgc3RhdGljIGJvb2wgSGFzSW5zdGFuY2Uodjg6OkhhbmRsZTx2 ODo6VmFsdWU+KTsKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxh dGU+IEdldFJhd1RlbXBsYXRlKCk7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5j dGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSgpOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2 ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7Cisg ICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0 ZSh2ODo6SXNvbGF0ZSogPSAwKTsKICAgICBzdGF0aWMgVGVzdEV2ZW50Q29uc3RydWN0b3IqIHRv TmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KQogICAgIHsKICAgICAgICAgcmV0 dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VGVzdEV2ZW50Q29uc3RydWN0b3IqPihvYmplY3QtPkdldEFs aWduZWRQb2ludGVyRnJvbUludGVybmFsRmllbGQodjhET01XcmFwcGVyT2JqZWN0SW5kZXgpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RFdmVudFRhcmdldC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv VjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwCmluZGV4IDMxZTJlZmFhNDQ2ZjYyMDM4NDkwYzg4OTVk YTViMmFjMTI0NGJiMTYuLjFiZTRmNDJiNTlkOWMxYzhmOTViZDA2MGJmODc1MmY1NDYxMDJiNDIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRl c3RFdmVudFRhcmdldC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L1Y4L1Y4VGVzdEV2ZW50VGFyZ2V0LmNwcApAQCAtMTM1LDkgKzEzNSwxMSBAQCBzdGF0aWMg djg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IENvbmZpZ3VyZVY4VGVzdEV2ZW50 VGFyZ2V0VGVtcGxhdGUodgogICAgIHJldHVybiBkZXNjOwogfQogCi12ODo6UGVyc2lzdGVudDx2 ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0RXZlbnRUYXJnZXQ6OkdldFJhd1RlbXBsYXRlKCkK K3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RFdmVudFRhcmdldDo6 R2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRl RGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xh dGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4 UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwog ICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRh LT5yYXdUZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+ cmF3VGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CkBA IC0xNDgsOSArMTUwLDExIEBAIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBW OFRlc3RFdmVudFRhcmdldDo6R2V0UmF3VGVtcGxhdGUoKQogICAgIHJldHVybiB0ZW1wbDsKIH0K IAotdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdEV2ZW50VGFyZ2V0 OjpHZXRUZW1wbGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhU ZXN0RXZlbnRUYXJnZXQ6OkdldFRlbXBsYXRlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAg IFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7Cisg ICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJl bnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJv bShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3Ig cmVzdWx0ID0gZGF0YS0+dGVtcGxhdGVNYXAoKS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0 ICE9IGRhdGEtPnRlbXBsYXRlTWFwKCkuZW5kKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZh bHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4 L1Y4VGVzdEV2ZW50VGFyZ2V0LmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuaAppbmRleCAzMzgyYmQ5M2I2YWYzMzVhOGNjZmY1YTIx Y2QzMWRmN2Y5MzFmMjQ5Li5iMmNkZWNkNjQ4ZjljMjAyODE3ODkyYjI2YzdhMjY2ZjI0MmFiZmEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhU ZXN0RXZlbnRUYXJnZXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuaApAQCAtMzUsOCArMzUsOCBAQCBjbGFzcyBWOFRlc3RF dmVudFRhcmdldCB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaGFzRGVwZW5kZW50 TGlmZXRpbWUgPSBmYWxzZTsKICAgICBzdGF0aWMgYm9vbCBIYXNJbnN0YW5jZSh2ODo6SGFuZGxl PHY4OjpWYWx1ZT4pOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1w bGF0ZT4gR2V0UmF3VGVtcGxhdGUoKTsKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1 bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKCk7CisgICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50 PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAwKTsK KyAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBs YXRlKHY4OjpJc29sYXRlKiA9IDApOwogICAgIHN0YXRpYyBUZXN0RXZlbnRUYXJnZXQqIHRvTmF0 aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJu IHJlaW50ZXJwcmV0X2Nhc3Q8VGVzdEV2ZW50VGFyZ2V0Kj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9p bnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9NV3JhcHBlck9iamVjdEluZGV4KSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXhjZXB0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RF eGNlcHRpb24uY3BwCmluZGV4IDQ2N2YwNmU1ZGI5ZmZmYWE1Zjg1N2E1OWFlYWE3ZDZlNTc2ZWQw OGMuLjVlNzAwYWM0YmE3ZDRkZTAxNmNlY2Q3NGY5NTQ0NzdjMjQ2ODNlZmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFeGNlcHRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RF eGNlcHRpb24uY3BwCkBAIC02Niw5ICs2NiwxMSBAQCBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6 OkZ1bmN0aW9uVGVtcGxhdGU+IENvbmZpZ3VyZVY4VGVzdEV4Y2VwdGlvblRlbXBsYXRlKHY4Ogog ICAgIHJldHVybiBkZXNjOwogfQogCi12ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0 ZT4gVjhUZXN0RXhjZXB0aW9uOjpHZXRSYXdUZW1wbGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6 RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0RXhjZXB0aW9uOjpHZXRSYXdUZW1wbGF0ZSh2ODo6SXNv bGF0ZSogaXNvbGF0ZSkKIHsKLSAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29s YXRlRGF0YTo6Y3VycmVudCgpOworICAgIGlmICghaXNvbGF0ZSkKKyAgICAgICAgaXNvbGF0ZSA9 IHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCk7CisgICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9 IFY4UGVySXNvbGF0ZURhdGE6OmZyb20oaXNvbGF0ZSk7CiAgICAgVjhQZXJJc29sYXRlRGF0YTo6 VGVtcGxhdGVNYXA6Oml0ZXJhdG9yIHJlc3VsdCA9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZmlu ZCgmaW5mbyk7CiAgICAgaWYgKHJlc3VsdCAhPSBkYXRhLT5yYXdUZW1wbGF0ZU1hcCgpLmVuZCgp KQogICAgICAgICByZXR1cm4gcmVzdWx0LT52YWx1ZTsKQEAgLTc5LDkgKzgxLDExIEBAIHY4OjpQ ZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RFeGNlcHRpb246OkdldFJhd1Rl bXBsYXRlKCkKICAgICByZXR1cm4gdGVtcGw7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5j dGlvblRlbXBsYXRlPiBWOFRlc3RFeGNlcHRpb246OkdldFRlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0 ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RFeGNlcHRpb246OkdldFRlbXBsYXRlKHY4 OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBl cklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29s YXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBk YXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVE YXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+dGVtcGxhdGVNYXAoKS5m aW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnRlbXBsYXRlTWFwKCkuZW5kKCkp CiAgICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV4Y2VwdGlvbi5oIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV4Y2VwdGlvbi5oCmluZGV4IDc5 MzUxMTAyYWExNWQ2MTRjYjJmMzg1ZmU2ZmExNzY2OTgyNDAwNzIuLmY1ZWVhOTE5ZmZkYzNlMDJk NDUxOWY3NWU3YjBlN2M0NTk5OTYxZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFeGNlcHRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXhjZXB0aW9uLmgKQEAgLTM1LDggKzM1 LDggQEAgY2xhc3MgVjhUZXN0RXhjZXB0aW9uIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3Qg Ym9vbCBoYXNEZXBlbmRlbnRMaWZldGltZSA9IGZhbHNlOwogICAgIHN0YXRpYyBib29sIEhhc0lu c3RhbmNlKHY4OjpIYW5kbGU8djg6OlZhbHVlPik7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50 PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSgpOwotICAgIHN0YXRpYyB2ODo6 UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVtcGxhdGUoKTsKKyAgICBzdGF0 aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJhd1RlbXBsYXRlKHY4 OjpJc29sYXRlKiA9IDApOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25U ZW1wbGF0ZT4gR2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CiAgICAgc3RhdGljIFRlc3RF eGNlcHRpb24qIHRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KQogICAgIHsK ICAgICAgICAgcmV0dXJuIHJlaW50ZXJwcmV0X2Nhc3Q8VGVzdEV4Y2VwdGlvbio+KG9iamVjdC0+ R2V0QWxpZ25lZFBvaW50ZXJGcm9tSW50ZXJuYWxGaWVsZCh2OERPTVdyYXBwZXJPYmplY3RJbmRl eCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4 L1Y4VGVzdEludGVyZmFjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcAppbmRleCBmNjFkYmU1NGEyMTU2Yjg4ODYxZDkwYzZk ODNmMmU2ZDUwNmY0YWI0Li4xZjkyM2VlZDUzMzYxNjFjMjI1NmJjODRiYTAzODI3OWY1ZmVhMDRh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhU ZXN0SW50ZXJmYWNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0SW50ZXJmYWNlLmNwcApAQCAtMjkxLDkgKzI5MSwxMSBAQCBzdGF0aWMgdjg6 OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IENvbmZpZ3VyZVY4VGVzdEludGVyZmFj ZVRlbXBsYXRlKHY4OgogICAgIHJldHVybiBkZXNjOwogfQogCi12ODo6UGVyc2lzdGVudDx2ODo6 RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0SW50ZXJmYWNlOjpHZXRSYXdUZW1wbGF0ZSgpCit2ODo6 UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0SW50ZXJmYWNlOjpHZXRSYXdU ZW1wbGF0ZSh2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKLSAgICBWOFBlcklzb2xhdGVEYXRhKiBk YXRhID0gVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgpOworICAgIGlmICghaXNvbGF0ZSkKKyAg ICAgICAgaXNvbGF0ZSA9IHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCk7CisgICAgVjhQZXJJc29s YXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmZyb20oaXNvbGF0ZSk7CiAgICAgVjhQ ZXJJc29sYXRlRGF0YTo6VGVtcGxhdGVNYXA6Oml0ZXJhdG9yIHJlc3VsdCA9IGRhdGEtPnJhd1Rl bXBsYXRlTWFwKCkuZmluZCgmaW5mbyk7CiAgICAgaWYgKHJlc3VsdCAhPSBkYXRhLT5yYXdUZW1w bGF0ZU1hcCgpLmVuZCgpKQogICAgICAgICByZXR1cm4gcmVzdWx0LT52YWx1ZTsKQEAgLTMwNCw5 ICszMDYsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdElu dGVyZmFjZTo6R2V0UmF3VGVtcGxhdGUoKQogICAgIHJldHVybiB0ZW1wbDsKIH0KIAotdjg6OlBl cnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdEludGVyZmFjZTo6R2V0VGVtcGxh dGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdEludGVyZmFj ZTo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRl RGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xh dGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4 UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwog ICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRh LT50ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+dGVt cGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50ZXJm YWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0SW50 ZXJmYWNlLmgKaW5kZXggNTYyM2JlYzc2NDRiNTY4YmQzOWE1MDk5YjQ4YWEzNjg2NmM4NTMwZS4u YzA3YjAzMmU0NGUyMjhiOGRiNzE2NjdkMTM3NDZiODQzOTQwMDE4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEludGVyZmFjZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RJbnRlcmZh Y2UuaApAQCAtMzcsOCArMzcsOCBAQCBjbGFzcyBWOFRlc3RJbnRlcmZhY2UgewogcHVibGljOgog ICAgIHN0YXRpYyBjb25zdCBib29sIGhhc0RlcGVuZGVudExpZmV0aW1lID0gdHJ1ZTsKICAgICBz dGF0aWMgYm9vbCBIYXNJbnN0YW5jZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4pOwotICAgIHN0YXRp YyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUoKTsK LSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBs YXRlKCk7CisgICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBH ZXRSYXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAwKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3Rl bnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKHY4OjpJc29sYXRlKiA9IDApOwog ICAgIHN0YXRpYyBUZXN0SW50ZXJmYWNlKiB0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+ IG9iamVjdCkKICAgICB7CiAgICAgICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFRlc3RJbnRl cmZhY2UqPihvYmplY3QtPkdldEFsaWduZWRQb2ludGVyRnJvbUludGVybmFsRmllbGQodjhET01X cmFwcGVyT2JqZWN0SW5kZXgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RNZWRpYVF1ZXJ5TGlzdExp c3RlbmVyLmNwcAppbmRleCAwZTM1NjRjMDU1YTY2OGQxMWQzOGVlODNhMTBlOTA0MDhmMGQxM2M2 Li40MjQxZTQ4MTVjNTY3MjkzNmFkMTU3YjI4YjdlOWU5ODQ0MzA2MDg4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TWVkaWFRdWVyeUxp c3RMaXN0ZW5lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0 L1Y4L1Y4VGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXIuY3BwCkBAIC03NSw5ICs3NSwxMSBAQCBz dGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IENvbmZpZ3VyZVY4VGVz dE1lZGlhUXVlcnlMaXN0TGlzdGVuZQogICAgIHJldHVybiBkZXNjOwogfQogCi12ODo6UGVyc2lz dGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcjo6 R2V0UmF3VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4 VGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXI6OkdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiBp c29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRh OjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklz b2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJ c29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1wbGF0 ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5maW5kKCZpbmZv KTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZW5kKCkpCiAgICAg ICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpAQCAtODgsOSArOTAsMTEgQEAgdjg6OlBlcnNpc3Rl bnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXI6Okdl dFJhd1RlbXBsYXQKICAgICByZXR1cm4gdGVtcGw7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpG dW5jdGlvblRlbXBsYXRlPiBWOFRlc3RNZWRpYVF1ZXJ5TGlzdExpc3RlbmVyOjpHZXRUZW1wbGF0 ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0TWVkaWFRdWVy eUxpc3RMaXN0ZW5lcjo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAg VjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAg ICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVu dCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9t KGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciBy ZXN1bHQgPSBkYXRhLT50ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQg IT0gZGF0YS0+dGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFs dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE1lZGlhUXVlcnlMaXN0TGlzdGVuZXIuaAppbmRleCA1YzRl YzM2NGNiMDZkNTAxYThhNjE0YjEzZDE3ZTliNzVlYzllZTE1Li44YWRiMjU2M2FiMzM2ZjcyODI2 NTJjZjI1MjdmOWMwYjFkOTFhNTU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lci5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RNZWRpYVF1ZXJ5TGlz dExpc3RlbmVyLmgKQEAgLTM1LDggKzM1LDggQEAgY2xhc3MgVjhUZXN0TWVkaWFRdWVyeUxpc3RM aXN0ZW5lciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaGFzRGVwZW5kZW50TGlm ZXRpbWUgPSBmYWxzZTsKICAgICBzdGF0aWMgYm9vbCBIYXNJbnN0YW5jZSh2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4pOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0 ZT4gR2V0UmF3VGVtcGxhdGUoKTsKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0 aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKCk7CisgICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4 OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAwKTsKKyAg ICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRl KHY4OjpJc29sYXRlKiA9IDApOwogICAgIHN0YXRpYyBUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5l ciogdG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmplY3QpCiAgICAgewogICAgICAg ICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUZXN0TWVkaWFRdWVyeUxpc3RMaXN0ZW5lcio+KG9i amVjdC0+R2V0QWxpZ25lZFBvaW50ZXJGcm9tSW50ZXJuYWxGaWVsZCh2OERPTVdyYXBwZXJPYmpl Y3RJbmRleCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90 ZXN0L1Y4L1Y4VGVzdE5hbWVkQ29uc3RydWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE5hbWVkQ29uc3RydWN0b3IuY3BwCmluZGV4IDFiOWU2 YWU2NDhhYzY3ZmM3NTU3NDIwYjQxYWIwNjc4YWQzZjEwNjUuLmIyNzBlOTFlZGRiMGViYjIwOTNj ZTUzOWEwN2ZkMTMxMDcyMTk1NjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROYW1lZENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TmFtZWRDb25zdHJ1Y3Rvci5j cHAKQEAgLTc1LDggKzc1LDEwIEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhUZXN0 TmFtZWRDb25zdHJ1Y3RvckNvbnN0cnVjdG9yQ2FsbGJhY2soY29uc3Qgdjg6CiAgICAgcmV0dXJu IHNldERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogfQogCi12ODo6UGVyc2lz dGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0TmFtZWRDb25zdHJ1Y3RvckNvbnN0cnVj dG9yOjpHZXRUZW1wbGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4g VjhUZXN0TmFtZWRDb25zdHJ1Y3RvckNvbnN0cnVjdG9yOjpHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0 ZSogaXNvbGF0ZSkKIHsKKyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6 SXNvbGF0ZTo6R2V0Q3VycmVudCgpOwogICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVu Y3Rpb25UZW1wbGF0ZT4gY2FjaGVkVGVtcGxhdGU7CiAgICAgaWYgKCFjYWNoZWRUZW1wbGF0ZS5J c0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBjYWNoZWRUZW1wbGF0ZTsKQEAgLTEwOSw5ICsxMTEs MTEgQEAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBDb25maWd1 cmVWOFRlc3ROYW1lZENvbnN0cnVjdG9yVGVtcGwKICAgICByZXR1cm4gZGVzYzsKIH0KIAotdjg6 OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE5hbWVkQ29uc3RydWN0b3I6 OkdldFJhd1RlbXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBW OFRlc3ROYW1lZENvbnN0cnVjdG9yOjpHZXRSYXdUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogaXNvbGF0 ZSkKIHsKLSAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6Y3Vy cmVudCgpOworICAgIGlmICghaXNvbGF0ZSkKKyAgICAgICAgaXNvbGF0ZSA9IHY4OjpJc29sYXRl OjpHZXRDdXJyZW50KCk7CisgICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0 ZURhdGE6OmZyb20oaXNvbGF0ZSk7CiAgICAgVjhQZXJJc29sYXRlRGF0YTo6VGVtcGxhdGVNYXA6 Oml0ZXJhdG9yIHJlc3VsdCA9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZmluZCgmaW5mbyk7CiAg ICAgaWYgKHJlc3VsdCAhPSBkYXRhLT5yYXdUZW1wbGF0ZU1hcCgpLmVuZCgpKQogICAgICAgICBy ZXR1cm4gcmVzdWx0LT52YWx1ZTsKQEAgLTEyMiw5ICsxMjYsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8 djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE5hbWVkQ29uc3RydWN0b3I6OkdldFJhd1RlbXBs YXRlKCkKICAgICByZXR1cm4gdGVtcGw7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlv blRlbXBsYXRlPiBWOFRlc3ROYW1lZENvbnN0cnVjdG9yOjpHZXRUZW1wbGF0ZSgpCit2ODo6UGVy c2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0TmFtZWRDb25zdHJ1Y3Rvcjo6R2V0 VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0YSog ZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xhdGUpCisg ICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4UGVySXNv bGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwogICAgIFY4 UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRhLT50ZW1w bGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+dGVtcGxhdGVN YXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TmFtZWRDb25zdHJ1 Y3Rvci5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE5h bWVkQ29uc3RydWN0b3IuaAppbmRleCA0NzE2ODI1MGJiYjM4YzVjMTlkZWRiOTkzYjMyYzgyYWM3 YWFkOGFlLi4zYjMxNDEyODE2ZGNmZTgxNzNhZjA0ZWZhMDQ0YmUxMWJlMjViZWU2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0TmFtZWRD b25zdHJ1Y3Rvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9W OC9WOFRlc3ROYW1lZENvbnN0cnVjdG9yLmgKQEAgLTMzLDcgKzMzLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogCiBjbGFzcyBWOFRlc3ROYW1lZENvbnN0cnVjdG9yQ29uc3RydWN0b3IgewogcHVi bGljOgotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0 VGVtcGxhdGUoKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxh dGU+IEdldFRlbXBsYXRlKHY4OjpJc29sYXRlKik7CiAgICAgc3RhdGljIFdyYXBwZXJUeXBlSW5m byBpbmZvOwogfTsKIApAQCAtNDEsOCArNDEsOCBAQCBjbGFzcyBWOFRlc3ROYW1lZENvbnN0cnVj dG9yIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgYm9vbCBoYXNEZXBlbmRlbnRMaWZldGlt ZSA9IHRydWU7CiAgICAgc3RhdGljIGJvb2wgSGFzSW5zdGFuY2Uodjg6OkhhbmRsZTx2ODo6VmFs dWU+KTsKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdl dFJhd1RlbXBsYXRlKCk7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRl bXBsYXRlPiBHZXRUZW1wbGF0ZSgpOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVu Y3Rpb25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CisgICAgc3Rh dGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSh2ODo6 SXNvbGF0ZSogPSAwKTsKICAgICBzdGF0aWMgVGVzdE5hbWVkQ29uc3RydWN0b3IqIHRvTmF0aXZl KHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gb2JqZWN0KQogICAgIHsKICAgICAgICAgcmV0dXJuIHJl aW50ZXJwcmV0X2Nhc3Q8VGVzdE5hbWVkQ29uc3RydWN0b3IqPihvYmplY3QtPkdldEFsaWduZWRQ b2ludGVyRnJvbUludGVybmFsRmllbGQodjhET01XcmFwcGVyT2JqZWN0SW5kZXgpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROb2Rl LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROb2Rl LmNwcAppbmRleCA4YzZjNzkxMzlmZTZhN2ZmNjA0NWIyNjBjZmM0ZjAyZDBjZWFkZDNmLi4zNzE3 MTU3NTdmMDVhOTFhYzIyOGY0MzkwZmFkNjlhNThmNjZiM2NmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Tm9kZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE5vZGUuY3BwCkBAIC03 Myw5ICs3MywxMSBAQCBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+ IENvbmZpZ3VyZVY4VGVzdE5vZGVUZW1wbGF0ZSh2ODo6UGVycwogICAgIHJldHVybiBkZXNjOwog fQogCi12ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0Tm9kZTo6R2V0 UmF3VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVz dE5vZGU6OkdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewotICAgIFY4UGVy SXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7CisgICAgaWYg KCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsK KyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6ZnJvbShpc29s YXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0 ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5maW5kKCZpbmZvKTsKICAgICBpZiAocmVzdWx0ICE9 IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZW5kKCkpCiAgICAgICAgIHJldHVybiByZXN1bHQtPnZh bHVlOwpAQCAtODYsOSArODgsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxh dGU+IFY4VGVzdE5vZGU6OkdldFJhd1RlbXBsYXRlKCkKICAgICByZXR1cm4gdGVtcGw7CiB9CiAK LXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3ROb2RlOjpHZXRUZW1w bGF0ZSgpCit2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0Tm9kZTo6 R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0 YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xhdGUp CisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4UGVy SXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwogICAg IFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRhLT50 ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+dGVtcGxh dGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Tm9kZS5oIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE5vZGUuaAppbmRl eCAzZmFmYjJhNDE5YjU4Y2M5YTgzZmVlMTljZmZhZTU4NWY0M2Y2MzA5Li4wMjJkOGVlNjk2NzBi N2JkZWUwZjA0NGI1MWFhYWRhNWMyMTQ2ZDg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Tm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3ROb2RlLmgKQEAgLTM1LDggKzM1LDggQEAg Y2xhc3MgVjhUZXN0Tm9kZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0IGJvb2wgaGFzRGVw ZW5kZW50TGlmZXRpbWUgPSB0cnVlOwogICAgIHN0YXRpYyBib29sIEhhc0luc3RhbmNlKHY4OjpI YW5kbGU8djg6OlZhbHVlPik7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlv blRlbXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSgpOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2 ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVtcGxhdGUoKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNp c3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiA9 IDApOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0 VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CiAgICAgc3RhdGljIFRlc3ROb2RlKiB0b05hdGl2 ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKICAgICB7CiAgICAgICAgIHJldHVybiBy ZWludGVycHJldF9jYXN0PFRlc3ROb2RlKj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21J bnRlcm5hbEZpZWxkKHY4RE9NV3JhcHBlck9iamVjdEluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCmluZGV4IGIx ZGNmMzk3MTczZWIyMDkxMjk5NWZiNTkyYWVhOGUxMGNhNGQ5MzguLjBlOWY0OGE5NWM0Y2VkZTky MGJhODAxMDlkYTE0NjA5MjZjYzM0ODAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwCkBAIC0yMTY3LDkgKzIxNjcsMTEg QEAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBDb25maWd1cmVW OFRlc3RPYmpUZW1wbGF0ZSh2ODo6UGVyc2kKICAgICByZXR1cm4gZGVzYzsKIH0KIAotdjg6OlBl cnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE9iajo6R2V0UmF3VGVtcGxhdGUo KQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE9iajo6R2V0UmF3 VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0YSog ZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xhdGUpCisg ICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4UGVySXNv bGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwogICAgIFY4 UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRhLT5yYXdU ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+cmF3VGVt cGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CkBAIC0yMTgw LDkgKzIxODIsMTEgQEAgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVz dE9iajo6R2V0UmF3VGVtcGxhdGUoKQogICAgIHJldHVybiB0ZW1wbDsKIH0KIAotdjg6OlBlcnNp c3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE9iajo6R2V0VGVtcGxhdGUoKQordjg6 OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE9iajo6R2V0VGVtcGxhdGUo djg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7Ci0gICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4 UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQoKTsKKyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlz b2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEq IGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpmcm9tKGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0 ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVyYXRvciByZXN1bHQgPSBkYXRhLT50ZW1wbGF0ZU1hcCgp LmZpbmQoJmluZm8pOwogICAgIGlmIChyZXN1bHQgIT0gZGF0YS0+dGVtcGxhdGVNYXAoKS5lbmQo KSkKICAgICAgICAgcmV0dXJuIHJlc3VsdC0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmggYi9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T2JqLmgKaW5kZXggOWYxNjAzMTk1MWU4 Zjc4ZDIwYjMwZGE2M2JhMTc5ZmYwNzBjNzgxMy4uZmU0MWE3MGZkMjA2YTMxMjMxZDIwNDBhMjFi MTFmNTRkODI3MmFmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdE9iai5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9WOC9WOFRlc3RPYmouaApAQCAtMzUsOCArMzUsOCBAQCBjbGFzcyBWOFRlc3RPYmog ewogcHVibGljOgogICAgIHN0YXRpYyBjb25zdCBib29sIGhhc0RlcGVuZGVudExpZmV0aW1lID0g ZmFsc2U7CiAgICAgc3RhdGljIGJvb2wgSGFzSW5zdGFuY2Uodjg6OkhhbmRsZTx2ODo6VmFsdWU+ KTsKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJh d1RlbXBsYXRlKCk7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBs YXRlPiBHZXRUZW1wbGF0ZSgpOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rp b25UZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CisgICAgc3RhdGlj IHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSh2ODo6SXNv bGF0ZSogPSAwKTsKICAgICBzdGF0aWMgVGVzdE9iaiogdG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6 T2JqZWN0PiBvYmplY3QpCiAgICAgewogICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxU ZXN0T2JqKj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9N V3JhcHBlck9iamVjdEluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9ycy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T3ZlcmxvYWRlZENvbnN0 cnVjdG9ycy5jcHAKaW5kZXggOTU3N2QyZTc1NWQ0NzVkY2QzY2NiMGJiYzQ5MDk4Yjc2NmM0Yjhk Yy4uYmI5NWJjMDQzZjJkMDE1MzY4M2EzZmM4MDZlNGUxM2YxY2Q4N2Q1MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE92ZXJsb2FkZWRD b25zdHJ1Y3RvcnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3JzLmNwcApAQCAtMTMwLDkgKzEzMCwxMSBA QCBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IENvbmZpZ3VyZVY4 VGVzdE92ZXJsb2FkZWRDb25zdHJ1Y3RvcgogICAgIHJldHVybiBkZXNjOwogfQogCi12ODo6UGVy c2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9y czo6R2V0UmF3VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+ IFY4VGVzdE92ZXJsb2FkZWRDb25zdHJ1Y3RvcnM6OkdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRl KiBpc29sYXRlKQogewotICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVE YXRhOjpjdXJyZW50KCk7CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6 Oklzb2xhdGU6OkdldEN1cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQ ZXJJc29sYXRlRGF0YTo6ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1w bGF0ZU1hcDo6aXRlcmF0b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5maW5kKCZp bmZvKTsKICAgICBpZiAocmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZW5kKCkpCiAg ICAgICAgIHJldHVybiByZXN1bHQtPnZhbHVlOwpAQCAtMTQzLDkgKzE0NSwxMSBAQCB2ODo6UGVy c2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gVjhUZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9y czo6R2V0UmF3VGVtcGxhdAogICAgIHJldHVybiB0ZW1wbDsKIH0KIAotdjg6OlBlcnNpc3RlbnQ8 djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdE92ZXJsb2FkZWRDb25zdHJ1Y3RvcnM6OkdldFRl bXBsYXRlKCkKK3Y4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RPdmVy bG9hZGVkQ29uc3RydWN0b3JzOjpHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsK LSAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6Y3VycmVudCgp OworICAgIGlmICghaXNvbGF0ZSkKKyAgICAgICAgaXNvbGF0ZSA9IHY4OjpJc29sYXRlOjpHZXRD dXJyZW50KCk7CisgICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6 OmZyb20oaXNvbGF0ZSk7CiAgICAgVjhQZXJJc29sYXRlRGF0YTo6VGVtcGxhdGVNYXA6Oml0ZXJh dG9yIHJlc3VsdCA9IGRhdGEtPnRlbXBsYXRlTWFwKCkuZmluZCgmaW5mbyk7CiAgICAgaWYgKHJl c3VsdCAhPSBkYXRhLT50ZW1wbGF0ZU1hcCgpLmVuZCgpKQogICAgICAgICByZXR1cm4gcmVzdWx0 LT52YWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3JzLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0T3ZlcmxvYWRlZENvbnN0cnVjdG9ycy5oCmluZGV4 IDQ2NzI0NTYzZjc4NzRiNjk3M2MzZGE5ZGY2MGIwN2IxNzUzZjhhMTcuLjM2MTc0NzEwYWQ3NTEw YTJhNmY2YmIwODdmZTNhNDllODkyNjhmM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3JzLmgKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE92ZXJsb2Fk ZWRDb25zdHJ1Y3RvcnMuaApAQCAtMzUsOCArMzUsOCBAQCBjbGFzcyBWOFRlc3RPdmVybG9hZGVk Q29uc3RydWN0b3JzIHsKIHB1YmxpYzoKICAgICBzdGF0aWMgY29uc3QgYm9vbCBoYXNEZXBlbmRl bnRMaWZldGltZSA9IGZhbHNlOwogICAgIHN0YXRpYyBib29sIEhhc0luc3RhbmNlKHY4OjpIYW5k bGU8djg6OlZhbHVlPik7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRl bXBsYXRlPiBHZXRSYXdUZW1wbGF0ZSgpOwotICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6 RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVtcGxhdGUoKTsKKyAgICBzdGF0aWMgdjg6OlBlcnNpc3Rl bnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiA9IDAp OworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gR2V0VGVt cGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CiAgICAgc3RhdGljIFRlc3RPdmVybG9hZGVkQ29uc3Ry dWN0b3JzKiB0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IG9iamVjdCkKICAgICB7CiAg ICAgICAgIHJldHVybiByZWludGVycHJldF9jYXN0PFRlc3RPdmVybG9hZGVkQ29uc3RydWN0b3Jz Kj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9NV3JhcHBl ck9iamVjdEluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvVjgvVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RTZXJpYWxpemVkU2Ny aXB0VmFsdWVJbnRlcmZhY2UuY3BwCmluZGV4IDExNjJjZWU5ZTRlZWYxN2U5YzE4NGVhZWNlZTQ5 YzgyMTJlYzk0ZGUuLjc3MWU5MmIzNmFhYWVhZTVhMDY4OGVjMmUyNjA2NDk5MjgzMDE5ZDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RT ZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZh Y2UuY3BwCkBAIC0yNDgsOSArMjQ4LDExIEBAIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVu Y3Rpb25UZW1wbGF0ZT4gQ29uZmlndXJlVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlCiAgICAg cmV0dXJuIGRlc2M7CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBW OFRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2U6OkdldFJhd1RlbXBsYXRlKCkKK3Y4 OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOFRlc3RTZXJpYWxpemVkU2NyaXB0 VmFsdWVJbnRlcmZhY2U6OkdldFJhd1RlbXBsYXRlKHY4OjpJc29sYXRlKiBpc29sYXRlKQogewot ICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRhOjpjdXJyZW50KCk7 CisgICAgaWYgKCFpc29sYXRlKQorICAgICAgICBpc29sYXRlID0gdjg6Oklzb2xhdGU6OkdldEN1 cnJlbnQoKTsKKyAgICBWOFBlcklzb2xhdGVEYXRhKiBkYXRhID0gVjhQZXJJc29sYXRlRGF0YTo6 ZnJvbShpc29sYXRlKTsKICAgICBWOFBlcklzb2xhdGVEYXRhOjpUZW1wbGF0ZU1hcDo6aXRlcmF0 b3IgcmVzdWx0ID0gZGF0YS0+cmF3VGVtcGxhdGVNYXAoKS5maW5kKCZpbmZvKTsKICAgICBpZiAo cmVzdWx0ICE9IGRhdGEtPnJhd1RlbXBsYXRlTWFwKCkuZW5kKCkpCiAgICAgICAgIHJldHVybiBy ZXN1bHQtPnZhbHVlOwpAQCAtMjYxLDkgKzI2MywxMSBAQCB2ODo6UGVyc2lzdGVudDx2ODo6RnVu Y3Rpb25UZW1wbGF0ZT4gVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlOjpHZXRS YQogICAgIHJldHVybiB0ZW1wbDsKIH0KIAotdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVt cGxhdGU+IFY4VGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZTo6R2V0VGVtcGxhdGUo KQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IFY4VGVzdFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZUludGVyZmFjZTo6R2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7 Ci0gICAgVjhQZXJJc29sYXRlRGF0YSogZGF0YSA9IFY4UGVySXNvbGF0ZURhdGE6OmN1cnJlbnQo KTsKKyAgICBpZiAoIWlzb2xhdGUpCisgICAgICAgIGlzb2xhdGUgPSB2ODo6SXNvbGF0ZTo6R2V0 Q3VycmVudCgpOworICAgIFY4UGVySXNvbGF0ZURhdGEqIGRhdGEgPSBWOFBlcklzb2xhdGVEYXRh Ojpmcm9tKGlzb2xhdGUpOwogICAgIFY4UGVySXNvbGF0ZURhdGE6OlRlbXBsYXRlTWFwOjppdGVy YXRvciByZXN1bHQgPSBkYXRhLT50ZW1wbGF0ZU1hcCgpLmZpbmQoJmluZm8pOwogICAgIGlmIChy ZXN1bHQgIT0gZGF0YS0+dGVtcGxhdGVNYXAoKS5lbmQoKSkKICAgICAgICAgcmV0dXJuIHJlc3Vs dC0+dmFsdWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNlLmggYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVl SW50ZXJmYWNlLmgKaW5kZXggOTdhZDJkOTU2Yzk0MWJiMjNhNmYyOWViYzEyMjQ5ZDI3MDE4M2U2 My4uOWY5Mjk5OTdlNjMyMjczMjM3MTM2ZmNiMjFlYzYyNjgyZWIxYzNkZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdFNlcmlhbGl6ZWRT Y3JpcHRWYWx1ZUludGVyZmFjZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9WOC9WOFRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2UuaApAQCAtMzcs OCArMzcsOCBAQCBjbGFzcyBWOFRlc3RTZXJpYWxpemVkU2NyaXB0VmFsdWVJbnRlcmZhY2Ugewog cHVibGljOgogICAgIHN0YXRpYyBjb25zdCBib29sIGhhc0RlcGVuZGVudExpZmV0aW1lID0gZmFs c2U7CiAgICAgc3RhdGljIGJvb2wgSGFzSW5zdGFuY2Uodjg6OkhhbmRsZTx2ODo6VmFsdWU+KTsK LSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFJhd1Rl bXBsYXRlKCk7Ci0gICAgc3RhdGljIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRl PiBHZXRUZW1wbGF0ZSgpOworICAgIHN0YXRpYyB2ODo6UGVyc2lzdGVudDx2ODo6RnVuY3Rpb25U ZW1wbGF0ZT4gR2V0UmF3VGVtcGxhdGUodjg6Oklzb2xhdGUqID0gMCk7CisgICAgc3RhdGljIHY4 OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0 ZSogPSAwKTsKICAgICBzdGF0aWMgVGVzdFNlcmlhbGl6ZWRTY3JpcHRWYWx1ZUludGVyZmFjZSog dG9OYXRpdmUodjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBvYmplY3QpCiAgICAgewogICAgICAgICBy ZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxUZXN0U2VyaWFsaXplZFNjcmlwdFZhbHVlSW50ZXJmYWNl Kj4ob2JqZWN0LT5HZXRBbGlnbmVkUG9pbnRlckZyb21JbnRlcm5hbEZpZWxkKHY4RE9NV3JhcHBl ck9iamVjdEluZGV4KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9X cmFwcGVyVHlwZUluZm8uaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dyYXBwZXJUeXBl SW5mby5oCmluZGV4IGJlNmNkYTJkOGZlYTIwNmJhZjM5OWZjMWY5OGRlOTM5ZDBjNWU5NzcuLmFk ZTFiOGY4YzkyYzhhY2IzNGU5NmM4ODVmYjdhYmIwODkyZjhkMzMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1dyYXBwZXJUeXBlSW5mby5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L1dyYXBwZXJUeXBlSW5mby5oCkBAIC00NSw3ICs0NSw3IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICBzdGF0aWMgY29uc3QgdWludDE2X3QgdjhET01Ob2RlQ2xhc3NJ ZCA9IDE7CiAgICAgc3RhdGljIGNvbnN0IHVpbnQxNl90IHY4RE9NT2JqZWN0Q2xhc3NJZCA9IDI7 CiAKLSAgICB0eXBlZGVmIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiAoKkdl dFRlbXBsYXRlRnVuY3Rpb24pKCk7CisgICAgdHlwZWRlZiB2ODo6UGVyc2lzdGVudDx2ODo6RnVu Y3Rpb25UZW1wbGF0ZT4gKCpHZXRUZW1wbGF0ZUZ1bmN0aW9uKSh2ODo6SXNvbGF0ZSopOwogICAg IHR5cGVkZWYgdm9pZCAoKkRlcmVmT2JqZWN0RnVuY3Rpb24pKHZvaWQqKTsKICAgICB0eXBlZGVm IEFjdGl2ZURPTU9iamVjdCogKCpUb0FjdGl2ZURPTU9iamVjdEZ1bmN0aW9uKSh2ODo6SGFuZGxl PHY4OjpPYmplY3Q+KTsKICAgICB0eXBlZGVmIHZvaWQqICgqT3BhcXVlUm9vdEZvckdDKSh2b2lk Kiwgdjg6OlBlcnNpc3RlbnQ8djg6Ok9iamVjdD4pOwpAQCAtODIsNyArODIsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIH0KICAgICAg ICAgCi0gICAgICAgIHY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBnZXRUZW1w bGF0ZSgpIHsgcmV0dXJuIGdldFRlbXBsYXRlRnVuY3Rpb24oKTsgfQorICAgICAgICB2ODo6UGVy c2lzdGVudDx2ODo6RnVuY3Rpb25UZW1wbGF0ZT4gZ2V0VGVtcGxhdGUodjg6Oklzb2xhdGUqIGlz b2xhdGUgPSAwKSB7IHJldHVybiBnZXRUZW1wbGF0ZUZ1bmN0aW9uKGlzb2xhdGUpOyB9CiAgICAg ICAgIAogICAgICAgICB2b2lkIGRlcmVmT2JqZWN0KHZvaWQqIG9iamVjdCkKICAgICAgICAgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEltYWdl RWxlbWVudENvbnN0cnVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhUTUxJbWFnZUVsZW1lbnRDb25zdHJ1Y3Rvci5jcHAKaW5kZXggMjRjNjgyZjU3MjNiZjc5 YjE0ODg2MzhlZmJiODkzZGMxMDhkMGVlMi4uY2Y4NThmYTUwMjBhMDM4ZTJmYjYxY2QyMDc1YjFi YmNjMzkyNjA2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3IuY3BwCkBAIC04 MSw3ICs4MSw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdjhIVE1MSW1hZ2VFbGVt ZW50Q29uc3RydWN0b3JDYWxsYmFjayhjb25zdCB2ODo6QXJnCiAgICAgcmV0dXJuIHdyYXBwZXI7 CiB9CiAKLXY4OjpQZXJzaXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBWOEhUTUxJbWFnZUVs ZW1lbnRDb25zdHJ1Y3Rvcjo6R2V0VGVtcGxhdGUoKQordjg6OlBlcnNpc3RlbnQ8djg6OkZ1bmN0 aW9uVGVtcGxhdGU+IFY4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yOjpHZXRUZW1wbGF0ZSh2 ODo6SXNvbGF0ZSogaXNvbGF0ZSkKIHsKICAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8djg6OkZ1 bmN0aW9uVGVtcGxhdGU+IGNhY2hlZFRlbXBsYXRlOwogICAgIGlmICghY2FjaGVkVGVtcGxhdGUu SXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SFRNTEltYWdlRWxlbWVudENvbnN0cnVjdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3IuaAppbmRleCA1ZGI0OTQ2 NWY1OWEzZjNmZjVhMTc1MGMzZjU3OGUwMzJhOGVjYmY2Li45NTZiYzhkODViOWMwYzJlMTE5YjE4 YWFkMTg3MDdiNTI4OWViNTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9jdXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3IuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MSW1hZ2VFbGVtZW50Q29uc3RydWN0b3IuaApA QCAtMzksNyArMzksNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIFY4SFRNTEltYWdl RWxlbWVudENvbnN0cnVjdG9yIHsKIHB1YmxpYzoKLSAgICBzdGF0aWMgdjg6OlBlcnNpc3RlbnQ8 djg6OkZ1bmN0aW9uVGVtcGxhdGU+IEdldFRlbXBsYXRlKCk7CisgICAgc3RhdGljIHY4OjpQZXJz aXN0ZW50PHY4OjpGdW5jdGlvblRlbXBsYXRlPiBHZXRUZW1wbGF0ZSh2ODo6SXNvbGF0ZSogPSAw KTsKICAgICBzdGF0aWMgV3JhcHBlclR5cGVJbmZvIGluZm87CiB9OwogCg==