104070 2012-12-04 17:27:44 -0800 [V8] Replace v8::Null(isolate) with v8Null(isolate) 2012-12-04 21:03:20 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 783152 0 haraken 2012-12-04 17:27:44 -0800 v8Null(isolate) is a faster version of v8::Null(isolate). 783168 1 177623 haraken 2012-12-04 17:35:34 -0800 Created attachment 177623 Patch 783344 2 177623 webkit.review.bot 2012-12-04 21:03:16 -0800 Comment on attachment 177623 Patch Clearing flags on attachment: 177623 Committed r136632: <http://trac.webkit.org/changeset/136632> 783345 3 webkit.review.bot 2012-12-04 21:03:20 -0800 All reviewed patches have been landed. Closing bug. 177623 2012-12-04 17:35:34 -0800 2012-12-04 21:03:15 -0800 Patch bug-104070-20121205103259.patch text/plain 24983 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2UyYjg4NWYwZDA4NDYw ZDZjYjRhNzRlMmQ3NzU1YTZhNzBiMTA5ZC4uZjYxYjQ0ODMzMTI1NzkzMDgyOGI4YjhhMjg2MDU1 OGM4NTY0MTE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYxIEBACiAyMDEyLTEyLTA0ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBbVjhdIFJlcGxhY2Ug djg6Ok51bGwoaXNvbGF0ZSkgd2l0aCB2OE51bGwoaXNvbGF0ZSkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDA3MAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHY4TnVsbChpc29sYXRlKSBpcyBhIGZhc3Rl ciB2ZXJzaW9uIG9mIHY4OjpOdWxsKGlzb2xhdGUpLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBj aGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEJpbmRpbmcuaDoK KyAgICAgICAgKFdlYkNvcmU6OnY4U3RyaW5nT3JOdWxsKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhDbGlwYm9hcmRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhDbGlw Ym9hcmQ6OnR5cGVzQWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOENvb3JkaW5hdGVzQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4Q29vcmRpbmF0 ZXM6OmFsdGl0dWRlQWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhDb29yZGlu YXRlczo6YWx0aXR1ZGVBY2N1cmFjeUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlY4Q29vcmRpbmF0ZXM6OmhlYWRpbmdBY2Nlc3NvckdldHRlcik6CisgICAgICAgIChXZWJDb3Jl OjpWOENvb3JkaW5hdGVzOjpzcGVlZEFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhEZXZpY2VNb3Rpb25FdmVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOERldmljZU1vdGlvbkV2ZW50OjphY2NlbGVyYXRpb25BY2Nlc3NvckdldHRlcik6Cisg ICAgICAgIChXZWJDb3JlOjpWOERldmljZU1vdGlvbkV2ZW50OjphY2NlbGVyYXRpb25JbmNsdWRp bmdHcmF2aXR5QWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhEZXZpY2VNb3Rp b25FdmVudDo6cm90YXRpb25SYXRlQWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6 VjhEZXZpY2VNb3Rpb25FdmVudDo6aW50ZXJ2YWxBY2Nlc3NvckdldHRlcik6CisgICAgICAgICog YmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlT3JpZW50YXRpb25FdmVudEN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpWOERldmljZU9yaWVudGF0aW9uRXZlbnQ6OmFscGhhQWNjZXNzb3JH ZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhEZXZpY2VPcmllbnRhdGlvbkV2ZW50OjpiZXRh QWNjZXNzb3JHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6VjhEZXZpY2VPcmllbnRhdGlvbkV2 ZW50OjpnYW1tYUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKFdlYkNvcmU6OlY4RGV2aWNlT3Jp ZW50YXRpb25FdmVudDo6YWJzb2x1dGVBY2Nlc3NvckdldHRlcik6CisgICAgICAgICogYmluZGlu Z3MvdjgvY3VzdG9tL1Y4RG9jdW1lbnRMb2NhdGlvbkN1c3RvbS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpWOERvY3VtZW50Ojpsb2NhdGlvbkFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFzRWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpWOEhUTUxDYW52YXNFbGVtZW50OjpnZXRDb250ZXh0Q2FsbGJhY2spOgorICAgICAg ICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhpc3RvcnlDdXN0b20uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6VjhIaXN0b3J5OjpzdGF0ZUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5n cy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VjhNZXNzYWdlRXZlbnQ6OmRhdGFBY2Nlc3NvckdldHRlcik6CisgICAgICAgICogYmluZGluZ3Mv djgvY3VzdG9tL1Y4TWljcm9EYXRhSXRlbVZhbHVlQ3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnRvVjgpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOE5vZGVDdXN0b20uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VjhOb2RlOjppbnNlcnRCZWZvcmVDYWxsYmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpWOE5vZGU6OnJlcGxhY2VDaGlsZENhbGxiYWNrKToKKyAgICAgICAgKFdl YkNvcmU6OlY4Tm9kZTo6cmVtb3ZlQ2hpbGRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpW OE5vZGU6OmFwcGVuZENoaWxkQ2FsbGJhY2spOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOFBvcFN0YXRlRXZlbnRDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhQb3BTdGF0 ZUV2ZW50OjpzdGF0ZUFjY2Vzc29yR2V0dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0 b20vVjhTUUxSZXN1bHRTZXRSb3dMaXN0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4 U1FMUmVzdWx0U2V0Um93TGlzdDo6aXRlbUNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhUcmFja0V2ZW50Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4VHJh Y2tFdmVudDo6dHJhY2tBY2Nlc3NvckdldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3Vz dG9tL1Y4V2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OnRvVjhPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6VjhXZWJHTFJlbmRlcmluZ0NvbnRleHQ6 OmdldEF0dGFjaGVkU2hhZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OlY4V2ViR0xS ZW5kZXJpbmdDb250ZXh0OjpnZXRTdXBwb3J0ZWRFeHRlbnNpb25zQ2FsbGJhY2spOgorCisyMDEy LTEyLTA0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwogICAgICAgICBb VjhdIFJlbW92ZSBJbnRlZ2VyQ2FjaGU6Om1faW5pdGlhbGl6ZWQKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzk3OAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1Y4QmluZGluZy5oCmluZGV4IDY5MGZiMDc0MzE5NWIwZWY5ZGNkYTE5ZTg2NDYwMThm OTQwYTMwMzIuLjgyYzFmYzU0YmVmYjM1NGRkZjNkMjA2NjEzNGRjZTZjZGNiMjY2MDUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCkBAIC0zNzcsNyArMzc3LDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiAgICAgaW5saW5lIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2OFN0 cmluZ09yTnVsbChjb25zdCBTdHJpbmcmIHN0ciwgdjg6Oklzb2xhdGUqIGlzb2xhdGUgPSAwKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIHN0ci5pc051bGwoKSA/IHY4OjpIYW5kbGU8djg6OlZhbHVl Pih2ODo6TnVsbCgpKSA6IHY4OjpIYW5kbGU8djg6OlZhbHVlPih2OFN0cmluZyhzdHIsIGlzb2xh dGUpKTsKKyAgICAgICAgcmV0dXJuIHN0ci5pc051bGwoKSA/IHY4OjpIYW5kbGU8djg6OlZhbHVl Pih2OE51bGxXaXRoQ2hlY2soaXNvbGF0ZSkpIDogdjg6OkhhbmRsZTx2ODo6VmFsdWU+KHY4U3Ry aW5nKHN0ciwgaXNvbGF0ZSkpOwogICAgIH0KIAogICAgIGlubGluZSB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gdjhTdHJpbmdPclVuZGVmaW5lZChjb25zdCBTdHJpbmcmIHN0ciwgdjg6Oklzb2xhdGUq IGlzb2xhdGUgPSAwKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4Q2xpcGJvYXJkQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOENsaXBib2FyZEN1c3RvbS5jcHAKaW5kZXggNGRjZGQ3ZTUxNmE1NmM4NjFkNjRlNWQ2 M2NhZmEyNjA2YjQ5Y2U2Ny4uZGRkZDYyMjEyNDc5MzE2YjQzNWJlODQ3NWI3YThkOWQ2MDIzZjM4 MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q2xpcGJv YXJkQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhD bGlwYm9hcmRDdXN0b20uY3BwCkBAIC01MCw3ICs1MCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBWOENsaXBib2FyZDo6dHlwZXNBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4g bmFtCiAKICAgICBMaXN0SGFzaFNldDxTdHJpbmc+IHR5cGVzID0gY2xpcGJvYXJkLT50eXBlcygp OwogICAgIGlmICh0eXBlcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiB2ODo6TnVsbChpbmZv LkdldElzb2xhdGUoKSk7CisgICAgICAgIHJldHVybiB2OE51bGwoaW5mby5HZXRJc29sYXRlKCkp OwogCiAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT4gcmVzdWx0ID0gdjg6OkFycmF5OjpOZXcodHlw ZXMuc2l6ZSgpKTsKICAgICBMaXN0SGFzaFNldDxTdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBlbmQg PSB0eXBlcy5lbmQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOENvb3JkaW5hdGVzQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOENvb3JkaW5hdGVzQ3VzdG9tLmNwcAppbmRleCA4MjM4YWQ2YjcxMGE1ZGI5NGRk OGRlMmQ4NjliZTZjNWI1M2RhNWU3Li4xZmZkYjhmM2VjOTM4YzllOGYwMDRkOTA2OTg5YmVkNTEy NWY1ODA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhD b29yZGluYXRlc0N1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4Q29vcmRpbmF0ZXNDdXN0b20uY3BwCkBAIC0zNyw3ICszNyw3IEBAIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBWOENvb3JkaW5hdGVzOjphbHRpdHVkZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2Nh bDx2ODo6U3RyaW5nCiAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLkhv bGRlcigpOwogICAgIENvb3JkaW5hdGVzKiBpbXAgPSBWOENvb3JkaW5hdGVzOjp0b05hdGl2ZSho b2xkZXIpOwogICAgIGlmICghaW1wLT5jYW5Qcm92aWRlQWx0aXR1ZGUoKSkKLSAgICAgICAgcmV0 dXJuIHY4OjpOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChp bmZvLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpOdW1iZXI6Ok5ldyhpbXAtPmFsdGl0 dWRlKCkpOwogfQogCkBAIC00Nyw3ICs0Nyw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOENv b3JkaW5hdGVzOjphbHRpdHVkZUFjY3VyYWN5QWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4CiAg ICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLkhvbGRlcigpOwogICAgIENv b3JkaW5hdGVzKiBpbXAgPSBWOENvb3JkaW5hdGVzOjp0b05hdGl2ZShob2xkZXIpOwogICAgIGlm ICghaW1wLT5jYW5Qcm92aWRlQWx0aXR1ZGVBY2N1cmFjeSgpKQotICAgICAgICByZXR1cm4gdjg6 Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpOworICAgICAgICByZXR1cm4gdjhOdWxsKGluZm8uR2V0 SXNvbGF0ZSgpKTsKICAgICByZXR1cm4gdjg6Ok51bWJlcjo6TmV3KGltcC0+YWx0aXR1ZGVBY2N1 cmFjeSgpKTsKIH0KIApAQCAtNTcsNyArNTcsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhD b29yZGluYXRlczo6aGVhZGluZ0FjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPgog ICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gaG9sZGVyID0gaW5mby5Ib2xkZXIoKTsKICAgICBD b29yZGluYXRlcyogaW1wID0gVjhDb29yZGluYXRlczo6dG9OYXRpdmUoaG9sZGVyKTsKICAgICBp ZiAoIWltcC0+Y2FuUHJvdmlkZUhlYWRpbmcoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpOdWxsKGlu Zm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChpbmZvLkdldElzb2xhdGUo KSk7CiAgICAgcmV0dXJuIHY4OjpOdW1iZXI6Ok5ldyhpbXAtPmhlYWRpbmcoKSk7CiB9CiAKQEAg LTY3LDcgKzY3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4Q29vcmRpbmF0ZXM6OnNwZWVk QWNjZXNzb3JHZXR0ZXIodjg6OkxvY2FsPHY4OjpTdHJpbmc+IG4KICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGhvbGRlciA9IGluZm8uSG9sZGVyKCk7CiAgICAgQ29vcmRpbmF0ZXMqIGltcCA9 IFY4Q29vcmRpbmF0ZXM6OnRvTmF0aXZlKGhvbGRlcik7CiAgICAgaWYgKCFpbXAtPmNhblByb3Zp ZGVTcGVlZCgpKQotICAgICAgICByZXR1cm4gdjg6Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpOwor ICAgICAgICByZXR1cm4gdjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKICAgICByZXR1cm4gdjg6 Ok51bWJlcjo6TmV3KGltcC0+c3BlZWQoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERldmljZU1vdGlvbkV2ZW50Q3VzdG9tLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERldmljZU1vdGlvbkV2ZW50Q3VzdG9t LmNwcAppbmRleCA3ZjBjOGM4OGYwY2ZlMjBmNmUwZTQ2ZGQzYWJhOGUyNWUxZWZiOTA4Li5lNzU1 NmEyMzAxNjc2MmIxNzlhMmQ0ZWM4MzVhMjZlMWQ5YzMzZjQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhEZXZpY2VNb3Rpb25FdmVudEN1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlTW90aW9uRXZl bnRDdXN0b20uY3BwCkBAIC00MCwxOCArNDAsMTggQEAgbmFtZXNwYWNlIHsKIHN0YXRpYyB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gY3JlYXRlQWNjZWxlcmF0aW9uT2JqZWN0KGNvbnN0IERldmljZU1v dGlvbkRhdGE6OkFjY2VsZXJhdGlvbiogYWNjZWxlcmF0aW9uLCB2ODo6SXNvbGF0ZSogaXNvbGF0 ZSkKIHsKICAgICB2ODo6TG9jYWw8djg6Ok9iamVjdD4gb2JqZWN0ID0gdjg6Ok9iamVjdDo6TmV3 KCk7Ci0gICAgb2JqZWN0LT5TZXQodjg6OlN0cmluZzo6TmV3U3ltYm9sKCJ4IiksIGFjY2VsZXJh dGlvbi0+Y2FuUHJvdmlkZVgoKSA/IHY4OjpOdW1iZXI6Ok5ldyhhY2NlbGVyYXRpb24tPngoKSkg OiB2ODo6TnVsbChpc29sYXRlKSk7Ci0gICAgb2JqZWN0LT5TZXQodjg6OlN0cmluZzo6TmV3U3lt Ym9sKCJ5IiksIGFjY2VsZXJhdGlvbi0+Y2FuUHJvdmlkZVkoKSA/IHY4OjpOdW1iZXI6Ok5ldyhh Y2NlbGVyYXRpb24tPnkoKSkgOiB2ODo6TnVsbChpc29sYXRlKSk7Ci0gICAgb2JqZWN0LT5TZXQo djg6OlN0cmluZzo6TmV3U3ltYm9sKCJ6IiksIGFjY2VsZXJhdGlvbi0+Y2FuUHJvdmlkZVooKSA/ IHY4OjpOdW1iZXI6Ok5ldyhhY2NlbGVyYXRpb24tPnooKSkgOiB2ODo6TnVsbChpc29sYXRlKSk7 CisgICAgb2JqZWN0LT5TZXQodjg6OlN0cmluZzo6TmV3U3ltYm9sKCJ4IiksIGFjY2VsZXJhdGlv bi0+Y2FuUHJvdmlkZVgoKSA/IHY4OjpOdW1iZXI6Ok5ldyhhY2NlbGVyYXRpb24tPngoKSkgOiB2 OE51bGwoaXNvbGF0ZSkpOworICAgIG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgi eSIpLCBhY2NlbGVyYXRpb24tPmNhblByb3ZpZGVZKCkgPyB2ODo6TnVtYmVyOjpOZXcoYWNjZWxl cmF0aW9uLT55KCkpIDogdjhOdWxsKGlzb2xhdGUpKTsKKyAgICBvYmplY3QtPlNldCh2ODo6U3Ry aW5nOjpOZXdTeW1ib2woInoiKSwgYWNjZWxlcmF0aW9uLT5jYW5Qcm92aWRlWigpID8gdjg6Ok51 bWJlcjo6TmV3KGFjY2VsZXJhdGlvbi0+eigpKSA6IHY4TnVsbChpc29sYXRlKSk7CiAgICAgcmV0 dXJuIG9iamVjdDsKIH0KIAogc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjcmVhdGVSb3Rh dGlvblJhdGVPYmplY3QoY29uc3QgRGV2aWNlTW90aW9uRGF0YTo6Um90YXRpb25SYXRlKiByb3Rh dGlvblJhdGUsIHY4OjpJc29sYXRlKiBpc29sYXRlKQogewogICAgIHY4OjpMb2NhbDx2ODo6T2Jq ZWN0PiBvYmplY3QgPSB2ODo6T2JqZWN0OjpOZXcoKTsKLSAgICBvYmplY3QtPlNldCh2ODo6U3Ry aW5nOjpOZXdTeW1ib2woImFscGhhIiksIHJvdGF0aW9uUmF0ZS0+Y2FuUHJvdmlkZUFscGhhKCkg PyB2ODo6TnVtYmVyOjpOZXcocm90YXRpb25SYXRlLT5hbHBoYSgpKSA6IHY4OjpOdWxsKGlzb2xh dGUpKTsKLSAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2woImJldGEiKSwgIHJv dGF0aW9uUmF0ZS0+Y2FuUHJvdmlkZUJldGEoKSAgPyB2ODo6TnVtYmVyOjpOZXcocm90YXRpb25S YXRlLT5iZXRhKCkpICA6IHY4OjpOdWxsKGlzb2xhdGUpKTsKLSAgICBvYmplY3QtPlNldCh2ODo6 U3RyaW5nOjpOZXdTeW1ib2woImdhbW1hIiksIHJvdGF0aW9uUmF0ZS0+Y2FuUHJvdmlkZUdhbW1h KCkgPyB2ODo6TnVtYmVyOjpOZXcocm90YXRpb25SYXRlLT5nYW1tYSgpKSA6IHY4OjpOdWxsKGlz b2xhdGUpKTsKKyAgICBvYmplY3QtPlNldCh2ODo6U3RyaW5nOjpOZXdTeW1ib2woImFscGhhIiks IHJvdGF0aW9uUmF0ZS0+Y2FuUHJvdmlkZUFscGhhKCkgPyB2ODo6TnVtYmVyOjpOZXcocm90YXRp b25SYXRlLT5hbHBoYSgpKSA6IHY4TnVsbChpc29sYXRlKSk7CisgICAgb2JqZWN0LT5TZXQodjg6 OlN0cmluZzo6TmV3U3ltYm9sKCJiZXRhIiksICByb3RhdGlvblJhdGUtPmNhblByb3ZpZGVCZXRh KCkgID8gdjg6Ok51bWJlcjo6TmV3KHJvdGF0aW9uUmF0ZS0+YmV0YSgpKSAgOiB2OE51bGwoaXNv bGF0ZSkpOworICAgIG9iamVjdC0+U2V0KHY4OjpTdHJpbmc6Ok5ld1N5bWJvbCgiZ2FtbWEiKSwg cm90YXRpb25SYXRlLT5jYW5Qcm92aWRlR2FtbWEoKSA/IHY4OjpOdW1iZXI6Ok5ldyhyb3RhdGlv blJhdGUtPmdhbW1hKCkpIDogdjhOdWxsKGlzb2xhdGUpKTsKICAgICByZXR1cm4gb2JqZWN0Owog fQogCkBAIC0xMjcsNyArMTI3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGV2aWNlTW90 aW9uRXZlbnQ6OmFjY2VsZXJhdGlvbkFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDwKICAgICB2ODo6 SGFuZGxlPHY4OjpPYmplY3Q+IGhvbGRlciA9IGluZm8uSG9sZGVyKCk7CiAgICAgRGV2aWNlTW90 aW9uRXZlbnQqIGltcCA9IFY4RGV2aWNlTW90aW9uRXZlbnQ6OnRvTmF0aXZlKGhvbGRlcik7CiAg ICAgaWYgKCFpbXAtPmRldmljZU1vdGlvbkRhdGEoKS0+YWNjZWxlcmF0aW9uKCkpCi0gICAgICAg IHJldHVybiB2ODo6TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CisgICAgICAgIHJldHVybiB2OE51 bGwoaW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJldHVybiBjcmVhdGVBY2NlbGVyYXRpb25PYmpl Y3QoaW1wLT5kZXZpY2VNb3Rpb25EYXRhKCktPmFjY2VsZXJhdGlvbigpLCBpbmZvLkdldElzb2xh dGUoKSk7CiB9CiAKQEAgLTEzNyw3ICsxMzcsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhE ZXZpY2VNb3Rpb25FdmVudDo6YWNjZWxlcmF0aW9uSW5jbHVkaW5nR3Jhdml0eUFjY2Vzc29yRwog ICAgIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gaG9sZGVyID0gaW5mby5Ib2xkZXIoKTsKICAgICBE ZXZpY2VNb3Rpb25FdmVudCogaW1wID0gVjhEZXZpY2VNb3Rpb25FdmVudDo6dG9OYXRpdmUoaG9s ZGVyKTsKICAgICBpZiAoIWltcC0+ZGV2aWNlTW90aW9uRGF0YSgpLT5hY2NlbGVyYXRpb25JbmNs dWRpbmdHcmF2aXR5KCkpCi0gICAgICAgIHJldHVybiB2ODo6TnVsbChpbmZvLkdldElzb2xhdGUo KSk7CisgICAgICAgIHJldHVybiB2OE51bGwoaW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJldHVy biBjcmVhdGVBY2NlbGVyYXRpb25PYmplY3QoaW1wLT5kZXZpY2VNb3Rpb25EYXRhKCktPmFjY2Vs ZXJhdGlvbkluY2x1ZGluZ0dyYXZpdHkoKSwgaW5mby5HZXRJc29sYXRlKCkpOwogfQogCkBAIC0x NDcsNyArMTQ3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGV2aWNlTW90aW9uRXZlbnQ6 OnJvdGF0aW9uUmF0ZUFjY2Vzc29yR2V0dGVyKHY4OjpMb2NhbDwKICAgICB2ODo6SGFuZGxlPHY4 OjpPYmplY3Q+IGhvbGRlciA9IGluZm8uSG9sZGVyKCk7CiAgICAgRGV2aWNlTW90aW9uRXZlbnQq IGltcCA9IFY4RGV2aWNlTW90aW9uRXZlbnQ6OnRvTmF0aXZlKGhvbGRlcik7CiAgICAgaWYgKCFp bXAtPmRldmljZU1vdGlvbkRhdGEoKS0+cm90YXRpb25SYXRlKCkpCi0gICAgICAgIHJldHVybiB2 ODo6TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CisgICAgICAgIHJldHVybiB2OE51bGwoaW5mby5H ZXRJc29sYXRlKCkpOwogICAgIHJldHVybiBjcmVhdGVSb3RhdGlvblJhdGVPYmplY3QoaW1wLT5k ZXZpY2VNb3Rpb25EYXRhKCktPnJvdGF0aW9uUmF0ZSgpLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9 CiAKQEAgLTE1Nyw3ICsxNTcsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEZXZpY2VNb3Rp b25FdmVudDo6aW50ZXJ2YWxBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OgogICAgIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gaG9sZGVyID0gaW5mby5Ib2xkZXIoKTsKICAgICBEZXZpY2VNb3Rp b25FdmVudCogaW1wID0gVjhEZXZpY2VNb3Rpb25FdmVudDo6dG9OYXRpdmUoaG9sZGVyKTsKICAg ICBpZiAoIWltcC0+ZGV2aWNlTW90aW9uRGF0YSgpLT5jYW5Qcm92aWRlSW50ZXJ2YWwoKSkKLSAg ICAgICAgcmV0dXJuIHY4OjpOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJu IHY4TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpOdW1iZXI6Ok5ldyhp bXAtPmRldmljZU1vdGlvbkRhdGEoKS0+aW50ZXJ2YWwoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERldmljZU9yaWVudGF0aW9uRXZlbnRD dXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlT3Jp ZW50YXRpb25FdmVudEN1c3RvbS5jcHAKaW5kZXggODhkOWI0M2FkNDY1N2IyYWI0MWZmY2JjNDNj ZWI1YThhNTE4Nzg5MS4uMzg2OTBiYWQ4MWJjNDk1NjVkN2ZiYjAyZmE3ODhhYWVjOWE5NTE2MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGV2aWNlT3Jp ZW50YXRpb25FdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4RGV2aWNlT3JpZW50YXRpb25FdmVudEN1c3RvbS5jcHAKQEAgLTQxLDcgKzQxLDcg QEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGV2aWNlT3JpZW50YXRpb25FdmVudDo6YWxwaGFB Y2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djgKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+IGhv bGRlciA9IGluZm8uSG9sZGVyKCk7CiAgICAgRGV2aWNlT3JpZW50YXRpb25FdmVudCogaW1wID0g VjhEZXZpY2VPcmllbnRhdGlvbkV2ZW50Ojp0b05hdGl2ZShob2xkZXIpOwogICAgIGlmICghaW1w LT5vcmllbnRhdGlvbigpLT5jYW5Qcm92aWRlQWxwaGEoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpO dWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChpbmZvLkdldElz b2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpOdW1iZXI6Ok5ldyhpbXAtPm9yaWVudGF0aW9uKCkt PmFscGhhKCkpOwogfQogCkBAIC01MSw3ICs1MSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBW OERldmljZU9yaWVudGF0aW9uRXZlbnQ6OmJldGFBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6 CiAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLkhvbGRlcigpOwogICAg IERldmljZU9yaWVudGF0aW9uRXZlbnQqIGltcCA9IFY4RGV2aWNlT3JpZW50YXRpb25FdmVudDo6 dG9OYXRpdmUoaG9sZGVyKTsKICAgICBpZiAoIWltcC0+b3JpZW50YXRpb24oKS0+Y2FuUHJvdmlk ZUJldGEoKSkKLSAgICAgICAgcmV0dXJuIHY4OjpOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAg ICAgICAgcmV0dXJuIHY4TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpO dW1iZXI6Ok5ldyhpbXAtPm9yaWVudGF0aW9uKCktPmJldGEoKSk7CiB9CiAKQEAgLTYxLDcgKzYx LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGV2aWNlT3JpZW50YXRpb25FdmVudDo6Z2Ft bWFBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djgKICAgICB2ODo6SGFuZGxlPHY4OjpPYmplY3Q+ IGhvbGRlciA9IGluZm8uSG9sZGVyKCk7CiAgICAgRGV2aWNlT3JpZW50YXRpb25FdmVudCogaW1w ID0gVjhEZXZpY2VPcmllbnRhdGlvbkV2ZW50Ojp0b05hdGl2ZShob2xkZXIpOwogICAgIGlmICgh aW1wLT5vcmllbnRhdGlvbigpLT5jYW5Qcm92aWRlR2FtbWEoKSkKLSAgICAgICAgcmV0dXJuIHY4 OjpOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChpbmZvLkdl dElzb2xhdGUoKSk7CiAgICAgcmV0dXJuIHY4OjpOdW1iZXI6Ok5ldyhpbXAtPm9yaWVudGF0aW9u KCktPmdhbW1hKCkpOwogfQogCkBAIC03MSw3ICs3MSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBWOERldmljZU9yaWVudGF0aW9uRXZlbnQ6OmFic29sdXRlQWNjZXNzb3JHZXR0ZXIodjg6Okxv Y2FsCiAgICAgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiBob2xkZXIgPSBpbmZvLkhvbGRlcigpOwog ICAgIERldmljZU9yaWVudGF0aW9uRXZlbnQqIGltcCA9IFY4RGV2aWNlT3JpZW50YXRpb25FdmVu dDo6dG9OYXRpdmUoaG9sZGVyKTsKICAgICBpZiAoIWltcC0+b3JpZW50YXRpb24oKS0+Y2FuUHJv dmlkZUFic29sdXRlKCkpCi0gICAgICAgIHJldHVybiB2ODo6TnVsbChpbmZvLkdldElzb2xhdGUo KSk7CisgICAgICAgIHJldHVybiB2OE51bGwoaW5mby5HZXRJc29sYXRlKCkpOwogICAgIHJldHVy biB2ODo6Qm9vbGVhbjo6TmV3KGltcC0+b3JpZW50YXRpb24oKS0+YWJzb2x1dGUoKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERvY3VtZW50 TG9jYXRpb25DdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4 RG9jdW1lbnRMb2NhdGlvbkN1c3RvbS5jcHAKaW5kZXggODNiY2ViNzNkYzg5YzIzNjc0ZWI2NzYw NWVmMzFmNzU4ZDI4NmMyNS4uN2Q5MTFhNDQxOGEyZGUxOGI2ZWZhZGJmMGQzOTE1NGVmNmMzODQ5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RG9jdW1l bnRMb2NhdGlvbkN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4RG9jdW1lbnRMb2NhdGlvbkN1c3RvbS5jcHAKQEAgLTM3LDcgKzM3LDcgQEAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IFY4RG9jdW1lbnQ6OmxvY2F0aW9uQWNjZXNzb3JHZXR0ZXIodjg6Okxv Y2FsPHY4OjpTdHJpbmc+IG4KIHsKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBWOERvY3VtZW50 Ojp0b05hdGl2ZShpbmZvLkhvbGRlcigpKTsKICAgICBpZiAoIWRvY3VtZW50LT5mcmFtZSgpKQot ICAgICAgICByZXR1cm4gdjg6Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpOworICAgICAgICByZXR1 cm4gdjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKIAogICAgIERPTVdpbmRvdyogd2luZG93ID0g ZG9jdW1lbnQtPmRvbVdpbmRvdygpOwogICAgIHJldHVybiB0b1Y4KHdpbmRvdy0+bG9jYXRpb24o KSwgaW5mby5Ib2xkZXIoKSwgaW5mby5HZXRJc29sYXRlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENhbnZhc0VsZW1lbnRDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENhbnZhc0VsZW1lbnRD dXN0b20uY3BwCmluZGV4IGIzYWQ2MDA2YTc2NWEyNmRmMWZlZjM2YTA2M2EwNjdkNjE3OGRmMDku LjExMjcxZWZjNDc2YTZhMDU2YTI2Zjg1YmJjNDZmODgzMzVmYmQ2OTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDYW52YXNFbGVtZW50Q3VzdG9t LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ2FudmFz RWxlbWVudEN1c3RvbS5jcHAKQEAgLTg0LDcgKzg0LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IFY4SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHRDYWxsYmFjayhjb25zdCB2ODo6QXJndW1l bnQKICNlbmRpZgogICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIHJlc3VsdCA9IGltcC0+Z2V0 Q29udGV4dChjb250ZXh0SWQsIGF0dHJzLmdldCgpKTsKICAgICBpZiAoIXJlc3VsdCkKLSAgICAg ICAgcmV0dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4 TnVsbChhcmdzLkdldElzb2xhdGUoKSk7CiAgICAgZWxzZSBpZiAocmVzdWx0LT5pczJkKCkpIHsK ICAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHY4UmVzdWx0ID0gdG9WOChzdGF0aWNfY2Fz dDxDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQqPihyZXN1bHQpLCBhcmdzLkhvbGRlcigpLCBhcmdz LkdldElzb2xhdGUoKSk7CiAgICAgICAgIGlmIChJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmNh bnZhc0FnZW50RW5hYmxlZChpbXAtPmRvY3VtZW50KCkpKSB7CkBAIC0xMTYsNyArMTE2LDcgQEAg djg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SFRNTENhbnZhc0VsZW1lbnQ6OmdldENvbnRleHRDYWxs YmFjayhjb25zdCB2ODo6QXJndW1lbnQKICAgICB9CiAjZW5kaWYKICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKLSAgICByZXR1cm4gdjg6Ok51bGwoYXJncy5HZXRJc29sYXRlKCkpOworICAgIHJl dHVybiB2OE51bGwoYXJncy5HZXRJc29sYXRlKCkpOwogfQogCiB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gVjhIVE1MQ2FudmFzRWxlbWVudDo6dG9EYXRhVVJMQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3Vt ZW50cyYgYXJncykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3Rv bS9WOEhpc3RvcnlDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4SGlzdG9yeUN1c3RvbS5jcHAKaW5kZXggZDI1MzRjMTM3ZTllZTE3ZTdhMTc1YTZmMjI1NDYw ZGE3MDFhYTc5Ni4uMWU1ZTFlYTNkOWMwZGFhNDI2MGI2ODVjZTc3ZDc3YjRlOThiZTYyNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1c3Rv bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SGlzdG9yeUN1 c3RvbS5jcHAKQEAgLTUyLDcgKzUyLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4SGlzdG9y eTo6c3RhdGVBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmFtZSwKICAgICAg ICAgcmV0dXJuIHZhbHVlOwogCiAgICAgU2VyaWFsaXplZFNjcmlwdFZhbHVlKiBzZXJpYWxpemVk ID0gaGlzdG9yeS0+c3RhdGUoKTsKLSAgICB2YWx1ZSA9IHNlcmlhbGl6ZWQgPyBzZXJpYWxpemVk LT5kZXNlcmlhbGl6ZSgwLCBpbmZvLkdldElzb2xhdGUoKSkgOiB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4odjg6Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpKTsKKyAgICB2YWx1ZSA9IHNlcmlhbGl6ZWQg PyBzZXJpYWxpemVkLT5kZXNlcmlhbGl6ZSgwLCBpbmZvLkdldElzb2xhdGUoKSkgOiB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4odjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKSk7CiAgICAgaW5mby5Ib2xk ZXIoKS0+U2V0SGlkZGVuVmFsdWUoVjhIaWRkZW5Qcm9wZXJ0eU5hbWU6OnN0YXRlKCksIHZhbHVl KTsKIAogICAgIHJldHVybiB2YWx1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhNZXNzYWdlRXZlbnRDdXN0b20uY3BwCmluZGV4IDZlNWJjNTY3 YzJmYjc4NjhkN2FhNjhiNWVmYjJkMGJkZTQyZDdlYmUuLjA3NjIzZmNhNWVjOTU3NDZmMTNhZDRj M2NjNTkyYmZmYTE3MjNhNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOE1lc3NhZ2VFdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4TWVzc2FnZUV2ZW50Q3VzdG9tLmNwcApAQCAtNTIsNyArNTIsNyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhNZXNzYWdlRXZlbnQ6OmRhdGFBY2Nlc3NvckdldHRl cih2ODo6TG9jYWw8djg6OlN0cmluZz4gbgogICAgIGNhc2UgTWVzc2FnZUV2ZW50OjpEYXRhVHlw ZVNjcmlwdFZhbHVlOiB7CiAgICAgICAgIFNjcmlwdFZhbHVlIHNjcmlwdFZhbHVlID0gZXZlbnQt PmRhdGFBc1NjcmlwdFZhbHVlKCk7CiAgICAgICAgIGlmIChzY3JpcHRWYWx1ZS5oYXNOb1ZhbHVl KCkpCi0gICAgICAgICAgICByZXN1bHQgPSB2ODo6TnVsbChpbmZvLkdldElzb2xhdGUoKSk7Cisg ICAgICAgICAgICByZXN1bHQgPSB2OE51bGwoaW5mby5HZXRJc29sYXRlKCkpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICByZXN1bHQgPSB2ODo6TG9jYWw8djg6OlZhbHVlPjo6TmV3KHNjcmlw dFZhbHVlLnY4VmFsdWUoKSk7CiAgICAgICAgIGJyZWFrOwpAQCAtNjIsNyArNjIsNyBAQCB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gVjhNZXNzYWdlRXZlbnQ6OmRhdGFBY2Nlc3NvckdldHRlcih2ODo6 TG9jYWw8djg6OlN0cmluZz4gbgogICAgICAgICBpZiAoU2VyaWFsaXplZFNjcmlwdFZhbHVlKiBz ZXJpYWxpemVkVmFsdWUgPSBldmVudC0+ZGF0YUFzU2VyaWFsaXplZFNjcmlwdFZhbHVlKCkpCiAg ICAgICAgICAgICByZXN1bHQgPSBzZXJpYWxpemVkVmFsdWUtPmRlc2VyaWFsaXplKGV2ZW50LT5w b3J0cygpLCBpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIHJl c3VsdCA9IHY4OjpOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgICAgIHJlc3VsdCA9 IHY4TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CiAgICAgICAgIGJyZWFrOwogCiAgICAgY2FzZSBN ZXNzYWdlRXZlbnQ6OkRhdGFUeXBlU3RyaW5nOiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNaWNyb0RhdGFJdGVtVmFsdWVDdXN0b20uY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4TWljcm9EYXRhSXRlbVZhbHVlQ3VzdG9t LmNwcAppbmRleCA2YzI4NDQ3NDg1NzdjYjUzMmQ1MGFkYjNkMTMzNDQwMDNhYzhhMWM4Li45NTNi YmVjMTUwN2JkMjQ2Y2JmN2M3M2Q5ZDQxYjE0Y2RkNzllMmQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhNaWNyb0RhdGFJdGVtVmFsdWVDdXN0b20uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE1pY3JvRGF0YUl0ZW1W YWx1ZUN1c3RvbS5jcHAKQEAgLTQyLDcgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjgoTWljcm9EYXRhSXRlbVZhbHVlKiBpdGVtVmFsdWUsIHY4 OjpIYW5kbGU8djg6Ok9iamVjdD4gY3JlYXRpb25Db250ZXh0LCB2ODo6SXNvbGF0ZSogaXNvbGF0 ZSkKIHsKICAgICBpZiAoIWl0ZW1WYWx1ZSkKLSAgICAgICAgcmV0dXJuIHY4OjpOdWxsKCk7Cisg ICAgICAgIHJldHVybiB2OE51bGwoaXNvbGF0ZSk7CiAgICAgaWYgKGl0ZW1WYWx1ZS0+aXNOb2Rl KCkpCiAgICAgICAgIHJldHVybiB0b1Y4KGl0ZW1WYWx1ZS0+Z2V0Tm9kZSgpLCBjcmVhdGlvbkNv bnRleHQsIGlzb2xhdGUpOwogICAgIHJldHVybiB2OFN0cmluZyhpdGVtVmFsdWUtPmdldFN0cmlu ZygpLCBpc29sYXRlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOE5vZGVDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4Tm9kZUN1c3RvbS5jcHAKaW5kZXggODUwM2QzZWNlODEyYzZkYzExNDFmMjkyZjA5NWY5NjEy ZGE2ODk4MC4uN2FkMDhkNjA3ZjU4MzFiNGZmMmNmZjhmOTkyZTBkZTFlMDVmNmRhOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUN1c3RvbS5jcHAK QEAgLTc0LDcgKzc0LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4Tm9kZTo6aW5zZXJ0QmVm b3JlQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICAgICAgcmV0dXJuIHNl dERPTUV4Y2VwdGlvbihlYywgYXJncy5HZXRJc29sYXRlKCkpOwogICAgIGlmIChzdWNjZXNzKQog ICAgICAgICByZXR1cm4gYXJnc1swXTsKLSAgICByZXR1cm4gdjg6Ok51bGwoYXJncy5HZXRJc29s YXRlKCkpOworICAgIHJldHVybiB2OE51bGwoYXJncy5HZXRJc29sYXRlKCkpOwogfQogCiAvLyBU aGlzIGZ1bmN0aW9uIGlzIGN1c3RvbWl6ZWQgdG8gdGFrZSBhZHZhbnRhZ2Ugb2YgdGhlIG9wdGlv bmFsIDR0aCBhcmd1bWVudDogc2hvdWxkTGF6eUF0dGFjaApAQCAtOTEsNyArOTEsNyBAQCB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gVjhOb2RlOjpyZXBsYWNlQ2hpbGRDYWxsYmFjayhjb25zdCB2ODo6 QXJndW1lbnRzJiBhcmdzKQogICAgICAgICByZXR1cm4gc2V0RE9NRXhjZXB0aW9uKGVjLCBhcmdz LkdldElzb2xhdGUoKSk7CiAgICAgaWYgKHN1Y2Nlc3MpCiAgICAgICAgIHJldHVybiBhcmdzWzFd OwotICAgIHJldHVybiB2ODo6TnVsbChhcmdzLkdldElzb2xhdGUoKSk7CisgICAgcmV0dXJuIHY4 TnVsbChhcmdzLkdldElzb2xhdGUoKSk7CiB9CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5v ZGU6OnJlbW92ZUNoaWxkQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKQEAgLTEw Niw3ICsxMDYsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhOb2RlOjpyZW1vdmVDaGlsZENh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgICAgIHJldHVybiBzZXRET01F eGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICBpZiAoc3VjY2VzcykKICAgICAg ICAgcmV0dXJuIGFyZ3NbMF07Ci0gICAgcmV0dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgp KTsKKyAgICByZXR1cm4gdjhOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIH0KIAogLy8gVGhpcyBm dW5jdGlvbiBpcyBjdXN0b21pemVkIHRvIHRha2UgYWR2YW50YWdlIG9mIHRoZSBvcHRpb25hbCA0 dGggYXJndW1lbnQ6IHNob3VsZExhenlBdHRhY2gKQEAgLTEyMiw3ICsxMjIsNyBAQCB2ODo6SGFu ZGxlPHY4OjpWYWx1ZT4gVjhOb2RlOjphcHBlbmRDaGlsZENhbGxiYWNrKGNvbnN0IHY4OjpBcmd1 bWVudHMmIGFyZ3MpCiAgICAgICAgIHJldHVybiBzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0 SXNvbGF0ZSgpKTsKICAgICBpZiAoc3VjY2VzcykKICAgICAgICAgcmV0dXJuIGFyZ3NbMF07Ci0g ICAgcmV0dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKKyAgICByZXR1cm4gdjhOdWxs KGFyZ3MuR2V0SXNvbGF0ZSgpKTsKIH0KIAogdjg6OkhhbmRsZTx2ODo6T2JqZWN0PiB3cmFwKE5v ZGUqIGltcGwsIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4gY3JlYXRpb25Db250ZXh0LCB2ODo6SXNv bGF0ZSogaXNvbGF0ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1 c3RvbS9WOFBvcFN0YXRlRXZlbnRDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAKaW5kZXggMzcwOWEwY2U5MTQ4OTc4 NTNiYjZhZWIzODJjMWE3NWQ5ZThlYjc4MC4uMDVmNTlmZWM0MTJlOTY4YjY0MDYwNDMzOGJkOGIx YmQ3YWJiNDFjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9t L1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv djgvY3VzdG9tL1Y4UG9wU3RhdGVFdmVudEN1c3RvbS5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IFY4UG9wU3RhdGVFdmVudDo6c3RhdGVBY2Nlc3NvckdldHRlcih2 ODo6TG9jYWw8djg6OlN0cmluZz4KIAogICAgIEhpc3RvcnkqIGhpc3RvcnkgPSBldmVudC0+aGlz dG9yeSgpOwogICAgIGlmICghaGlzdG9yeSB8fCAhZXZlbnQtPnNlcmlhbGl6ZWRTdGF0ZSgpKQot ICAgICAgICByZXR1cm4gY2FjaGVTdGF0ZShpbmZvLkhvbGRlcigpLCB2ODo6TnVsbChpbmZvLkdl dElzb2xhdGUoKSkpOworICAgICAgICByZXR1cm4gY2FjaGVTdGF0ZShpbmZvLkhvbGRlcigpLCB2 OE51bGwoaW5mby5HZXRJc29sYXRlKCkpKTsKIAogICAgIC8vIFRoZXJlJ3Mgbm8gY2FjaGVkIHZh bHVlIGZyb20gYSBwcmV2aW91cyBpbnZvY2F0aW9uLCBub3IgYSBzdGF0ZSB2YWx1ZSB3YXMgcHJv dmlkZWQgYnkgdGhlCiAgICAgLy8gZXZlbnQsIGJ1dCB0aGVyZSBpcyBhIGhpc3Rvcnkgb2JqZWN0 LCBzbyBmaXJzdCB3ZSBuZWVkIHRvIHNlZSBpZiB0aGUgc3RhdGUgb2JqZWN0IGhhcyBiZWVuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhTUUxSZXN1bHRT ZXRSb3dMaXN0Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OFNRTFJlc3VsdFNldFJvd0xpc3RDdXN0b20uY3BwCmluZGV4IDU4OTk0OTQxMDE2NWY1NTAyMzI4 NGUyYmM1Nzk3MzNiNGJhMGMwODAuLjY0NjU4MGEzZjEzMzg1NDhhNTRiODU5MDllNWE5YzVmZDdk OTY1M2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFNR TFJlc3VsdFNldFJvd0xpc3RDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L2N1c3RvbS9WOFNRTFJlc3VsdFNldFJvd0xpc3RDdXN0b20uY3BwCkBAIC02Niw3ICs2Niw3 IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFNRTFJlc3VsdFNldFJvd0xpc3Q6Oml0ZW1DYWxs YmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhCiAgICAgICAgICAgICAgICAgdmFsdWUgPSB2OFN0 cmluZyhzcWxWYWx1ZS5zdHJpbmcoKSwgYXJncy5HZXRJc29sYXRlKCkpOwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBTUUxWYWx1ZTo6TnVsbFZhbHVlOgotICAgICAg ICAgICAgICAgIHZhbHVlID0gdjg6Ok51bGwoYXJncy5HZXRJc29sYXRlKCkpOworICAgICAgICAg ICAgICAgIHZhbHVlID0gdjhOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKICAgICAgICAgICAgICAg ICBicmVhazsKICAgICAgICAgICAgIGNhc2UgU1FMVmFsdWU6Ok51bWJlclZhbHVlOgogICAgICAg ICAgICAgICAgIHZhbHVlID0gdjg6Ok51bWJlcjo6TmV3KHNxbFZhbHVlLm51bWJlcigpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFRyYWNrRXZlbnRD dXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4VHJhY2tFdmVu dEN1c3RvbS5jcHAKaW5kZXggOGQxOWVlYjRiYjFkZWFjMGY2NTUxMTBlNWE0NDAzNzRiZjkxMGJk ZS4uNjhjZjU2YmJhNDEzYTgxODZlZWNmNmY1NTJkNDU0YzYwOGZhYTMzMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4VHJhY2tFdmVudEN1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4VHJhY2tFdmVudEN1c3Rv bS5jcHAKQEAgLTQ3LDcgKzQ3LDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4VHJhY2tFdmVu dDo6dHJhY2tBY2Nlc3NvckdldHRlcih2ODo6TG9jYWw8djg6OlN0cmluZz4gbmEKICAgICBUcmFj a0Jhc2UqIHRyYWNrID0gdHJhY2tFdmVudC0+dHJhY2soKTsKICAgICAKICAgICBpZiAoIXRyYWNr KQotICAgICAgICByZXR1cm4gdjg6Ok51bGwoaW5mby5HZXRJc29sYXRlKCkpOworICAgICAgICBy ZXR1cm4gdjhOdWxsKGluZm8uR2V0SXNvbGF0ZSgpKTsKIAogICAgIHN3aXRjaCAodHJhY2stPnR5 cGUoKSkgewogICAgIGNhc2UgVHJhY2tCYXNlOjpCYXNlVHJhY2s6CkBAIC02Niw3ICs2Niw3IEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFRyYWNrRXZlbnQ6OnRyYWNrQWNjZXNzb3JHZXR0ZXIo djg6OkxvY2FsPHY4OjpTdHJpbmc+IG5hCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIHJl dHVybiB2ODo6TnVsbChpbmZvLkdldElzb2xhdGUoKSk7CisgICAgcmV0dXJuIHY4TnVsbChpbmZv LkdldElzb2xhdGUoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYkdMUmVuZGVyaW5nQ29udGV4 dEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhXZWJHTFJl bmRlcmluZ0NvbnRleHRDdXN0b20uY3BwCmluZGV4IDRjNDNjMGY2ZDQwYmY4ZGI0ZTM1ZDRkZmMz MDcxNzZlMWFlYjIzYmEuLjFjNDI4MTJkN2IwNzgxNGMyM2JjZGIzMjQxZmYyZjUzMzU0NWJiMzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOFdlYkdMUmVu ZGVyaW5nQ29udGV4dEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4V2ViR0xSZW5kZXJpbmdDb250ZXh0Q3VzdG9tLmNwcApAQCAtMTMyLDcgKzEzMiw3 IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdG9WOE9iamVjdChjb25zdCBXZWJHTEdl dEluZm8mIGluZm8sIHY4OjpIYW5kbGU8djg6CiAgICAgY2FzZSBXZWJHTEdldEluZm86OmtUeXBl SW50OgogICAgICAgICByZXR1cm4gdjhJbnRlZ2VyKGluZm8uZ2V0SW50KCksIGlzb2xhdGUpOwog ICAgIGNhc2UgV2ViR0xHZXRJbmZvOjprVHlwZU51bGw6Ci0gICAgICAgIHJldHVybiB2ODo6TnVs bChpc29sYXRlKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChpc29sYXRlKTsKICAgICBjYXNlIFdl YkdMR2V0SW5mbzo6a1R5cGVTdHJpbmc6CiAgICAgICAgIHJldHVybiB2OFN0cmluZyhpbmZvLmdl dFN0cmluZygpKTsKICAgICBjYXNlIFdlYkdMR2V0SW5mbzo6a1R5cGVVbnNpZ25lZEludDoKQEAg LTE2OCw3ICsxNjgsNyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRvVjhPYmplY3Qo Y29uc3QgV2ViR0xHZXRJbmZvJiBpbmZvLCB2ODo6SGFuZGxlPHY4Ogogc3RhdGljIHY4OjpIYW5k bGU8djg6OlZhbHVlPiB0b1Y4T2JqZWN0KFdlYkdMRXh0ZW5zaW9uKiBleHRlbnNpb24sIHY4OjpI YW5kbGU8djg6Ok9iamVjdD4gY29udGV4dE9iamVjdCwgdjg6Oklzb2xhdGUqIGlzb2xhdGUpCiB7 CiAgICAgaWYgKCFleHRlbnNpb24pCi0gICAgICAgIHJldHVybiB2ODo6TnVsbChpc29sYXRlKTsK KyAgICAgICAgcmV0dXJuIHY4TnVsbChpc29sYXRlKTsKICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gZXh0ZW5zaW9uT2JqZWN0OwogICAgIGNvbnN0IGNoYXIqIHJlZmVyZW5jZU5hbWUgPSAwOwog ICAgIHN3aXRjaCAoZXh0ZW5zaW9uLT5nZXROYW1lKCkpIHsKQEAgLTI4NiwxMCArMjg2LDEwIEBA IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0QXR0YWNo ZWRTaGFkZXJzQ2FsbGJhY2soY29uc3QKICAgICBib29sIHN1Y2NlZWQgPSBjb250ZXh0LT5nZXRB dHRhY2hlZFNoYWRlcnMocHJvZ3JhbSwgc2hhZGVycywgZWMpOwogICAgIGlmIChlYykgewogICAg ICAgICBzZXRET01FeGNlcHRpb24oZWMsIGFyZ3MuR2V0SXNvbGF0ZSgpKTsKLSAgICAgICAgcmV0 dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChh cmdzLkdldElzb2xhdGUoKSk7CiAgICAgfQogICAgIGlmICghc3VjY2VlZCkKLSAgICAgICAgcmV0 dXJuIHY4OjpOdWxsKGFyZ3MuR2V0SXNvbGF0ZSgpKTsKKyAgICAgICAgcmV0dXJuIHY4TnVsbChh cmdzLkdldElzb2xhdGUoKSk7CiAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT4gYXJyYXkgPSB2ODo6 QXJyYXk6Ok5ldyhzaGFkZXJzLnNpemUoKSk7CiAgICAgZm9yIChzaXplX3QgaWkgPSAwOyBpaSA8 IHNoYWRlcnMuc2l6ZSgpOyArK2lpKQogICAgICAgICBhcnJheS0+U2V0KHY4SW50ZWdlcihpaSwg YXJncy5HZXRJc29sYXRlKCkpLCB0b1Y4KHNoYWRlcnNbaWldLmdldCgpLCBhcmdzLkhvbGRlcigp LCBhcmdzLkdldElzb2xhdGUoKSkpOwpAQCAtMzk2LDcgKzM5Niw3IEBAIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6Z2V0U3VwcG9ydGVkRXh0ZW5zaW9uc0Nh bGxiYWNrKGNvCiAgICAgSU5DX1NUQVRTKCJET00uV2ViR0xSZW5kZXJpbmdDb250ZXh0LmdldFN1 cHBvcnRlZEV4dGVuc2lvbnNDYWxsYmFjaygpIik7CiAgICAgV2ViR0xSZW5kZXJpbmdDb250ZXh0 KiBpbXAgPSBWOFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSk7 CiAgICAgaWYgKGltcC0+aXNDb250ZXh0TG9zdCgpKQotICAgICAgICByZXR1cm4gdjg6Ok51bGwo YXJncy5HZXRJc29sYXRlKCkpOworICAgICAgICByZXR1cm4gdjhOdWxsKGFyZ3MuR2V0SXNvbGF0 ZSgpKTsKIAogICAgIFZlY3RvcjxTdHJpbmc+IHZhbHVlID0gaW1wLT5nZXRTdXBwb3J0ZWRFeHRl bnNpb25zKCk7CiAgICAgdjg6OkxvY2FsPHY4OjpBcnJheT4gYXJyYXkgPSB2ODo6QXJyYXk6Ok5l dyh2YWx1ZS5zaXplKCkpOwo=