274178 2024-05-14 12:59:11 -0700 AX: ActiveElementChanged notifications for combobox should target the combobox in question, not its controlled or owned element. 2024-05-16 04:45:45 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni dm_mazzoni ews-watchlist jcraig samuel_white tyler_w webkit-bug-importer oldest_to_newest 2035342 0 andresg_22 2024-05-14 12:59:11 -0700 . 2035343 1 webkit-bug-importer 2024-05-14 12:59:22 -0700 <rdar://problem/128083384> 2035346 2 471405 andresg_22 2024-05-14 13:02:10 -0700 Created attachment 471405 Patch 2035543 3 471414 andresg_22 2024-05-15 06:49:51 -0700 Created attachment 471414 Patch 2035583 4 471416 andresg_22 2024-05-15 10:58:45 -0700 Created attachment 471416 Patch 2035653 5 471416 dm_mazzoni 2024-05-15 15:46:00 -0700 Comment on attachment 471416 Patch I think this will be a very worthwhile simplification! 2035667 6 ews-feeder 2024-05-15 16:59:34 -0700 dm_mazzoni@apple.com does not have reviewer permissions according to https://raw.githubusercontent.com/WebKit/WebKit/main/metadata/contributors.json. Rejecting attachment 471416 from commit queue. 2035670 7 tyler_w 2024-05-15 17:31:41 -0700 Thanks for reviewing this Dominic! It looks good to me too, I'll remove your r+ so I can add my own to make EWS happy. 2035748 8 ews-feeder 2024-05-16 04:45:43 -0700 Committed 278858@main (62d20f512eb9): <https://commits.webkit.org/278858@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 471416. 471405 2024-05-14 13:02:10 -0700 2024-05-15 06:49:48 -0700 Patch bug-274178-20240514160209.patch text/plain 19778 andresg_22 RnJvbSA4Zjk1ODg4Zjg5ZTI0ZmVhYmJjYmU2Nzg2MmM0YmM2YzllYWI3M2VkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDE0IE1heSAyMDI0IDE0OjMzOjEyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbnMgZm9yIGNvbWJvYm94IHNob3Vs ZAogdGFyZ2V0IHRoZSBjb21ib2JveCBpbiBxdWVzdGlvbiwgbm90IGl0cyBjb250cm9sbGVkIG9y IG93bmVkIGVsZW1lbnQuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjc0MTc4IDxyZGFyOi8vcHJvYmxlbS8xMjgwODMzODQ+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KClVudGlsIG5vdywgaWYgYSBjb21ib2JveCBjb250cm9sbGVkIG9yIG93bmVkIGFub3Ro ZXIgZWxlbWVudCwgd2UgaW1wb3NlZCB0aGUgcnVsZSB0aGF0IHRoZSB0YXJnZXQgb2YgdGhlIEFj dGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbiBzaG91bGQgYmUgdGhlIGNvbnRyb2xsZWQg b3Igb3duZWQgZWxlbWVudCwgdHlwaWNhbGx5IGEgbGlzdCwgbGlzdGJveCwgdHJlZSBvciBncmlk LiBUaGlzIHJ1bGUgaXMgdW5uZWNlc3NhcnkgYW5kIGFkZHMgc2lnbmlmaWNhbnQgY29tcGxleGl0 eSB0byB0aGUgaGFuZGxpbmcgb2YgdGhlc2UgY2hhbmdlcy4gRnVydGhlcm1vcmUsIHRoaXMgaXMg dGhlIHJvb3QgY2F1c2Ugb2YgcHJvYmxlbXMgaW4gY29tYm9ib3hlcyBsaWtlIHRoZSBzZWFyY2gg ZmllbGQgaW4gZ29vZ2xlLmNvbS4gVGhpcyBwYXRjaCBlbGltaW5hdGVzIHRoaXMgcnVsZSBhbmQg c2ltcGxpZmllcyB0aGUgY29kZSBhcm91bmQgY29tYm9ib3ggQWN0aXZlRWxlbWVudENoYW5nZWQg bm90aWZpY2F0aW9ucy4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlh LWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVt ZW50cy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21i b2JveC1uby1vd25zLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Nv bWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3ducy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvY29tYm9ib3gvbWFjL2NvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9u cy5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcDoK KFdlYkNvcmU6OkFYQ29yZU9iamVjdDo6YWN0aXZlRGVzY2VuZGFudCBjb25zdCk6CihXZWJDb3Jl OjpBWENvcmVPYmplY3Q6OmNhbkJlQ29udHJvbGxlZEJ5IGNvbnN0KTogRGVsZXRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oOgoqIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hl OjpoYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tOgooV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6 cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKToKLS0tCiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L0FYQ29yZU9iamVjdC5jcHAgfCAzOSAtLS0tLS0tLS0tLS0tLS0KIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmggICB8ICAxIC0KIC4uLi9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgICB8IDM1ICsrKystLS0tLS0tLS0tCiAuLi4vYWNj ZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbSAgICAgfCAgNSArLQogLi4ub21ib2Jv eC1jb250cm9sLW93bnMtZWxlbWVudHMtZXhwZWN0ZWQudHh0IHwgMTYgKysrLS0tLQogLi4uL2Fy aWEtY29tYm9ib3gtY29udHJvbC1vd25zLWVsZW1lbnRzLmh0bWwgIHwgMTYgKysrLS0tLQogLi4u L2FyaWEtY29tYm9ib3gtbm8tb3ducy1leHBlY3RlZC50eHQgICAgICAgIHwgIDIgKy0KIC4uLi9j b21ib2JveC9hcmlhLWNvbWJvYm94LW5vLW93bnMuaHRtbCAgICAgICB8ICA2ICstLQogLi4ubWJv Ym94LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9ucy5odG1sIHwgNDcgKysrKysrKysrLS0t LS0tLS0tLQogOSBmaWxlcyBjaGFuZ2VkLCA1MyBpbnNlcnRpb25zKCspLCAxMTQgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWENvcmVPYmpl Y3QuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuY3BwCmlu ZGV4IDBmOWUwNWUzMTgyMS4uYWNhNGY0Yzk1ZTMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuY3BwCkBAIC0zNjMsNDggKzM2Myw5IEBAIEFYQ29yZU9i amVjdCogQVhDb3JlT2JqZWN0OjphY3RpdmVEZXNjZW5kYW50KCkgY29uc3QKICAgICBBU1NFUlQo YWN0aXZlRGVzY2VuZGFudHMuc2l6ZSgpIDw9IDEpOwogICAgIGlmICghYWN0aXZlRGVzY2VuZGFu dHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gYWN0aXZlRGVzY2VuZGFudHNbMF0uZ2V0KCk7 Ci0KLSAgICAvLyBXaGVuIHRoZSBhY3RpdmUgZGVzY2VuZGFudCBjaGFuZ2VzIGZvciBhIGNvbWJv Ym94LCB0aGUgdGFyZ2V0Ci0gICAgLy8gb2YgdGhlIG5vdGlmaWNhdGlvbiBpcyB0aGUgb3duZWQg b3IgY29udHJvbGxlZCBlbGVtZW50IG9mIHRoZSBjb21ib2JveAotICAgIC8vIGlmIGV4aXN0cywg bW9zdCBjb21tb25seSBhIGxpc3Qgb3IgbGlzdGJveCAoc2VlZSBBWE9iamVjdENhY2hlOjpoYW5k bGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlKS4KLSAgICAvLyBUaHVzLCBhIGNsaWVudCBjb3VsZCBy ZXF1ZXN0IHRoZSBuZXcgYWN0aXZlIGRlc2NlbmRhbnQgZnJvbSB0aGUgbGlzdCBvcgotICAgIC8v IGxpc3Rib3guIFRvIHN1cHBvcnQgdGhpcyBzY2VuYXJpbywgd2UgdHJ5IHRvIGdldCB0aGUgY29u dHJvbGxlciBvciBvd25lcgotICAgIC8vIGNvbWJvYm94IGlmIGV4aXN0cyBhbmQgcmV0dXJuIGl0 cyBhY3RpdmUgZGVzY2VuZGFudC4KLSAgICBpZiAoY2FuQmVDb250cm9sbGVkQnkoQWNjZXNzaWJp bGl0eVJvbGU6OkNvbWJvQm94KSkgewotICAgICAgICBhdXRvIGNvbnRyb2xsZXJzID0gdGhpcy0+ Y29udHJvbGxlcnMoKTsKLSAgICAgICAgaWYgKGNvbnRyb2xsZXJzLmlzRW1wdHkoKSkKLSAgICAg ICAgICAgIGNvbnRyb2xsZXJzID0gb3duZXJzKCk7Ci0gICAgICAgIGlmIChjb250cm9sbGVycy5p c0VtcHR5KCkpCi0gICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKLQotICAgICAgICBhdXRvIGNv bWJvYm94ID0gc3RkOjpmaW5kX2lmKGNvbnRyb2xsZXJzLmJlZ2luKCksIGNvbnRyb2xsZXJzLmVu ZCgpLCBbXSAoY29uc3QgYXV0byYgb2JqZWN0KSB7Ci0gICAgICAgICAgICByZXR1cm4gb2JqZWN0 LT5pc0NvbWJvQm94KCk7Ci0gICAgICAgIH0pOwotICAgICAgICBpZiAoY29tYm9ib3ggIT0gY29u dHJvbGxlcnMuZW5kKCkpCi0gICAgICAgICAgICByZXR1cm4gKCpjb21ib2JveCktPmFjdGl2ZURl c2NlbmRhbnQoKTsKLSAgICB9Ci0KICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotYm9vbCBBWENv cmVPYmplY3Q6OmNhbkJlQ29udHJvbGxlZEJ5KEFjY2Vzc2liaWxpdHlSb2xlIGNvbnRyb2xsZXJS b2xlKSBjb25zdAotewotICAgIGlmIChjb250cm9sbGVyUm9sZSA9PSBBY2Nlc3NpYmlsaXR5Um9s ZTo6Q29tYm9Cb3gpIHsKLSAgICAgICAgc3dpdGNoIChyb2xlVmFsdWUoKSkgewotICAgICAgICBj YXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpHcmlkOgotICAgICAgICBjYXNlIEFjY2Vzc2liaWxpdHlS b2xlOjpMaXN0OgotICAgICAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpMaXN0Qm94OgotICAg ICAgICBjYXNlIEFjY2Vzc2liaWxpdHlSb2xlOjpUcmVlOgotICAgICAgICBjYXNlIEFjY2Vzc2li aWxpdHlSb2xlOjpUcmVlR3JpZDoKLSAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICBk ZWZhdWx0OgotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICB9Ci0gICAgfQotICAg IC8vIEZJWE1FOiBhZGQgb3RoZXIgcmVzdHJpY3Rpb25zLgotICAgIHJldHVybiB0cnVlOwotfQot CiBBWENvcmVPYmplY3Q6OkFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBBWENvcmVPYmplY3Q6 OnNlbGVjdGVkQ2VsbHMoKQogewogICAgIGlmICghaXNUYWJsZSgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmgKaW5kZXggM2QwYzEwODlhYjE3Li41NTBiMTQ3 MDdiYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2Jq ZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuaApA QCAtMTA1Niw3ICsxMDU2LDYgQEAgcHVibGljOgogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZl Y3RvciBvd25lZE9iamVjdHMoKSBjb25zdCB7IHJldHVybiByZWxhdGVkT2JqZWN0cyhBWFJlbGF0 aW9uVHlwZTo6T3duZXJGb3IpOyB9CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIG93 bmVycygpIGNvbnN0IHsgcmV0dXJuIHJlbGF0ZWRPYmplY3RzKEFYUmVsYXRpb25UeXBlOjpPd25l ZEJ5KTsgfQogICAgIHZpcnR1YWwgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIHJlbGF0ZWRP YmplY3RzKEFYUmVsYXRpb25UeXBlKSBjb25zdCA9IDA7Ci0gICAgYm9vbCBjYW5CZUNvbnRyb2xs ZWRCeShBY2Nlc3NpYmlsaXR5Um9sZSkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIEFYQ29yZU9iamVj dCogaW50ZXJuYWxMaW5rRWxlbWVudCgpIGNvbnN0ID0gMDsKICAgICB2b2lkIGFwcGVuZFJhZGlv QnV0dG9uR3JvdXBNZW1iZXJzKEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciYgbGlua2VkVUlF bGVtZW50cykgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVj dENhY2hlLmNwcAppbmRleCBhZjgzNjdmNWE3YjAuLmZhY2U5YjlhYmUyNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCkBAIC0yMzcwLDI2ICsy MzcwLDIwIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFuZGxlQWN0aXZlRGVzY2VuZGFudENoYW5n ZShFbGVtZW50JiBlbGVtZW50LCBjb25zdCBBdG9tU3RyCiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKLSAgICAvLyBIYW5kbGUgYWN0aXZlLWRlc2NlbmRhbnQgY2hhbmdlcyB3aGVuIHRoZSB0YXJn ZXQgYWxsb3dzIGZvciBpdCwgb3IgdGhlIGNvbnRyb2xsZWQgb2JqZWN0IGFsbG93cyBmb3IgaXQu Ci0gICAgUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+IHRhcmdldDsKICAgICBpZiAob2JqZWN0 LT5zaG91bGRGb2N1c0FjdGl2ZURlc2NlbmRhbnQoKSkgewogI2lmIEVOQUJMRShBQ0NFU1NJQklM SVRZX0lTT0xBVEVEX1RSRUUpCiAgICAgICAgIHNldElzb2xhdGVkVHJlZUZvY3VzZWRPYmplY3Qo YWN0aXZlRGVzY2VuZGFudC5nZXQoKSk7CiAjZW5kaWYKLSAgICAgICAgdGFyZ2V0ID0gb2JqZWN0 OwotICAgIH0gZWxzZSBpZiAob2JqZWN0LT5pc0NvbWJvQm94KCkpIHsKLSAgICAgICAgLy8gSWYg dGhlIGNvbWJvYm94J3MgYWN0aXZlRGVzY2VuZGFudCBpcyBpbnNpZGUgYSBkZXNjZW5kYW50IG93 bmVkIG9yIGNvbnRyb2xsZWQgYnkgdGhlIGNvbWJvYm94LCB0aGF0IGRlc2NlbmRhbnQgc2hvdWxk IGJlIHRoZSB0YXJnZXQgb2YgdGhlIG5vdGlmaWNhdGlvbiBhbmQgbm90IHRoZSBjb21ib2JveCBp dHNlbGYuCi0gICAgICAgIGlmIChhdXRvKiBvd25lZE9iamVjdCA9IEFjY2Vzc2liaWxpdHk6OmZp bmRSZWxhdGVkT2JqZWN0SW5BbmNlc3RyeSgqb2JqZWN0LCBBWFJlbGF0aW9uVHlwZTo6T3duZXJG b3IsICphY3RpdmVEZXNjZW5kYW50KSkKLSAgICAgICAgICAgIHRhcmdldCA9IG93bmVkT2JqZWN0 OwotICAgICAgICBlbHNlIGlmIChhdXRvKiBjb250cm9sbGVkT2JqZWN0ID0gQWNjZXNzaWJpbGl0 eTo6ZmluZFJlbGF0ZWRPYmplY3RJbkFuY2VzdHJ5KCpvYmplY3QsIEFYUmVsYXRpb25UeXBlOjpD b250cm9sbGVyRm9yLCAqYWN0aXZlRGVzY2VuZGFudCkpCi0gICAgICAgICAgICB0YXJnZXQgPSBj b250cm9sbGVkT2JqZWN0OwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0YXJnZXQgPSBvYmpl Y3Q7Ci0gICAgfSBlbHNlIGlmIChvYmplY3QtPnN1cHBvcnRzQWN0aXZlRGVzY2VuZGFudCgpKQor ICAgICAgICBwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oKmFjdGl2ZURlc2NlbmRhbnQsIEFYTm90 aWZpY2F0aW9uOjpBWEZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKTsKKyAgICB9CisKKyAgICAvLyBI YW5kbGUgYWN0aXZlLWRlc2NlbmRhbnQgY2hhbmdlcyB3aGVuIHRoZSB0YXJnZXQgYWxsb3dzIGZv ciBpdCwgb3IgdGhlIGNvbnRyb2xsZWQgb2JqZWN0IGFsbG93cyBmb3IgaXQuCisgICAgUmVmUHRy PEFjY2Vzc2liaWxpdHlPYmplY3Q+IHRhcmdldDsKKyAgICBpZiAob2JqZWN0LT5zdXBwb3J0c0Fj dGl2ZURlc2NlbmRhbnQoKSkKICAgICAgICAgdGFyZ2V0ID0gb2JqZWN0OwogICAgIGVsc2Ugewot ICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhlIGFjdGl2ZSBkZXNjZW5kYW50IGlzIGEgY2hp bGQgb2YgdGhlIGNvbnRyb2xsZWQgb2JqZWN0LiBUaGVuIHdlIGhhdmUgdG8gdXNlIHRoYXQKLSAg ICAgICAgLy8gY29udHJvbGxlZCBvYmplY3QgYXMgdGhlIHRhcmdldCB3ZSB1c2UgaW4gbm90aWZp Y2F0aW9ucy4KKyAgICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHRoZSBhY3RpdmUgZGVzY2VuZGFu dCBpcyBhIGRlc2NlbmRhbnQgb2YgYW4gb2JqZWN0IGNvbnRyb2xsZWQgYnkgdGhpcyBvYmplY3Qu CisgICAgICAgIC8vIEluIHRoYXQgY2FzZSwgdGhlIGNvbnRyb2xsZWQgb2JqZWN0IHdpbGwgYmUg dGhlIHRhcmdldCBmb3IgdGhlIG5vdGlmaWNhdGlvbi4KICAgICAgICAgYXV0byBjb250cm9sbGVk T2JqZWN0cyA9IG9iamVjdC0+cmVsYXRlZE9iamVjdHMoQVhSZWxhdGlvblR5cGU6OkNvbnRyb2xs ZXJGb3IpOwogICAgICAgICBpZiAoY29udHJvbGxlZE9iamVjdHMuc2l6ZSgpKSB7CiAgICAgICAg ICAgICB0YXJnZXQgPSBBY2Nlc3NpYmlsaXR5OjpmaW5kQW5jZXN0b3IoKmFjdGl2ZURlc2NlbmRh bnQsIGZhbHNlLCBbJmNvbnRyb2xsZWRPYmplY3RzXSAoY29uc3QgYXV0byYgYWN0aXZlRGVzY2Vu ZGFudEFuY2VzdG9yKSB7CkBAIC0yNDAxLDIxICsyMzk1LDEwIEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6aGFuZGxlQWN0aXZlRGVzY2VuZGFudENoYW5nZShFbGVtZW50JiBlbGVtZW50LCBjb25zdCBB dG9tU3RyCiAgICAgaWYgKCF0YXJnZXQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICh0YXJn ZXQgPT0gb2JqZWN0KSB7Ci0gICAgICAgIGlmICh0YXJnZXQtPmlzQ29tYm9Cb3goKSkgewotICAg ICAgICAgICAgLy8gVGhlIGNvbWJvYm94IGRvZXMgbm90IG93biBvciBjb250cm9sIHRoZSBlbGVt ZW50IHRvIHdoaWNoIGFjdGl2ZURlc2NlbmRhbnQgYmVsb25ncy4KLSAgICAgICAgICAgIC8vIEVz dGFibGlzaCB0aGlzIGltcGxpY2l0IHJlbGF0aW9uc2hpcC4KLSAgICAgICAgICAgIFJlZlB0ciBj b250cm9sbGVkID0gQWNjZXNzaWJpbGl0eTo6ZmluZEFuY2VzdG9yKCphY3RpdmVEZXNjZW5kYW50 LCBmYWxzZSwgW10gKGNvbnN0IGF1dG8mIGFuY2VzdG9yKSB7Ci0gICAgICAgICAgICAgICAgcmV0 dXJuIGFuY2VzdG9yLmNhbkJlQ29udHJvbGxlZEJ5KEFjY2Vzc2liaWxpdHlSb2xlOjpDb21ib0Jv eCk7Ci0gICAgICAgICAgICB9KTsKLSAgICAgICAgICAgIGlmIChjb250cm9sbGVkKQotICAgICAg ICAgICAgICAgIGFkZFJlbGF0aW9uKHRhcmdldC5nZXQoKSwgY29udHJvbGxlZC5nZXQoKSwgQVhS ZWxhdGlvblR5cGU6OkNvbnRyb2xsZXJGb3IpOwotICAgICAgICB9Ci0gICAgfSBlbHNlIHsKICNp ZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIGlmICh0YXJnZXQgIT0g b2JqZWN0KQogICAgICAgICB1cGRhdGVJc29sYXRlZFRyZWUodGFyZ2V0LmdldCgpLCBBWE5vdGlm aWNhdGlvbjo6QVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZCk7CiAjZW5kaWYKLSAgICB9CiAKICAg ICBwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oKnRhcmdldCwgQVhOb3RpZmljYXRpb246OkFYQWN0 aXZlRGVzY2VuZGFudENoYW5nZWQpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQppbmRleCBhNGRjMGQ0NGNhNmYuLjYwMjJm MWVjOTEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhP YmplY3RDYWNoZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9B WE9iamVjdENhY2hlTWFjLm1tCkBAIC0zMjgsMTAgKzMyOCw3IEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFjY2Vzc2liaWxpdHlPYmplY3QmIG9iamVjdCwg QVhOb3RpCiAgICAgTlNTdHJpbmcgKm1hY05vdGlmaWNhdGlvbjsKICAgICBzd2l0Y2ggKG5vdGlm aWNhdGlvbikgewogICAgIGNhc2UgQVhBY3RpdmVEZXNjZW5kYW50Q2hhbmdlZDoKLSAgICAgICAg aWYgKG9iamVjdC5pc0NvbWJvQm94KCkgfHwgb2JqZWN0LmNhbkJlQ29udHJvbGxlZEJ5KEFjY2Vz c2liaWxpdHlSb2xlOjpDb21ib0JveCkpCi0gICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBA IkFYQWN0aXZlRWxlbWVudENoYW5nZWQiOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBtYWNO b3RpZmljYXRpb24gPSBOU0FjY2Vzc2liaWxpdHlGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZE5vdGlm aWNhdGlvbjsKKyAgICAgICAgbWFjTm90aWZpY2F0aW9uID0gQCJBWEFjdGl2ZUVsZW1lbnRDaGFu Z2VkIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWEF1dG9jb3JyZWN0aW9uT2NjdXJlZDoK ICAgICAgICAgbWFjTm90aWZpY2F0aW9uID0gQCJBWEF1dG9jb3JyZWN0aW9uT2NjdXJyZWQiOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJv Ym94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtY29udHJvbC1vd25zLWVsZW1lbnRzLWV4 cGVjdGVkLnR4dAppbmRleCA5Y2M4ZmRkYzU1NjkuLjA0NDY2N2VlYWQyYiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wt b3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50 eHQKQEAgLTEsMTMgKzEsMTMgQEAKIFRoaXMgdGVzdHMgdmFyaWF0aW9ucyBvZiB0aGUgY29tYm9i b3hlcyBhbmQgZWxlbWVudHMgaXQgY2FuIGNvbnRyb2wgYW5kIG93bi4gVGhlbiB2ZXJpZmllcyB0 aGUgYWN0aXZlLWRlc2NlbmRhbnQgaXMgcmVmbGVjdGVkIGNvcnJlY3RseS4KIAotUmVjZWl2ZWQg bm90aWZpY2F0aW9uIGZvciBMaXN0MQotUEFTUzogbGlzdC5hY3RpdmVFbGVtZW50LmlzRXF1YWwo bGlzdGl0ZW0xKSA9PT0gdHJ1ZQotUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBMaXN0Ym94Mgot UEFTUzogbGlzdGJveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwob3B0aW9uMl8xKSA9PT0gdHJ1ZQot UmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBHcmlkMwotUEFTUzogZ3JpZC5hY3RpdmVFbGVtZW50 LmlzRXF1YWwocm93M18xKSA9PT0gdHJ1ZQotUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBUcmVl NAotUEFTUzogdHJlZS5hY3RpdmVFbGVtZW50LmlzRXF1YWwodHJlZWl0ZW00XzEpID09PSB0cnVl CitSZWNlaXZlZCBub3RpZmljYXRpb24gZm9yIENvbWJvYm94MQorUEFTUzogY29tYm9ib3guYWN0 aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkgPT09IHRydWUKK1JlY2VpdmVkIG5vdGlmaWNh dGlvbiBmb3IgQ29tYm9ib3gyCitQQVNTOiBjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwo b3B0aW9uMl8xKSA9PT0gdHJ1ZQorUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBDb21ib2JveDMK K1BBU1M6IGNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChyb3czXzEpID09PSB0cnVlCitS ZWNlaXZlZCBub3RpZmljYXRpb24gZm9yIENvbWJvYm94NAorUEFTUzogY29tYm9ib3guYWN0aXZl RWxlbWVudC5pc0VxdWFsKHRyZWVpdGVtNF8xKSA9PT0gdHJ1ZQogCiBQQVNTIHN1Y2Nlc3NmdWxs eVBhcnNlZCBpcyB0cnVlCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv Y29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMuaHRtbCBiL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93bnMt ZWxlbWVudHMuaHRtbAppbmRleCBmN2JkYTk4Y2E3ZjEuLjQyOGY5OTI5MTZmNSAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRy b2wtb3ducy1lbGVtZW50cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29t Ym9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMuaHRtbApAQCAtNTEsNDUg KzUxLDQ1IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKIAogICAgIC8v IEV4YW1wbGUgMTogYXJpYS1jb250cm9scyBhIGxpc3QuCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVu dEJ5SWQoImNvbWJvYm94MSIpLmZvY3VzKCk7Ci0gICAgbGlzdCA9IGFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgibGlzdDEiKTsKKyAgICBjb21ib2JveCA9IGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY29tYm9ib3gxIik7 CiAgICAgLy8gU2V0IGFjdGl2ZS1kZXNjZW5kYW50LCB2ZXJpZnkgbm90aWZpY2F0aW9uIGlzIHNl bnQgYW5kIHRoYXQgbGlzdCBoYXMgY29ycmVjdCBhY3RpdmUgZWxlbWVudC4KICAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3gxIikuc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRl c2NlbmRhbnQiLCAiaXRlbTFfMSIpOwogICAgIHNldFRpbWVvdXQoYXN5bmMgKCkgPT4gewogICAg ICAgICBsaXN0aXRlbTEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVu dEJ5SWQoIml0ZW0xXzEiKTsKLSAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgibGlzdC5hY3RpdmVF bGVtZW50LmlzRXF1YWwobGlzdGl0ZW0xKSIsICJ0cnVlIik7CisgICAgICAgIG91dHB1dCArPSBl eHBlY3QoImNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChsaXN0aXRlbTEpIiwgInRydWUi KTsKIAogICAgICAgICAvLyBFeGFtcGxlIDI6IGFyaWEtb3ducyBhIGxpc3Rib3guCiAgICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveDIiKS5mb2N1cygpOwotICAgICAgICBs aXN0Ym94ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJs aXN0Ym94MiIpOworICAgICAgICBjb21ib2JveCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFj Y2Vzc2libGVFbGVtZW50QnlJZCgiY29tYm9ib3gyIik7CiAgICAgICAgIC8vIFNldCBhY3RpdmUt ZGVzY2VuZGFudCwgdmVyaWZ5IG5vdGlmaWNhdGlvbiBpcyBzZW50IGFuZCB0aGF0IGxpc3QgaGFz IGNvcnJlY3QgYWN0aXZlIGVsZW1lbnQuCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlk KCJjb21ib2JveDIiKS5zZXRBdHRyaWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIsICJvcHRp b24yXzEiKTsKICAgICAgICAgb3B0aW9uMl8xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNj ZXNzaWJsZUVsZW1lbnRCeUlkKCJvcHRpb24yXzEiKTsKICAgICAgICAgYXdhaXQgd2FpdEZvcigo KSA9PiB7CiAgICAgICAgICAgICByZXR1cm4gYWN0aXZlRWxlbWVudENoYW5nZUNvdW50ID09IDI7 CiAgICAgICAgIH0pOwotICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJsaXN0Ym94LmFjdGl2ZUVs ZW1lbnQuaXNFcXVhbChvcHRpb24yXzEpIiwgInRydWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4 cGVjdCgiY29tYm9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKG9wdGlvbjJfMSkiLCAidHJ1ZSIp OwogCiAgICAgICAgIC8vIEV4YW1wbGUgMzogYXJpYS1vd25zIGEgZ3JpZC4KICAgICAgICAgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94MyIpLmZvY3VzKCk7Ci0gICAgICAgIGdyaWQg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImdyaWQzIik7 CisgICAgICAgIGNvbWJvYm94ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVs ZW1lbnRCeUlkKCJjb21ib2JveDMiKTsKICAgICAgICAgLy8gU2V0IGFjdGl2ZS1kZXNjZW5kYW50 LCB2ZXJpZnkgbm90aWZpY2F0aW9uIGlzIHNlbnQgYW5kIHRoYXQgbGlzdCBoYXMgY29ycmVjdCBh Y3RpdmUgZWxlbWVudC4KICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94 MyIpLnNldEF0dHJpYnV0ZSgiYXJpYS1hY3RpdmVkZXNjZW5kYW50IiwgInJvdzNfMSIpOwogICAg ICAgICByb3czXzEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5 SWQoInJvdzNfMSIpOwogICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKICAgICAgICAgICAg IHJldHVybiBhY3RpdmVFbGVtZW50Q2hhbmdlQ291bnQgPT0gMzsKICAgICAgICAgfSk7Ci0gICAg ICAgIG91dHB1dCArPSBleHBlY3QoImdyaWQuYWN0aXZlRWxlbWVudC5pc0VxdWFsKHJvdzNfMSki LCAidHJ1ZSIpOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJjb21ib2JveC5hY3RpdmVFbGVt ZW50LmlzRXF1YWwocm93M18xKSIsICJ0cnVlIik7CiAKICAgICAgICAgLy8gRXhhbXBsZSA0OiBh cmlhLW93bnMgYSB0cmVlLgogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9i b3g0IikuZm9jdXMoKTsKLSAgICAgICAgdHJlZSA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFj Y2Vzc2libGVFbGVtZW50QnlJZCgidHJlZTQiKTsKKyAgICAgICAgY29tYm9ib3ggPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNvbWJvYm94NCIpOwogICAg ICAgICAvLyBTZXQgYWN0aXZlLWRlc2NlbmRhbnQsIHZlcmlmeSBub3RpZmljYXRpb24gaXMgc2Vu dCBhbmQgdGhhdCB0cmVlIGhhcyBjb3JyZWN0IGFjdGl2ZSBkZXNjZW5kYW50LgogICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3g0Iikuc2V0QXR0cmlidXRlKCJhcmlhLWFj dGl2ZWRlc2NlbmRhbnQiLCAidHJlZWl0ZW00XzEiKTsKICAgICAgICAgdHJlZWl0ZW00XzEgPSBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRyZWVpdGVtNF8x Iik7CiAgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4gewogICAgICAgICAgICAgcmV0dXJuIGFj dGl2ZUVsZW1lbnRDaGFuZ2VDb3VudCA9PSA0OwogICAgICAgICB9KTsKLSAgICAgICAgb3V0cHV0 ICs9IGV4cGVjdCgidHJlZS5hY3RpdmVFbGVtZW50LmlzRXF1YWwodHJlZWl0ZW00XzEpIiwgInRy dWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgiY29tYm9ib3guYWN0aXZlRWxlbWVudC5p c0VxdWFsKHRyZWVpdGVtNF8xKSIsICJ0cnVlIik7CiAKICAgICAgICAgYWNjZXNzaWJpbGl0eUNv bnRyb2xsZXIucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKICAgICAgICAgZGVidWcob3V0 cHV0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJp YS1jb21ib2JveC1uby1vd25zLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxp dHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLWV4cGVjdGVkLnR4dAppbmRleCBjNjEy ZmZjZDNiYzUuLmRkOGI4ZThiOTNmMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJp bGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LW5vLW93bnMtZXhwZWN0ZWQudHh0CisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLWV4 cGVjdGVkLnR4dApAQCAtMSw2ICsxLDYgQEAKIEEgY29tYm9ib3ggc2hvdWxkIHN0aWxsIHN1cHBv cnQgYXJpYS1hY3RpdmVkZXNjZW5kYW50IGV2ZW4gaWYgaXQgZG9lc24ndCB1c2UgYXJpYS1vd25z LgogUmVjZWl2ZWQgQVhBY3RpdmVFbGVtZW50Q2hhbmdlZCBmb3IgQ29tYm9ib3gKLVBBU1M6IGxp c3QuYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkgPT09IHRydWUKK1BBU1M6IGNvbWJv Ym94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChsaXN0aXRlbTEpID09PSB0cnVlCiAKIFBBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LW5vLW93bnMuaHRtbCBiL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLmh0bWwKaW5kZXgg NzdjNTg5MGIxNmE5Li4yNGRmZTlkY2UxYTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LW5vLW93bnMuaHRtbApA QCAtMjcsMTcgKzI3LDE3IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsK ICAgICB9KTsKIAogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveCIpLmZvY3Vz KCk7Ci0gICAgdmFyIGxpc3QgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxl bWVudEJ5SWQoImxpc3QiKTsKKyAgICB2YXIgY29tYm9ib3ggPSBhY2Nlc3NpYmlsaXR5Q29udHJv bGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNvbWJvYm94Iik7CiAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNvbWJvYm94Iikuc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRh bnQiLCAiaXRlbTEiKTsKICAgICB2YXIgbGlzdGl0ZW0xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJpdGVtMSIpOwogICAgIHNldFRpbWVvdXQoYXN5bmMg ZnVuY3Rpb24oKSB7CiAgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4gewogICAgICAgICAgICAg cmV0dXJuIGFjdGl2ZUVsZW1lbnRDaGFuZ2VDb3VudDsKICAgICAgICAgfSk7Ci0gICAgICAgIG91 dHB1dCArPSBleHBlY3QoImxpc3QuYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkiLCAi dHJ1ZSIpOworICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJjb21ib2JveC5hY3RpdmVFbGVtZW50 LmlzRXF1YWwobGlzdGl0ZW0xKSIsICJ0cnVlIik7CiAKLSAgICAgICAgZGVidWcob3V0cHV0KTsK ICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVu ZXIoKTsKKyAgICAgICAgZGVidWcob3V0cHV0KTsKICAgICAgICAgZmluaXNoSlNUZXN0KCk7CiAg ICAgfSwgMCk7CiB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJv Ym94L21hYy9jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNhdGlvbnMuaHRtbCBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvbWFjL2NvbWJvYm94LWFjdGl2ZWRlc2Nl bmRhbnQtbm90aWZpY2F0aW9ucy5odG1sCmluZGV4IGIzMzBhZjYwNjRlOC4uMThlMzgwYTczMjQz IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L21hYy9jb21i b2JveC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNhdGlvbnMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L21hYy9jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50LW5v dGlmaWNhdGlvbnMuaHRtbApAQCAtOSwzOSArOSwzOCBAQAogPGRpdiBpZD0iY29udGVudCI+CiA8 aW5wdXQgdHlwZT0idGV4dCIgcm9sZT0iY29tYm9ib3giIGlkPSJjb21ibyIgYXJpYS1vd25zPSJs aXN0Ij4KIDx1bCBpZD0ibGlzdCIgcm9sZT0ibGlzdGJveCI+Ci08bGkgdGFiaW5kZXg9IjAiIHJv bGU9Im9wdGlvbiIgaWQ9Iml0ZW0xIj5pdGVtMTwvbGk+CisgICAgPGxpIHRhYmluZGV4PSIwIiBy b2xlPSJvcHRpb24iIGlkPSJpdGVtMSI+aXRlbTE8L2xpPgogPC91bD4KIDwvZGl2PgogCiA8c2Ny aXB0PgotICAgIGxldCBvdXRwdXQgPSAiVGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBhbiBBUklB IGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZSBkb2VzIG5vdCBjaGFuZ2UgZm9jdXMsIGJlY2F1c2Ug Zm9jdXMgc2hvdWxkIHJlbWFpbiBpbiB0aGUgdGV4dGZpZWxkIHBvcnRpb24gb2YgdGhlIGNvbWJv IGJveC5cblxuIjsKK2xldCBvdXRwdXQgPSAiVGhpcyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBhbiBB UklBIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZSBkb2VzIG5vdCBjaGFuZ2UgZm9jdXMsIGJlY2F1 c2UgZm9jdXMgc2hvdWxkIHJlbWFpbiBpbiB0aGUgdGV4dGZpZWxkIHBvcnRpb24gb2YgdGhlIGNv bWJvIGJveC5cblxuIjsKIAotICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lciAmJiB3aW5kb3cuYWNj ZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKLSAgICAgICAganNUZXN0SXNBc3luYyA9IHRydWU7Citp ZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CisgICAgd2luZG93LmpzVGVzdElz QXN5bmMgPSB0cnVlOwogCi0gICAgICAgIGNvbWJvLmZvY3VzKCk7Ci0gICAgICAgIHZhciBheENv bWJvID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjb21i byIpOwotICAgICAgICBvdXRwdXQgKz0gIlRoZSBDb21ib0JveCBzaG91bGQgc3RhcnQgb3V0IGFz IHRoZSBmb2N1c2VkIGVsZW1lbnQuXG4iOwotICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJheENv bWJvLmlzRXF1YWwoYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQpIiwgInRy dWUiKTsKKyAgICBjb21iby5mb2N1cygpOworICAgIHZhciBheENvbWJvID0gYWNjZXNzaWJpbGl0 eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjb21ibyIpOworICAgIG91dHB1dCAr PSAiVGhlIENvbWJvQm94IHNob3VsZCBzdGFydCBvdXQgYXMgdGhlIGZvY3VzZWQgZWxlbWVudC5c biI7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgiYXhDb21iby5pc0VxdWFsKGFjY2Vzc2liaWxpdHlD b250cm9sbGVyLmZvY3VzZWRFbGVtZW50KSIsICJ0cnVlIik7CiAKLSAgICAgICAgLy8gV2hlbiB0 aGUgYWN0aXZlIGRlc2NlbmRhbnQgY2hhbmdlcywgd2Ugc2hvdWxkIHJlY2VpdmUgYSBzZWxlY3Rl ZCBjaGlsZHJlbiBjaGFuZ2VkIG5vdGlmaWNhdGlvbi4KLSAgICAgICAgdmFyIGF4TGlzdCA9IGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgibGlzdCIpOwotICAg ICAgICBheExpc3QuYWRkTm90aWZpY2F0aW9uTGlzdGVuZXIoZnVuY3Rpb24obm90aWZpY2F0aW9u KSB7Ci0gICAgICAgICAgICBvdXRwdXQgKz0gYFJlY2VpdmVkIG5vdGlmaWNhdGlvbjogJHtub3Rp ZmljYXRpb259XG5gOwotICAgICAgICAgICAgaWYgKG5vdGlmaWNhdGlvbiA9PSAiQVhBY3RpdmVF bGVtZW50Q2hhbmdlZCIpIHsKLSAgICAgICAgICAgICAgICBvdXRwdXQgKz0gIlRoZSBDb21ib0Jv eCBzaG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgZWxlbWVudCBldmVuIGFmdGVyIHRoZSBhcmlh LWFjdGl2ZWRlc2NlbmRhbnQgd2FzIGNoYW5nZWQuXG4iOwotICAgICAgICAgICAgICAgIG91dHB1 dCArPSBleHBlY3QoImF4Q29tYm8uaXNFcXVhbChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1 c2VkRWxlbWVudCkiLCAidHJ1ZSIpOworICAgIC8vIFdoZW4gdGhlIGFjdGl2ZSBkZXNjZW5kYW50 IGNoYW5nZXMsIHdlIHNob3VsZCByZWNlaXZlIGEgc2VsZWN0ZWQgY2hpbGRyZW4gY2hhbmdlZCBu b3RpZmljYXRpb24uCisgICAgYXhDb21iby5hZGROb3RpZmljYXRpb25MaXN0ZW5lcigobm90aWZp Y2F0aW9uKSA9PiB7CisgICAgICAgIG91dHB1dCArPSBgUmVjZWl2ZWQgbm90aWZpY2F0aW9uOiAk e25vdGlmaWNhdGlvbn1cbmA7CisgICAgICAgIGlmIChub3RpZmljYXRpb24gPT0gIkFYQWN0aXZl RWxlbWVudENoYW5nZWQiKSB7CisgICAgICAgICAgICBvdXRwdXQgKz0gIlRoZSBDb21ib0JveCBz aG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgZWxlbWVudCBldmVuIGFmdGVyIHRoZSBhcmlhLWFj dGl2ZWRlc2NlbmRhbnQgd2FzIGNoYW5nZWQuXG4iOworICAgICAgICAgICAgb3V0cHV0ICs9IGV4 cGVjdCgiYXhDb21iby5pc0VxdWFsKGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVt ZW50KSIsICJ0cnVlIik7CiAKLSAgICAgICAgICAgICAgICBheExpc3QucmVtb3ZlTm90aWZpY2F0 aW9uTGlzdGVuZXIoKTsKLSAgICAgICAgICAgICAgICBjb250ZW50LnN0eWxlLnZpc2liaWxpdHkg PSAiaGlkZGVuIjsKLSAgICAgICAgICAgICAgICBkZWJ1ZyhvdXRwdXQpOwotICAgICAgICAgICAg ICAgIGZpbmlzaEpTVGVzdCgpOwotICAgICAgICAgICAgfQotICAgICAgICB9KTsKKyAgICAgICAg ICAgIGF4Q29tYm8ucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKKyAgICAgICAgICAgIGNv bnRlbnQuc3R5bGUudmlzaWJpbGl0eSA9ICJoaWRkZW4iOworICAgICAgICAgICAgZGVidWcob3V0 cHV0KTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICB9CisgICAgfSk7CiAK LSAgICAgICAgLy8gQWZ0ZXIgdGhlIGRlc2NlbmRhbnQgY2hhbmdlcywgdGhlIGNvbWJvIGJveCBz aG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgb2JqZWN0LgotICAgICAgICBjb21iby5zZXRBdHRy aWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIsICJpdGVtMSIpOwotICAgIH0KKyAgICAvLyBB ZnRlciB0aGUgZGVzY2VuZGFudCBjaGFuZ2VzLCB0aGUgY29tYm8gYm94IHNob3VsZCBzdGlsbCBi ZSB0aGUgZm9jdXNlZCBvYmplY3QuCisgICAgY29tYm8uc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2 ZWRlc2NlbmRhbnQiLCAiaXRlbTEiKTsKK30KIDwvc2NyaXB0PgogPC9ib2R5PgogPC9odG1sPgo= 471414 2024-05-15 06:49:51 -0700 2024-05-15 10:58:42 -0700 Patch bug-274178-20240515094950.patch text/plain 20766 andresg_22 RnJvbSAxOWQ1ZjAxNmIyNGU0NTRmYzY4NmMxZTYwMjg1N2MwNWZmNDE1YzQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDE0IE1heSAyMDI0IDE0OjMzOjEyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbnMgZm9yIGNvbWJvYm94IHNob3Vs ZAogdGFyZ2V0IHRoZSBjb21ib2JveCBpbiBxdWVzdGlvbiwgbm90IGl0cyBjb250cm9sbGVkIG9y IG93bmVkIGVsZW1lbnQuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjc0MTc4IDxyZGFyOi8vcHJvYmxlbS8xMjgwODMzODQ+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KClVudGlsIG5vdywgaWYgYSBjb21ib2JveCBjb250cm9sbGVkIG9yIG93bmVkIGFub3Ro ZXIgZWxlbWVudCwgd2UgaW1wb3NlZCB0aGUgcnVsZSB0aGF0IHRoZSB0YXJnZXQgb2YgdGhlIEFj dGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbiBzaG91bGQgYmUgdGhlIGNvbnRyb2xsZWQg b3Igb3duZWQgZWxlbWVudCwgdHlwaWNhbGx5IGEgbGlzdCwgbGlzdGJveCwgdHJlZSBvciBncmlk LiBUaGlzIHJ1bGUgaXMgdW5uZWNlc3NhcnkgYW5kIGFkZHMgc2lnbmlmaWNhbnQgY29tcGxleGl0 eSB0byB0aGUgaGFuZGxpbmcgb2YgdGhlc2UgY2hhbmdlcy4gRnVydGhlcm1vcmUsIHRoaXMgaXMg dGhlIHJvb3QgY2F1c2Ugb2YgcHJvYmxlbXMgaW4gY29tYm9ib3hlcyBsaWtlIHRoZSBzZWFyY2gg ZmllbGQgaW4gZ29vZ2xlLmNvbS4gVGhpcyBwYXRjaCBlbGltaW5hdGVzIHRoaXMgcnVsZSBhbmQg c2ltcGxpZmllcyB0aGUgY29kZSBhcm91bmQgY29tYm9ib3ggQWN0aXZlRWxlbWVudENoYW5nZWQg bm90aWZpY2F0aW9ucy4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlh LWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVt ZW50cy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21i b2JveC1uby1vd25zLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Nv bWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3ducy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvY29tYm9ib3gvbWFjL2NvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9u cy5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcDoK KFdlYkNvcmU6OkFYQ29yZU9iamVjdDo6YWN0aXZlRGVzY2VuZGFudCBjb25zdCk6CihXZWJDb3Jl OjpBWENvcmVPYmplY3Q6OmNhbkJlQ29udHJvbGxlZEJ5IGNvbnN0KTogRGVsZXRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oOgoqIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hl OjpoYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENh Y2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW06CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpw b3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgotLS0KIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhDb3JlT2JqZWN0LmNwcCB8IDM5IC0tLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuaCAgIHwgIDEgLQogLi4uL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCAgIHwgMzUgKysrKy0tLS0tLS0tLS0KIC4uLi9hdHNw aS9BWE9iamVjdENhY2hlQXRzcGkuY3BwICAgICAgICAgICAgICB8ICAyICstCiAuLi4vYWNjZXNz aWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbSAgICAgfCAgNSArLQogLi4ub21ib2JveC1j b250cm9sLW93bnMtZWxlbWVudHMtZXhwZWN0ZWQudHh0IHwgMTYgKysrLS0tLQogLi4uL2FyaWEt Y29tYm9ib3gtY29udHJvbC1vd25zLWVsZW1lbnRzLmh0bWwgIHwgMTYgKysrLS0tLQogLi4uL2Fy aWEtY29tYm9ib3gtbm8tb3ducy1leHBlY3RlZC50eHQgICAgICAgIHwgIDIgKy0KIC4uLi9jb21i b2JveC9hcmlhLWNvbWJvYm94LW5vLW93bnMuaHRtbCAgICAgICB8ICA2ICstLQogLi4ubWJvYm94 LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9ucy5odG1sIHwgNDcgKysrKysrKysrLS0tLS0t LS0tLQogMTAgZmlsZXMgY2hhbmdlZCwgNTQgaW5zZXJ0aW9ucygrKSwgMTE1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcAppbmRl eCAwZjllMDVlMzE4MjEuLmFjYTRmNGM5NWUzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcApAQCAtMzYzLDQ4ICszNjMsOSBAQCBBWENvcmVPYmpl Y3QqIEFYQ29yZU9iamVjdDo6YWN0aXZlRGVzY2VuZGFudCgpIGNvbnN0CiAgICAgQVNTRVJUKGFj dGl2ZURlc2NlbmRhbnRzLnNpemUoKSA8PSAxKTsKICAgICBpZiAoIWFjdGl2ZURlc2NlbmRhbnRz LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIGFjdGl2ZURlc2NlbmRhbnRzWzBdLmdldCgpOwot Ci0gICAgLy8gV2hlbiB0aGUgYWN0aXZlIGRlc2NlbmRhbnQgY2hhbmdlcyBmb3IgYSBjb21ib2Jv eCwgdGhlIHRhcmdldAotICAgIC8vIG9mIHRoZSBub3RpZmljYXRpb24gaXMgdGhlIG93bmVkIG9y IGNvbnRyb2xsZWQgZWxlbWVudCBvZiB0aGUgY29tYm9ib3gKLSAgICAvLyBpZiBleGlzdHMsIG1v c3QgY29tbW9ubHkgYSBsaXN0IG9yIGxpc3Rib3ggKHNlZWUgQVhPYmplY3RDYWNoZTo6aGFuZGxl QWN0aXZlRGVzY2VuZGFudENoYW5nZSkuCi0gICAgLy8gVGh1cywgYSBjbGllbnQgY291bGQgcmVx dWVzdCB0aGUgbmV3IGFjdGl2ZSBkZXNjZW5kYW50IGZyb20gdGhlIGxpc3Qgb3IKLSAgICAvLyBs aXN0Ym94LiBUbyBzdXBwb3J0IHRoaXMgc2NlbmFyaW8sIHdlIHRyeSB0byBnZXQgdGhlIGNvbnRy b2xsZXIgb3Igb3duZXIKLSAgICAvLyBjb21ib2JveCBpZiBleGlzdHMgYW5kIHJldHVybiBpdHMg YWN0aXZlIGRlc2NlbmRhbnQuCi0gICAgaWYgKGNhbkJlQ29udHJvbGxlZEJ5KEFjY2Vzc2liaWxp dHlSb2xlOjpDb21ib0JveCkpIHsKLSAgICAgICAgYXV0byBjb250cm9sbGVycyA9IHRoaXMtPmNv bnRyb2xsZXJzKCk7Ci0gICAgICAgIGlmIChjb250cm9sbGVycy5pc0VtcHR5KCkpCi0gICAgICAg ICAgICBjb250cm9sbGVycyA9IG93bmVycygpOwotICAgICAgICBpZiAoY29udHJvbGxlcnMuaXNF bXB0eSgpKQotICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICAgICAgYXV0byBjb21i b2JveCA9IHN0ZDo6ZmluZF9pZihjb250cm9sbGVycy5iZWdpbigpLCBjb250cm9sbGVycy5lbmQo KSwgW10gKGNvbnN0IGF1dG8mIG9iamVjdCkgewotICAgICAgICAgICAgcmV0dXJuIG9iamVjdC0+ aXNDb21ib0JveCgpOwotICAgICAgICB9KTsKLSAgICAgICAgaWYgKGNvbWJvYm94ICE9IGNvbnRy b2xsZXJzLmVuZCgpKQotICAgICAgICAgICAgcmV0dXJuICgqY29tYm9ib3gpLT5hY3RpdmVEZXNj ZW5kYW50KCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIG51bGxwdHI7CiB9CiAKLWJvb2wgQVhDb3Jl T2JqZWN0OjpjYW5CZUNvbnRyb2xsZWRCeShBY2Nlc3NpYmlsaXR5Um9sZSBjb250cm9sbGVyUm9s ZSkgY29uc3QKLXsKLSAgICBpZiAoY29udHJvbGxlclJvbGUgPT0gQWNjZXNzaWJpbGl0eVJvbGU6 OkNvbWJvQm94KSB7Ci0gICAgICAgIHN3aXRjaCAocm9sZVZhbHVlKCkpIHsKLSAgICAgICAgY2Fz ZSBBY2Nlc3NpYmlsaXR5Um9sZTo6R3JpZDoKLSAgICAgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9s ZTo6TGlzdDoKLSAgICAgICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6TGlzdEJveDoKLSAgICAg ICAgY2FzZSBBY2Nlc3NpYmlsaXR5Um9sZTo6VHJlZToKLSAgICAgICAgY2FzZSBBY2Nlc3NpYmls aXR5Um9sZTo6VHJlZUdyaWQ6Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICAgICAgZGVm YXVsdDoKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgfQotICAgIH0KLSAgICAv LyBGSVhNRTogYWRkIG90aGVyIHJlc3RyaWN0aW9ucy4KLSAgICByZXR1cm4gdHJ1ZTsKLX0KLQog QVhDb3JlT2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgQVhDb3JlT2JqZWN0Ojpz ZWxlY3RlZENlbGxzKCkKIHsKICAgICBpZiAoIWlzVGFibGUoKSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oCmluZGV4IDNkMGMxMDg5YWIxNy4uNTUwYjE0NzA3 YmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVj dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmgKQEAg LTEwNTYsNyArMTA1Niw2IEBAIHB1YmxpYzoKICAgICBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0 b3Igb3duZWRPYmplY3RzKCkgY29uc3QgeyByZXR1cm4gcmVsYXRlZE9iamVjdHMoQVhSZWxhdGlv blR5cGU6Ok93bmVyRm9yKTsgfQogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciBvd25l cnMoKSBjb25zdCB7IHJldHVybiByZWxhdGVkT2JqZWN0cyhBWFJlbGF0aW9uVHlwZTo6T3duZWRC eSk7IH0KICAgICB2aXJ0dWFsIEFjY2Vzc2liaWxpdHlDaGlsZHJlblZlY3RvciByZWxhdGVkT2Jq ZWN0cyhBWFJlbGF0aW9uVHlwZSkgY29uc3QgPSAwOwotICAgIGJvb2wgY2FuQmVDb250cm9sbGVk QnkoQWNjZXNzaWJpbGl0eVJvbGUpIGNvbnN0OwogCiAgICAgdmlydHVhbCBBWENvcmVPYmplY3Qq IGludGVybmFsTGlua0VsZW1lbnQoKSBjb25zdCA9IDA7CiAgICAgdm9pZCBhcHBlbmRSYWRpb0J1 dHRvbkdyb3VwTWVtYmVycyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImIGxpbmtlZFVJRWxl bWVudHMpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RD YWNoZS5jcHAKaW5kZXggYWY4MzY3ZjVhN2IwLi5mYWNlOWI5YWJlMjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtMjM3MCwyNiArMjM3 MCwyMCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2Uo RWxlbWVudCYgZWxlbWVudCwgY29uc3QgQXRvbVN0cgogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgLy8gSGFuZGxlIGFjdGl2ZS1kZXNjZW5kYW50IGNoYW5nZXMgd2hlbiB0aGUgdGFyZ2V0 IGFsbG93cyBmb3IgaXQsIG9yIHRoZSBjb250cm9sbGVkIG9iamVjdCBhbGxvd3MgZm9yIGl0Lgot ICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0PiB0YXJnZXQ7CiAgICAgaWYgKG9iamVjdC0+ c2hvdWxkRm9jdXNBY3RpdmVEZXNjZW5kYW50KCkpIHsKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElU WV9JU09MQVRFRF9UUkVFKQogICAgICAgICBzZXRJc29sYXRlZFRyZWVGb2N1c2VkT2JqZWN0KGFj dGl2ZURlc2NlbmRhbnQuZ2V0KCkpOwogI2VuZGlmCi0gICAgICAgIHRhcmdldCA9IG9iamVjdDsK LSAgICB9IGVsc2UgaWYgKG9iamVjdC0+aXNDb21ib0JveCgpKSB7Ci0gICAgICAgIC8vIElmIHRo ZSBjb21ib2JveCdzIGFjdGl2ZURlc2NlbmRhbnQgaXMgaW5zaWRlIGEgZGVzY2VuZGFudCBvd25l ZCBvciBjb250cm9sbGVkIGJ5IHRoZSBjb21ib2JveCwgdGhhdCBkZXNjZW5kYW50IHNob3VsZCBi ZSB0aGUgdGFyZ2V0IG9mIHRoZSBub3RpZmljYXRpb24gYW5kIG5vdCB0aGUgY29tYm9ib3ggaXRz ZWxmLgotICAgICAgICBpZiAoYXV0byogb3duZWRPYmplY3QgPSBBY2Nlc3NpYmlsaXR5OjpmaW5k UmVsYXRlZE9iamVjdEluQW5jZXN0cnkoKm9iamVjdCwgQVhSZWxhdGlvblR5cGU6Ok93bmVyRm9y LCAqYWN0aXZlRGVzY2VuZGFudCkpCi0gICAgICAgICAgICB0YXJnZXQgPSBvd25lZE9iamVjdDsK LSAgICAgICAgZWxzZSBpZiAoYXV0byogY29udHJvbGxlZE9iamVjdCA9IEFjY2Vzc2liaWxpdHk6 OmZpbmRSZWxhdGVkT2JqZWN0SW5BbmNlc3RyeSgqb2JqZWN0LCBBWFJlbGF0aW9uVHlwZTo6Q29u dHJvbGxlckZvciwgKmFjdGl2ZURlc2NlbmRhbnQpKQotICAgICAgICAgICAgdGFyZ2V0ID0gY29u dHJvbGxlZE9iamVjdDsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGFyZ2V0ID0gb2JqZWN0 OwotICAgIH0gZWxzZSBpZiAob2JqZWN0LT5zdXBwb3J0c0FjdGl2ZURlc2NlbmRhbnQoKSkKKyAg ICAgICAgcG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKCphY3RpdmVEZXNjZW5kYW50LCBBWE5vdGlm aWNhdGlvbjo6QVhGb2N1c2VkVUlFbGVtZW50Q2hhbmdlZCk7CisgICAgfQorCisgICAgLy8gSGFu ZGxlIGFjdGl2ZS1kZXNjZW5kYW50IGNoYW5nZXMgd2hlbiB0aGUgdGFyZ2V0IGFsbG93cyBmb3Ig aXQsIG9yIHRoZSBjb250cm9sbGVkIG9iamVjdCBhbGxvd3MgZm9yIGl0LgorICAgIFJlZlB0cjxB Y2Nlc3NpYmlsaXR5T2JqZWN0PiB0YXJnZXQ7CisgICAgaWYgKG9iamVjdC0+c3VwcG9ydHNBY3Rp dmVEZXNjZW5kYW50KCkpCiAgICAgICAgIHRhcmdldCA9IG9iamVjdDsKICAgICBlbHNlIHsKLSAg ICAgICAgLy8gQ2hlY2sgdG8gc2VlIGlmIHRoZSBhY3RpdmUgZGVzY2VuZGFudCBpcyBhIGNoaWxk IG9mIHRoZSBjb250cm9sbGVkIG9iamVjdC4gVGhlbiB3ZSBoYXZlIHRvIHVzZSB0aGF0Ci0gICAg ICAgIC8vIGNvbnRyb2xsZWQgb2JqZWN0IGFzIHRoZSB0YXJnZXQgd2UgdXNlIGluIG5vdGlmaWNh dGlvbnMuCisgICAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGUgYWN0aXZlIGRlc2NlbmRhbnQg aXMgYSBkZXNjZW5kYW50IG9mIGFuIG9iamVjdCBjb250cm9sbGVkIGJ5IHRoaXMgb2JqZWN0Lgor ICAgICAgICAvLyBJbiB0aGF0IGNhc2UsIHRoZSBjb250cm9sbGVkIG9iamVjdCB3aWxsIGJlIHRo ZSB0YXJnZXQgZm9yIHRoZSBub3RpZmljYXRpb24uCiAgICAgICAgIGF1dG8gY29udHJvbGxlZE9i amVjdHMgPSBvYmplY3QtPnJlbGF0ZWRPYmplY3RzKEFYUmVsYXRpb25UeXBlOjpDb250cm9sbGVy Rm9yKTsKICAgICAgICAgaWYgKGNvbnRyb2xsZWRPYmplY3RzLnNpemUoKSkgewogICAgICAgICAg ICAgdGFyZ2V0ID0gQWNjZXNzaWJpbGl0eTo6ZmluZEFuY2VzdG9yKCphY3RpdmVEZXNjZW5kYW50 LCBmYWxzZSwgWyZjb250cm9sbGVkT2JqZWN0c10gKGNvbnN0IGF1dG8mIGFjdGl2ZURlc2NlbmRh bnRBbmNlc3RvcikgewpAQCAtMjQwMSwyMSArMjM5NSwxMCBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6 OmhhbmRsZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2UoRWxlbWVudCYgZWxlbWVudCwgY29uc3QgQXRv bVN0cgogICAgIGlmICghdGFyZ2V0KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAodGFyZ2V0 ID09IG9iamVjdCkgewotICAgICAgICBpZiAodGFyZ2V0LT5pc0NvbWJvQm94KCkpIHsKLSAgICAg ICAgICAgIC8vIFRoZSBjb21ib2JveCBkb2VzIG5vdCBvd24gb3IgY29udHJvbCB0aGUgZWxlbWVu dCB0byB3aGljaCBhY3RpdmVEZXNjZW5kYW50IGJlbG9uZ3MuCi0gICAgICAgICAgICAvLyBFc3Rh Ymxpc2ggdGhpcyBpbXBsaWNpdCByZWxhdGlvbnNoaXAuCi0gICAgICAgICAgICBSZWZQdHIgY29u dHJvbGxlZCA9IEFjY2Vzc2liaWxpdHk6OmZpbmRBbmNlc3RvcigqYWN0aXZlRGVzY2VuZGFudCwg ZmFsc2UsIFtdIChjb25zdCBhdXRvJiBhbmNlc3RvcikgewotICAgICAgICAgICAgICAgIHJldHVy biBhbmNlc3Rvci5jYW5CZUNvbnRyb2xsZWRCeShBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3gp OwotICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICBpZiAoY29udHJvbGxlZCkKLSAgICAgICAg ICAgICAgICBhZGRSZWxhdGlvbih0YXJnZXQuZ2V0KCksIGNvbnRyb2xsZWQuZ2V0KCksIEFYUmVs YXRpb25UeXBlOjpDb250cm9sbGVyRm9yKTsKLSAgICAgICAgfQotICAgIH0gZWxzZSB7CiAjaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKyAgICBpZiAodGFyZ2V0ICE9IG9i amVjdCkKICAgICAgICAgdXBkYXRlSXNvbGF0ZWRUcmVlKHRhcmdldC5nZXQoKSwgQVhOb3RpZmlj YXRpb246OkFYQWN0aXZlRGVzY2VuZGFudENoYW5nZWQpOwogI2VuZGlmCi0gICAgfQogCiAgICAg cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKCp0YXJnZXQsIEFYTm90aWZpY2F0aW9uOjpBWEFjdGl2 ZURlc2NlbmRhbnRDaGFuZ2VkKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwCmluZGV4IDYzNDVhYTk3NzM4 MC4uZDc1ZjE1YzAzMzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwCkBAIC0xMzcsNyArMTM3LDcgQEAg dm9pZCBBWE9iamVjdENhY2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24oQWNjZXNzaWJpbGl0 eU9iamVjdCYgY29yZU9iamVjdCwgQVgKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWEFjdGl2 ZURlc2NlbmRhbnRDaGFuZ2VkOgogICAgICAgICBpZiAoYXV0byogZGVzY2VuZGFudCA9IGNvcmVP YmplY3QuYWN0aXZlRGVzY2VuZGFudCgpKSB7Ci0gICAgICAgICAgICBpZiAoY29yZU9iamVjdC5p c0NvbWJvQm94KCkgfHwgY29yZU9iamVjdC5jYW5CZUNvbnRyb2xsZWRCeShBY2Nlc3NpYmlsaXR5 Um9sZTo6Q29tYm9Cb3gpKQorICAgICAgICAgICAgaWYgKGNvcmVPYmplY3QuaXNDb21ib0JveCgp KQogICAgICAgICAgICAgICAgIHdyYXBwZXItPmFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKCk7CiAg ICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgcGxhdGZvcm1IYW5kbGVGb2N1c2VkVUlF bGVtZW50Q2hhbmdlZChudWxscHRyLCBkZXNjZW5kYW50LT5ub2RlKCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbSBiL1Nv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KaW5kZXgg YTRkYzBkNDRjYTZmLi42MDIyZjFlYzkxM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQpAQCAtMzI4LDEwICszMjgsNyBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmls aXR5T2JqZWN0JiBvYmplY3QsIEFYTm90aQogICAgIE5TU3RyaW5nICptYWNOb3RpZmljYXRpb247 CiAgICAgc3dpdGNoIChub3RpZmljYXRpb24pIHsKICAgICBjYXNlIEFYQWN0aXZlRGVzY2VuZGFu dENoYW5nZWQ6Ci0gICAgICAgIGlmIChvYmplY3QuaXNDb21ib0JveCgpIHx8IG9iamVjdC5jYW5C ZUNvbnRyb2xsZWRCeShBY2Nlc3NpYmlsaXR5Um9sZTo6Q29tYm9Cb3gpKQotICAgICAgICAgICAg bWFjTm90aWZpY2F0aW9uID0gQCJBWEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIjsKLSAgICAgICAgZWxz ZQotICAgICAgICAgICAgbWFjTm90aWZpY2F0aW9uID0gTlNBY2Nlc3NpYmlsaXR5Rm9jdXNlZFVJ RWxlbWVudENoYW5nZWROb3RpZmljYXRpb247CisgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IEAi QVhBY3RpdmVFbGVtZW50Q2hhbmdlZCI7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQVhBdXRv Y29ycmVjdGlvbk9jY3VyZWQ6CiAgICAgICAgIG1hY05vdGlmaWNhdGlvbiA9IEAiQVhBdXRvY29y cmVjdGlvbk9jY3VycmVkIjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkv Y29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRy b2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQKaW5kZXggOWNjOGZkZGM1NTY5Li4wNDQ2Njdl ZWFkMmIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJp YS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93bnMt ZWxlbWVudHMtZXhwZWN0ZWQudHh0CkBAIC0xLDEzICsxLDEzIEBACiBUaGlzIHRlc3RzIHZhcmlh dGlvbnMgb2YgdGhlIGNvbWJvYm94ZXMgYW5kIGVsZW1lbnRzIGl0IGNhbiBjb250cm9sIGFuZCBv d24uIFRoZW4gdmVyaWZpZXMgdGhlIGFjdGl2ZS1kZXNjZW5kYW50IGlzIHJlZmxlY3RlZCBjb3Jy ZWN0bHkuCiAKLVJlY2VpdmVkIG5vdGlmaWNhdGlvbiBmb3IgTGlzdDEKLVBBU1M6IGxpc3QuYWN0 aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkgPT09IHRydWUKLVJlY2VpdmVkIG5vdGlmaWNh dGlvbiBmb3IgTGlzdGJveDIKLVBBU1M6IGxpc3Rib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKG9w dGlvbjJfMSkgPT09IHRydWUKLVJlY2VpdmVkIG5vdGlmaWNhdGlvbiBmb3IgR3JpZDMKLVBBU1M6 IGdyaWQuYWN0aXZlRWxlbWVudC5pc0VxdWFsKHJvdzNfMSkgPT09IHRydWUKLVJlY2VpdmVkIG5v dGlmaWNhdGlvbiBmb3IgVHJlZTQKLVBBU1M6IHRyZWUuYWN0aXZlRWxlbWVudC5pc0VxdWFsKHRy ZWVpdGVtNF8xKSA9PT0gdHJ1ZQorUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBDb21ib2JveDEK K1BBU1M6IGNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChsaXN0aXRlbTEpID09PSB0cnVl CitSZWNlaXZlZCBub3RpZmljYXRpb24gZm9yIENvbWJvYm94MgorUEFTUzogY29tYm9ib3guYWN0 aXZlRWxlbWVudC5pc0VxdWFsKG9wdGlvbjJfMSkgPT09IHRydWUKK1JlY2VpdmVkIG5vdGlmaWNh dGlvbiBmb3IgQ29tYm9ib3gzCitQQVNTOiBjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwo cm93M18xKSA9PT0gdHJ1ZQorUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBDb21ib2JveDQKK1BB U1M6IGNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbCh0cmVlaXRlbTRfMSkgPT09IHRydWUK IAogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtY29udHJvbC1vd25zLWVs ZW1lbnRzLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29t Ym9ib3gtY29udHJvbC1vd25zLWVsZW1lbnRzLmh0bWwKaW5kZXggZjdiZGE5OGNhN2YxLi40Mjhm OTkyOTE2ZjUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gv YXJpYS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtY29udHJvbC1vd25zLWVsZW1l bnRzLmh0bWwKQEAgLTUxLDQ1ICs1MSw0NSBAQCBpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250 cm9sbGVyKSB7CiAKICAgICAvLyBFeGFtcGxlIDE6IGFyaWEtY29udHJvbHMgYSBsaXN0LgogICAg IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveDEiKS5mb2N1cygpOwotICAgIGxpc3Qg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImxpc3QxIik7 CisgICAgY29tYm9ib3ggPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVu dEJ5SWQoImNvbWJvYm94MSIpOwogICAgIC8vIFNldCBhY3RpdmUtZGVzY2VuZGFudCwgdmVyaWZ5 IG5vdGlmaWNhdGlvbiBpcyBzZW50IGFuZCB0aGF0IGxpc3QgaGFzIGNvcnJlY3QgYWN0aXZlIGVs ZW1lbnQuCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94MSIpLnNldEF0dHJp YnV0ZSgiYXJpYS1hY3RpdmVkZXNjZW5kYW50IiwgIml0ZW0xXzEiKTsKICAgICBzZXRUaW1lb3V0 KGFzeW5jICgpID0+IHsKICAgICAgICAgbGlzdGl0ZW0xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJpdGVtMV8xIik7Ci0gICAgICAgIG91dHB1dCArPSBl eHBlY3QoImxpc3QuYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkiLCAidHJ1ZSIpOwor ICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwo bGlzdGl0ZW0xKSIsICJ0cnVlIik7CiAKICAgICAgICAgLy8gRXhhbXBsZSAyOiBhcmlhLW93bnMg YSBsaXN0Ym94LgogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3gyIiku Zm9jdXMoKTsKLSAgICAgICAgbGlzdGJveCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vz c2libGVFbGVtZW50QnlJZCgibGlzdGJveDIiKTsKKyAgICAgICAgY29tYm9ib3ggPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNvbWJvYm94MiIpOwogICAg ICAgICAvLyBTZXQgYWN0aXZlLWRlc2NlbmRhbnQsIHZlcmlmeSBub3RpZmljYXRpb24gaXMgc2Vu dCBhbmQgdGhhdCBsaXN0IGhhcyBjb3JyZWN0IGFjdGl2ZSBlbGVtZW50LgogICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3gyIikuc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2 ZWRlc2NlbmRhbnQiLCAib3B0aW9uMl8xIik7CiAgICAgICAgIG9wdGlvbjJfMSA9IGFjY2Vzc2li aWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgib3B0aW9uMl8xIik7CiAgICAg ICAgIGF3YWl0IHdhaXRGb3IoKCkgPT4gewogICAgICAgICAgICAgcmV0dXJuIGFjdGl2ZUVsZW1l bnRDaGFuZ2VDb3VudCA9PSAyOwogICAgICAgICB9KTsKLSAgICAgICAgb3V0cHV0ICs9IGV4cGVj dCgibGlzdGJveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwob3B0aW9uMl8xKSIsICJ0cnVlIik7Cisg ICAgICAgIG91dHB1dCArPSBleHBlY3QoImNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChv cHRpb24yXzEpIiwgInRydWUiKTsKIAogICAgICAgICAvLyBFeGFtcGxlIDM6IGFyaWEtb3ducyBh IGdyaWQuCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveDMiKS5mb2N1 cygpOwotICAgICAgICBncmlkID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVs ZW1lbnRCeUlkKCJncmlkMyIpOworICAgICAgICBjb21ib2JveCA9IGFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY29tYm9ib3gzIik7CiAgICAgICAgIC8vIFNl dCBhY3RpdmUtZGVzY2VuZGFudCwgdmVyaWZ5IG5vdGlmaWNhdGlvbiBpcyBzZW50IGFuZCB0aGF0 IGxpc3QgaGFzIGNvcnJlY3QgYWN0aXZlIGVsZW1lbnQuCiAgICAgICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJjb21ib2JveDMiKS5zZXRBdHRyaWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFu dCIsICJyb3czXzEiKTsKICAgICAgICAgcm93M18xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu YWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJyb3czXzEiKTsKICAgICAgICAgYXdhaXQgd2FpdEZvcigo KSA9PiB7CiAgICAgICAgICAgICByZXR1cm4gYWN0aXZlRWxlbWVudENoYW5nZUNvdW50ID09IDM7 CiAgICAgICAgIH0pOwotICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJncmlkLmFjdGl2ZUVsZW1l bnQuaXNFcXVhbChyb3czXzEpIiwgInRydWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgi Y29tYm9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKHJvdzNfMSkiLCAidHJ1ZSIpOwogCiAgICAg ICAgIC8vIEV4YW1wbGUgNDogYXJpYS1vd25zIGEgdHJlZS4KICAgICAgICAgZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoImNvbWJvYm94NCIpLmZvY3VzKCk7Ci0gICAgICAgIHRyZWUgPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRyZWU0Iik7CisgICAgICAg IGNvbWJvYm94ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlk KCJjb21ib2JveDQiKTsKICAgICAgICAgLy8gU2V0IGFjdGl2ZS1kZXNjZW5kYW50LCB2ZXJpZnkg bm90aWZpY2F0aW9uIGlzIHNlbnQgYW5kIHRoYXQgdHJlZSBoYXMgY29ycmVjdCBhY3RpdmUgZGVz Y2VuZGFudC4KICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94NCIpLnNl dEF0dHJpYnV0ZSgiYXJpYS1hY3RpdmVkZXNjZW5kYW50IiwgInRyZWVpdGVtNF8xIik7CiAgICAg ICAgIHRyZWVpdGVtNF8xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1l bnRCeUlkKCJ0cmVlaXRlbTRfMSIpOwogICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKICAg ICAgICAgICAgIHJldHVybiBhY3RpdmVFbGVtZW50Q2hhbmdlQ291bnQgPT0gNDsKICAgICAgICAg fSk7Ci0gICAgICAgIG91dHB1dCArPSBleHBlY3QoInRyZWUuYWN0aXZlRWxlbWVudC5pc0VxdWFs KHRyZWVpdGVtNF8xKSIsICJ0cnVlIik7CisgICAgICAgIG91dHB1dCArPSBleHBlY3QoImNvbWJv Ym94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbCh0cmVlaXRlbTRfMSkiLCAidHJ1ZSIpOwogCiAgICAg ICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLnJlbW92ZU5vdGlmaWNhdGlvbkxpc3RlbmVyKCk7 CiAgICAgICAgIGRlYnVnKG91dHB1dCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9hY2Nlc3Np YmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3ducy1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3ducy1leHBl Y3RlZC50eHQKaW5kZXggYzYxMmZmY2QzYmM1Li5kZDhiOGU4YjkzZjMgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLWV4 cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEt Y29tYm9ib3gtbm8tb3ducy1leHBlY3RlZC50eHQKQEAgLTEsNiArMSw2IEBACiBBIGNvbWJvYm94 IHNob3VsZCBzdGlsbCBzdXBwb3J0IGFyaWEtYWN0aXZlZGVzY2VuZGFudCBldmVuIGlmIGl0IGRv ZXNuJ3QgdXNlIGFyaWEtb3ducy4KIFJlY2VpdmVkIEFYQWN0aXZlRWxlbWVudENoYW5nZWQgZm9y IENvbWJvYm94Ci1QQVNTOiBsaXN0LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChsaXN0aXRlbTEpID09 PSB0cnVlCitQQVNTOiBjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwobGlzdGl0ZW0xKSA9 PT0gdHJ1ZQogCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25z Lmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gt bm8tb3ducy5odG1sCmluZGV4IDc3YzU4OTBiMTZhOS4uMjRkZmU5ZGNlMWE3IDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3du cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21i b2JveC1uby1vd25zLmh0bWwKQEAgLTI3LDE3ICsyNywxNyBAQCBpZiAod2luZG93LmFjY2Vzc2li aWxpdHlDb250cm9sbGVyKSB7CiAgICAgfSk7CiAKICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgiY29tYm9ib3giKS5mb2N1cygpOwotICAgIHZhciBsaXN0ID0gYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJsaXN0Iik7CisgICAgdmFyIGNvbWJvYm94ID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjb21ib2JveCIp OwogICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveCIpLnNldEF0dHJpYnV0ZSgi YXJpYS1hY3RpdmVkZXNjZW5kYW50IiwgIml0ZW0xIik7CiAgICAgdmFyIGxpc3RpdGVtMSA9IGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiaXRlbTEiKTsKICAg ICBzZXRUaW1lb3V0KGFzeW5jIGZ1bmN0aW9uKCkgewogICAgICAgICBhd2FpdCB3YWl0Rm9yKCgp ID0+IHsKICAgICAgICAgICAgIHJldHVybiBhY3RpdmVFbGVtZW50Q2hhbmdlQ291bnQ7CiAgICAg ICAgIH0pOwotICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJsaXN0LmFjdGl2ZUVsZW1lbnQuaXNF cXVhbChsaXN0aXRlbTEpIiwgInRydWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgiY29t Ym9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkiLCAidHJ1ZSIpOwogCi0gICAg ICAgIGRlYnVnKG91dHB1dCk7CiAgICAgICAgIGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLnJlbW92 ZU5vdGlmaWNhdGlvbkxpc3RlbmVyKCk7CisgICAgICAgIGRlYnVnKG91dHB1dCk7CiAgICAgICAg IGZpbmlzaEpTVGVzdCgpOwogICAgIH0sIDApOwogfQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv YWNjZXNzaWJpbGl0eS9jb21ib2JveC9tYWMvY29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC1ub3Rp ZmljYXRpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L21hYy9j b21ib2JveC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNhdGlvbnMuaHRtbAppbmRleCBiMzMwYWY2 MDY0ZTguLjE4ZTM4MGE3MzI0MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0 eS9jb21ib2JveC9tYWMvY29tYm9ib3gtYWN0aXZlZGVzY2VuZGFudC1ub3RpZmljYXRpb25zLmh0 bWwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9tYWMvY29tYm9ib3gt YWN0aXZlZGVzY2VuZGFudC1ub3RpZmljYXRpb25zLmh0bWwKQEAgLTksMzkgKzksMzggQEAKIDxk aXYgaWQ9ImNvbnRlbnQiPgogPGlucHV0IHR5cGU9InRleHQiIHJvbGU9ImNvbWJvYm94IiBpZD0i Y29tYm8iIGFyaWEtb3ducz0ibGlzdCI+CiA8dWwgaWQ9Imxpc3QiIHJvbGU9Imxpc3Rib3giPgot PGxpIHRhYmluZGV4PSIwIiByb2xlPSJvcHRpb24iIGlkPSJpdGVtMSI+aXRlbTE8L2xpPgorICAg IDxsaSB0YWJpbmRleD0iMCIgcm9sZT0ib3B0aW9uIiBpZD0iaXRlbTEiPml0ZW0xPC9saT4KIDwv dWw+CiA8L2Rpdj4KIAogPHNjcmlwdD4KLSAgICBsZXQgb3V0cHV0ID0gIlRoaXMgdGVzdCBtYWtl cyBzdXJlIHRoYXQgYW4gQVJJQSBhY3RpdmUgZGVzY2VuZGFudCBjaGFuZ2UgZG9lcyBub3QgY2hh bmdlIGZvY3VzLCBiZWNhdXNlIGZvY3VzIHNob3VsZCByZW1haW4gaW4gdGhlIHRleHRmaWVsZCBw b3J0aW9uIG9mIHRoZSBjb21ibyBib3guXG5cbiI7CitsZXQgb3V0cHV0ID0gIlRoaXMgdGVzdCBt YWtlcyBzdXJlIHRoYXQgYW4gQVJJQSBhY3RpdmUgZGVzY2VuZGFudCBjaGFuZ2UgZG9lcyBub3Qg Y2hhbmdlIGZvY3VzLCBiZWNhdXNlIGZvY3VzIHNob3VsZCByZW1haW4gaW4gdGhlIHRleHRmaWVs ZCBwb3J0aW9uIG9mIHRoZSBjb21ibyBib3guXG5cbiI7CiAKLSAgICBpZiAod2luZG93LnRlc3RS dW5uZXIgJiYgd2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7Ci0gICAgICAgIGpzVGVz dElzQXN5bmMgPSB0cnVlOworaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewor ICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKIAotICAgICAgICBjb21iby5mb2N1cygp OwotICAgICAgICB2YXIgYXhDb21ibyA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgiY29tYm8iKTsKLSAgICAgICAgb3V0cHV0ICs9ICJUaGUgQ29tYm9Cb3gg c2hvdWxkIHN0YXJ0IG91dCBhcyB0aGUgZm9jdXNlZCBlbGVtZW50LlxuIjsKLSAgICAgICAgb3V0 cHV0ICs9IGV4cGVjdCgiYXhDb21iby5pc0VxdWFsKGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZv Y3VzZWRFbGVtZW50KSIsICJ0cnVlIik7CisgICAgY29tYm8uZm9jdXMoKTsKKyAgICB2YXIgYXhD b21ibyA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY29t Ym8iKTsKKyAgICBvdXRwdXQgKz0gIlRoZSBDb21ib0JveCBzaG91bGQgc3RhcnQgb3V0IGFzIHRo ZSBmb2N1c2VkIGVsZW1lbnQuXG4iOworICAgIG91dHB1dCArPSBleHBlY3QoImF4Q29tYm8uaXNF cXVhbChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudCkiLCAidHJ1ZSIpOwog Ci0gICAgICAgIC8vIFdoZW4gdGhlIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMsIHdlIHNob3Vs ZCByZWNlaXZlIGEgc2VsZWN0ZWQgY2hpbGRyZW4gY2hhbmdlZCBub3RpZmljYXRpb24uCi0gICAg ICAgIHZhciBheExpc3QgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVu dEJ5SWQoImxpc3QiKTsKLSAgICAgICAgYXhMaXN0LmFkZE5vdGlmaWNhdGlvbkxpc3RlbmVyKGZ1 bmN0aW9uKG5vdGlmaWNhdGlvbikgewotICAgICAgICAgICAgb3V0cHV0ICs9IGBSZWNlaXZlZCBu b3RpZmljYXRpb246ICR7bm90aWZpY2F0aW9ufVxuYDsKLSAgICAgICAgICAgIGlmIChub3RpZmlj YXRpb24gPT0gIkFYQWN0aXZlRWxlbWVudENoYW5nZWQiKSB7Ci0gICAgICAgICAgICAgICAgb3V0 cHV0ICs9ICJUaGUgQ29tYm9Cb3ggc2hvdWxkIHN0aWxsIGJlIHRoZSBmb2N1c2VkIGVsZW1lbnQg ZXZlbiBhZnRlciB0aGUgYXJpYS1hY3RpdmVkZXNjZW5kYW50IHdhcyBjaGFuZ2VkLlxuIjsKLSAg ICAgICAgICAgICAgICBvdXRwdXQgKz0gZXhwZWN0KCJheENvbWJvLmlzRXF1YWwoYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQpIiwgInRydWUiKTsKKyAgICAvLyBXaGVuIHRo ZSBhY3RpdmUgZGVzY2VuZGFudCBjaGFuZ2VzLCB3ZSBzaG91bGQgcmVjZWl2ZSBhIHNlbGVjdGVk IGNoaWxkcmVuIGNoYW5nZWQgbm90aWZpY2F0aW9uLgorICAgIGF4Q29tYm8uYWRkTm90aWZpY2F0 aW9uTGlzdGVuZXIoKG5vdGlmaWNhdGlvbikgPT4geworICAgICAgICBvdXRwdXQgKz0gYFJlY2Vp dmVkIG5vdGlmaWNhdGlvbjogJHtub3RpZmljYXRpb259XG5gOworICAgICAgICBpZiAobm90aWZp Y2F0aW9uID09ICJBWEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIikgeworICAgICAgICAgICAgb3V0cHV0 ICs9ICJUaGUgQ29tYm9Cb3ggc2hvdWxkIHN0aWxsIGJlIHRoZSBmb2N1c2VkIGVsZW1lbnQgZXZl biBhZnRlciB0aGUgYXJpYS1hY3RpdmVkZXNjZW5kYW50IHdhcyBjaGFuZ2VkLlxuIjsKKyAgICAg ICAgICAgIG91dHB1dCArPSBleHBlY3QoImF4Q29tYm8uaXNFcXVhbChhY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5mb2N1c2VkRWxlbWVudCkiLCAidHJ1ZSIpOwogCi0gICAgICAgICAgICAgICAgYXhM aXN0LnJlbW92ZU5vdGlmaWNhdGlvbkxpc3RlbmVyKCk7Ci0gICAgICAgICAgICAgICAgY29udGVu dC5zdHlsZS52aXNpYmlsaXR5ID0gImhpZGRlbiI7Ci0gICAgICAgICAgICAgICAgZGVidWcob3V0 cHV0KTsKLSAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKLSAgICAgICAgICAgIH0KLSAg ICAgICAgfSk7CisgICAgICAgICAgICBheENvbWJvLnJlbW92ZU5vdGlmaWNhdGlvbkxpc3RlbmVy KCk7CisgICAgICAgICAgICBjb250ZW50LnN0eWxlLnZpc2liaWxpdHkgPSAiaGlkZGVuIjsKKyAg ICAgICAgICAgIGRlYnVnKG91dHB1dCk7CisgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAg ICAgICAgfQorICAgIH0pOwogCi0gICAgICAgIC8vIEFmdGVyIHRoZSBkZXNjZW5kYW50IGNoYW5n ZXMsIHRoZSBjb21ibyBib3ggc2hvdWxkIHN0aWxsIGJlIHRoZSBmb2N1c2VkIG9iamVjdC4KLSAg ICAgICAgY29tYm8uc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAiaXRlbTEi KTsKLSAgICB9CisgICAgLy8gQWZ0ZXIgdGhlIGRlc2NlbmRhbnQgY2hhbmdlcywgdGhlIGNvbWJv IGJveCBzaG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgb2JqZWN0LgorICAgIGNvbWJvLnNldEF0 dHJpYnV0ZSgiYXJpYS1hY3RpdmVkZXNjZW5kYW50IiwgIml0ZW0xIik7Cit9CiA8L3NjcmlwdD4K IDwvYm9keT4KIDwvaHRtbD4K 471416 2024-05-15 10:58:45 -0700 2024-05-16 04:45:44 -0700 Patch bug-274178-20240515135844.patch text/plain 20945 andresg_22 RnJvbSA5Y2FiMmYzYTEwMzQwYWM4YjkwNDc0NzcyY2Q4ZjRlMzYxMjBlOTUyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyZXMgR29uemFsZXogPGFuZHJlc2dfMjJAYXBwbGUuY29t PgpEYXRlOiBUdWUsIDE0IE1heSAyMDI0IDE0OjMzOjEyIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0g QVg6IEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbnMgZm9yIGNvbWJvYm94IHNob3Vs ZAogdGFyZ2V0IHRoZSBjb21ib2JveCBpbiBxdWVzdGlvbiwgbm90IGl0cyBjb250cm9sbGVkIG9y IG93bmVkIGVsZW1lbnQuCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjc0MTc4IDxyZGFyOi8vcHJvYmxlbS8xMjgwODMzODQ+CgpSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KClVudGlsIG5vdywgaWYgYSBjb21ib2JveCBjb250cm9sbGVkIG9yIG93bmVkIGFub3Ro ZXIgZWxlbWVudCwgd2UgaW1wb3NlZCB0aGUgcnVsZSB0aGF0IHRoZSB0YXJnZXQgb2YgdGhlIEFj dGl2ZUVsZW1lbnRDaGFuZ2VkIG5vdGlmaWNhdGlvbiBzaG91bGQgYmUgdGhlIGNvbnRyb2xsZWQg b3Igb3duZWQgZWxlbWVudCwgdHlwaWNhbGx5IGEgbGlzdCwgbGlzdGJveCwgdHJlZSBvciBncmlk LiBUaGlzIHJ1bGUgaXMgdW5uZWNlc3NhcnkgYW5kIGFkZHMgc2lnbmlmaWNhbnQgY29tcGxleGl0 eSB0byB0aGUgaGFuZGxpbmcgb2YgdGhlc2UgY2hhbmdlcy4gRnVydGhlcm1vcmUsIHRoaXMgaXMg dGhlIHJvb3QgY2F1c2Ugb2YgcHJvYmxlbXMgaW4gY29tYm9ib3hlcyBsaWtlIHRoZSBzZWFyY2gg ZmllbGQgaW4gZ29vZ2xlLmNvbS4gVGhpcyBwYXRjaCBlbGltaW5hdGVzIHRoaXMgcnVsZSBhbmQg c2ltcGxpZmllcyB0aGUgY29kZSBhcm91bmQgY29tYm9ib3ggQWN0aXZlRWxlbWVudENoYW5nZWQg bm90aWZpY2F0aW9ucy4KCiogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlh LWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQ6CiogTGF5b3V0VGVz dHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVt ZW50cy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21i b2JveC1uby1vd25zLWV4cGVjdGVkLnR4dDoKKiBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2Nv bWJvYm94L2FyaWEtY29tYm9ib3gtbm8tb3ducy5odG1sOgoqIExheW91dFRlc3RzL2FjY2Vzc2li aWxpdHkvY29tYm9ib3gvbWFjL2NvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9u cy5odG1sOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcDoK KFdlYkNvcmU6OkFYQ29yZU9iamVjdDo6YWN0aXZlRGVzY2VuZGFudCBjb25zdCk6CihXZWJDb3Jl OjpBWENvcmVPYmplY3Q6OmNhbkJlQ29udHJvbGxlZEJ5IGNvbnN0KTogRGVsZXRlZC4KKiBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oOgoqIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENhY2hl OjpoYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlKToKKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2F0c3BpL0FYT2JqZWN0Q2FjaGVBdHNwaS5jcHA6CihXZWJDb3JlOjpBWE9iamVjdENh Y2hlOjpwb3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgoqIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW06CihXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpw b3N0UGxhdGZvcm1Ob3RpZmljYXRpb24pOgotLS0KIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhDb3JlT2JqZWN0LmNwcCB8IDM5IC0tLS0tLS0tLS0tLS0tLQogU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuaCAgIHwgIDEgLQogLi4uL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCAgIHwgMzUgKysrKy0tLS0tLS0tLS0KIC4uLi9hdHNw aS9BWE9iamVjdENhY2hlQXRzcGkuY3BwICAgICAgICAgICAgICB8ICA3ICstLQogLi4uL2FjY2Vz c2liaWxpdHkvbWFjL0FYT2JqZWN0Q2FjaGVNYWMubW0gICAgIHwgIDUgKy0KIC4uLm9tYm9ib3gt Y29udHJvbC1vd25zLWVsZW1lbnRzLWV4cGVjdGVkLnR4dCB8IDE2ICsrKy0tLS0KIC4uLi9hcmlh LWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy5odG1sICB8IDE2ICsrKy0tLS0KIC4uLi9h cmlhLWNvbWJvYm94LW5vLW93bnMtZXhwZWN0ZWQudHh0ICAgICAgICB8ICAyICstCiAuLi4vY29t Ym9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLmh0bWwgICAgICAgfCAgNiArLS0KIC4uLm1ib2Jv eC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNhdGlvbnMuaHRtbCB8IDQ3ICsrKysrKysrKy0tLS0t LS0tLS0KIDEwIGZpbGVzIGNoYW5nZWQsIDU0IGluc2VydGlvbnMoKyksIDEyMCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVj dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAKaW5k ZXggMGY5ZTA1ZTMxODIxLi5hY2E0ZjRjOTVlMzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhDb3JlT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L0FYQ29yZU9iamVjdC5jcHAKQEAgLTM2Myw0OCArMzYzLDkgQEAgQVhDb3JlT2Jq ZWN0KiBBWENvcmVPYmplY3Q6OmFjdGl2ZURlc2NlbmRhbnQoKSBjb25zdAogICAgIEFTU0VSVChh Y3RpdmVEZXNjZW5kYW50cy5zaXplKCkgPD0gMSk7CiAgICAgaWYgKCFhY3RpdmVEZXNjZW5kYW50 cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBhY3RpdmVEZXNjZW5kYW50c1swXS5nZXQoKTsK LQotICAgIC8vIFdoZW4gdGhlIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMgZm9yIGEgY29tYm9i b3gsIHRoZSB0YXJnZXQKLSAgICAvLyBvZiB0aGUgbm90aWZpY2F0aW9uIGlzIHRoZSBvd25lZCBv ciBjb250cm9sbGVkIGVsZW1lbnQgb2YgdGhlIGNvbWJvYm94Ci0gICAgLy8gaWYgZXhpc3RzLCBt b3N0IGNvbW1vbmx5IGEgbGlzdCBvciBsaXN0Ym94IChzZWVlIEFYT2JqZWN0Q2FjaGU6OmhhbmRs ZUFjdGl2ZURlc2NlbmRhbnRDaGFuZ2UpLgotICAgIC8vIFRodXMsIGEgY2xpZW50IGNvdWxkIHJl cXVlc3QgdGhlIG5ldyBhY3RpdmUgZGVzY2VuZGFudCBmcm9tIHRoZSBsaXN0IG9yCi0gICAgLy8g bGlzdGJveC4gVG8gc3VwcG9ydCB0aGlzIHNjZW5hcmlvLCB3ZSB0cnkgdG8gZ2V0IHRoZSBjb250 cm9sbGVyIG9yIG93bmVyCi0gICAgLy8gY29tYm9ib3ggaWYgZXhpc3RzIGFuZCByZXR1cm4gaXRz IGFjdGl2ZSBkZXNjZW5kYW50LgotICAgIGlmIChjYW5CZUNvbnRyb2xsZWRCeShBY2Nlc3NpYmls aXR5Um9sZTo6Q29tYm9Cb3gpKSB7Ci0gICAgICAgIGF1dG8gY29udHJvbGxlcnMgPSB0aGlzLT5j b250cm9sbGVycygpOwotICAgICAgICBpZiAoY29udHJvbGxlcnMuaXNFbXB0eSgpKQotICAgICAg ICAgICAgY29udHJvbGxlcnMgPSBvd25lcnMoKTsKLSAgICAgICAgaWYgKGNvbnRyb2xsZXJzLmlz RW1wdHkoKSkKLSAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgICAgIGF1dG8gY29t Ym9ib3ggPSBzdGQ6OmZpbmRfaWYoY29udHJvbGxlcnMuYmVnaW4oKSwgY29udHJvbGxlcnMuZW5k KCksIFtdIChjb25zdCBhdXRvJiBvYmplY3QpIHsKLSAgICAgICAgICAgIHJldHVybiBvYmplY3Qt PmlzQ29tYm9Cb3goKTsKLSAgICAgICAgfSk7Ci0gICAgICAgIGlmIChjb21ib2JveCAhPSBjb250 cm9sbGVycy5lbmQoKSkKLSAgICAgICAgICAgIHJldHVybiAoKmNvbWJvYm94KS0+YWN0aXZlRGVz Y2VuZGFudCgpOwotICAgIH0KLQogICAgIHJldHVybiBudWxscHRyOwogfQogCi1ib29sIEFYQ29y ZU9iamVjdDo6Y2FuQmVDb250cm9sbGVkQnkoQWNjZXNzaWJpbGl0eVJvbGUgY29udHJvbGxlclJv bGUpIGNvbnN0Ci17Ci0gICAgaWYgKGNvbnRyb2xsZXJSb2xlID09IEFjY2Vzc2liaWxpdHlSb2xl OjpDb21ib0JveCkgewotICAgICAgICBzd2l0Y2ggKHJvbGVWYWx1ZSgpKSB7Ci0gICAgICAgIGNh c2UgQWNjZXNzaWJpbGl0eVJvbGU6OkdyaWQ6Ci0gICAgICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJv bGU6Okxpc3Q6Ci0gICAgICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6Okxpc3RCb3g6Ci0gICAg ICAgIGNhc2UgQWNjZXNzaWJpbGl0eVJvbGU6OlRyZWU6Ci0gICAgICAgIGNhc2UgQWNjZXNzaWJp bGl0eVJvbGU6OlRyZWVHcmlkOgotICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgIGRl ZmF1bHQ6Ci0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAg Ly8gRklYTUU6IGFkZCBvdGhlciByZXN0cmljdGlvbnMuCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0K IEFYQ29yZU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIEFYQ29yZU9iamVjdDo6 c2VsZWN0ZWRDZWxscygpCiB7CiAgICAgaWYgKCFpc1RhYmxlKCkpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BWENvcmVPYmplY3QuaAppbmRleCAzZDBjMTA4OWFiMTcuLjU1MGIxNDcw N2JjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWENvcmVPYmpl Y3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYQ29yZU9iamVjdC5oCkBA IC0xMDU2LDcgKzEwNTYsNiBAQCBwdWJsaWM6CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVj dG9yIG93bmVkT2JqZWN0cygpIGNvbnN0IHsgcmV0dXJuIHJlbGF0ZWRPYmplY3RzKEFYUmVsYXRp b25UeXBlOjpPd25lckZvcik7IH0KICAgICBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Igb3du ZXJzKCkgY29uc3QgeyByZXR1cm4gcmVsYXRlZE9iamVjdHMoQVhSZWxhdGlvblR5cGU6Ok93bmVk QnkpOyB9CiAgICAgdmlydHVhbCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3IgcmVsYXRlZE9i amVjdHMoQVhSZWxhdGlvblR5cGUpIGNvbnN0ID0gMDsKLSAgICBib29sIGNhbkJlQ29udHJvbGxl ZEJ5KEFjY2Vzc2liaWxpdHlSb2xlKSBjb25zdDsKIAogICAgIHZpcnR1YWwgQVhDb3JlT2JqZWN0 KiBpbnRlcm5hbExpbmtFbGVtZW50KCkgY29uc3QgPSAwOwogICAgIHZvaWQgYXBwZW5kUmFkaW9C dXR0b25Hcm91cE1lbWJlcnMoQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yJiBsaW5rZWRVSUVs ZW1lbnRzKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0 Q2FjaGUuY3BwCmluZGV4IGFmODM2N2Y1YTdiMC4uZmFjZTliOWFiZTI0IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKQEAgLTIzNzAsMjYgKzIz NzAsMjAgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdl KEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEF0b21TdHIKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAotICAgIC8vIEhhbmRsZSBhY3RpdmUtZGVzY2VuZGFudCBjaGFuZ2VzIHdoZW4gdGhlIHRhcmdl dCBhbGxvd3MgZm9yIGl0LCBvciB0aGUgY29udHJvbGxlZCBvYmplY3QgYWxsb3dzIGZvciBpdC4K LSAgICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gdGFyZ2V0OwogICAgIGlmIChvYmplY3Qt PnNob3VsZEZvY3VzQWN0aXZlRGVzY2VuZGFudCgpKSB7CiAjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJ VFlfSVNPTEFURURfVFJFRSkKICAgICAgICAgc2V0SXNvbGF0ZWRUcmVlRm9jdXNlZE9iamVjdChh Y3RpdmVEZXNjZW5kYW50LmdldCgpKTsKICNlbmRpZgotICAgICAgICB0YXJnZXQgPSBvYmplY3Q7 Ci0gICAgfSBlbHNlIGlmIChvYmplY3QtPmlzQ29tYm9Cb3goKSkgewotICAgICAgICAvLyBJZiB0 aGUgY29tYm9ib3gncyBhY3RpdmVEZXNjZW5kYW50IGlzIGluc2lkZSBhIGRlc2NlbmRhbnQgb3du ZWQgb3IgY29udHJvbGxlZCBieSB0aGUgY29tYm9ib3gsIHRoYXQgZGVzY2VuZGFudCBzaG91bGQg YmUgdGhlIHRhcmdldCBvZiB0aGUgbm90aWZpY2F0aW9uIGFuZCBub3QgdGhlIGNvbWJvYm94IGl0 c2VsZi4KLSAgICAgICAgaWYgKGF1dG8qIG93bmVkT2JqZWN0ID0gQWNjZXNzaWJpbGl0eTo6Zmlu ZFJlbGF0ZWRPYmplY3RJbkFuY2VzdHJ5KCpvYmplY3QsIEFYUmVsYXRpb25UeXBlOjpPd25lckZv ciwgKmFjdGl2ZURlc2NlbmRhbnQpKQotICAgICAgICAgICAgdGFyZ2V0ID0gb3duZWRPYmplY3Q7 Ci0gICAgICAgIGVsc2UgaWYgKGF1dG8qIGNvbnRyb2xsZWRPYmplY3QgPSBBY2Nlc3NpYmlsaXR5 OjpmaW5kUmVsYXRlZE9iamVjdEluQW5jZXN0cnkoKm9iamVjdCwgQVhSZWxhdGlvblR5cGU6OkNv bnRyb2xsZXJGb3IsICphY3RpdmVEZXNjZW5kYW50KSkKLSAgICAgICAgICAgIHRhcmdldCA9IGNv bnRyb2xsZWRPYmplY3Q7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRhcmdldCA9IG9iamVj dDsKLSAgICB9IGVsc2UgaWYgKG9iamVjdC0+c3VwcG9ydHNBY3RpdmVEZXNjZW5kYW50KCkpCisg ICAgICAgIHBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbigqYWN0aXZlRGVzY2VuZGFudCwgQVhOb3Rp ZmljYXRpb246OkFYRm9jdXNlZFVJRWxlbWVudENoYW5nZWQpOworICAgIH0KKworICAgIC8vIEhh bmRsZSBhY3RpdmUtZGVzY2VuZGFudCBjaGFuZ2VzIHdoZW4gdGhlIHRhcmdldCBhbGxvd3MgZm9y IGl0LCBvciB0aGUgY29udHJvbGxlZCBvYmplY3QgYWxsb3dzIGZvciBpdC4KKyAgICBSZWZQdHI8 QWNjZXNzaWJpbGl0eU9iamVjdD4gdGFyZ2V0OworICAgIGlmIChvYmplY3QtPnN1cHBvcnRzQWN0 aXZlRGVzY2VuZGFudCgpKQogICAgICAgICB0YXJnZXQgPSBvYmplY3Q7CiAgICAgZWxzZSB7Ci0g ICAgICAgIC8vIENoZWNrIHRvIHNlZSBpZiB0aGUgYWN0aXZlIGRlc2NlbmRhbnQgaXMgYSBjaGls ZCBvZiB0aGUgY29udHJvbGxlZCBvYmplY3QuIFRoZW4gd2UgaGF2ZSB0byB1c2UgdGhhdAotICAg ICAgICAvLyBjb250cm9sbGVkIG9iamVjdCBhcyB0aGUgdGFyZ2V0IHdlIHVzZSBpbiBub3RpZmlj YXRpb25zLgorICAgICAgICAvLyBDaGVjayB0byBzZWUgaWYgdGhlIGFjdGl2ZSBkZXNjZW5kYW50 IGlzIGEgZGVzY2VuZGFudCBvZiBhbiBvYmplY3QgY29udHJvbGxlZCBieSB0aGlzIG9iamVjdC4K KyAgICAgICAgLy8gSW4gdGhhdCBjYXNlLCB0aGUgY29udHJvbGxlZCBvYmplY3Qgd2lsbCBiZSB0 aGUgdGFyZ2V0IGZvciB0aGUgbm90aWZpY2F0aW9uLgogICAgICAgICBhdXRvIGNvbnRyb2xsZWRP YmplY3RzID0gb2JqZWN0LT5yZWxhdGVkT2JqZWN0cyhBWFJlbGF0aW9uVHlwZTo6Q29udHJvbGxl ckZvcik7CiAgICAgICAgIGlmIChjb250cm9sbGVkT2JqZWN0cy5zaXplKCkpIHsKICAgICAgICAg ICAgIHRhcmdldCA9IEFjY2Vzc2liaWxpdHk6OmZpbmRBbmNlc3RvcigqYWN0aXZlRGVzY2VuZGFu dCwgZmFsc2UsIFsmY29udHJvbGxlZE9iamVjdHNdIChjb25zdCBhdXRvJiBhY3RpdmVEZXNjZW5k YW50QW5jZXN0b3IpIHsKQEAgLTI0MDEsMjEgKzIzOTUsMTAgQEAgdm9pZCBBWE9iamVjdENhY2hl OjpoYW5kbGVBY3RpdmVEZXNjZW5kYW50Q2hhbmdlKEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IEF0 b21TdHIKICAgICBpZiAoIXRhcmdldCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHRhcmdl dCA9PSBvYmplY3QpIHsKLSAgICAgICAgaWYgKHRhcmdldC0+aXNDb21ib0JveCgpKSB7Ci0gICAg ICAgICAgICAvLyBUaGUgY29tYm9ib3ggZG9lcyBub3Qgb3duIG9yIGNvbnRyb2wgdGhlIGVsZW1l bnQgdG8gd2hpY2ggYWN0aXZlRGVzY2VuZGFudCBiZWxvbmdzLgotICAgICAgICAgICAgLy8gRXN0 YWJsaXNoIHRoaXMgaW1wbGljaXQgcmVsYXRpb25zaGlwLgotICAgICAgICAgICAgUmVmUHRyIGNv bnRyb2xsZWQgPSBBY2Nlc3NpYmlsaXR5OjpmaW5kQW5jZXN0b3IoKmFjdGl2ZURlc2NlbmRhbnQs IGZhbHNlLCBbXSAoY29uc3QgYXV0byYgYW5jZXN0b3IpIHsKLSAgICAgICAgICAgICAgICByZXR1 cm4gYW5jZXN0b3IuY2FuQmVDb250cm9sbGVkQnkoQWNjZXNzaWJpbGl0eVJvbGU6OkNvbWJvQm94 KTsKLSAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgaWYgKGNvbnRyb2xsZWQpCi0gICAgICAg ICAgICAgICAgYWRkUmVsYXRpb24odGFyZ2V0LmdldCgpLCBjb250cm9sbGVkLmdldCgpLCBBWFJl bGF0aW9uVHlwZTo6Q29udHJvbGxlckZvcik7Ci0gICAgICAgIH0KLSAgICB9IGVsc2UgewogI2lm IEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCisgICAgaWYgKHRhcmdldCAhPSBv YmplY3QpCiAgICAgICAgIHVwZGF0ZUlzb2xhdGVkVHJlZSh0YXJnZXQuZ2V0KCksIEFYTm90aWZp Y2F0aW9uOjpBWEFjdGl2ZURlc2NlbmRhbnRDaGFuZ2VkKTsKICNlbmRpZgotICAgIH0KIAogICAg IHBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbigqdGFyZ2V0LCBBWE5vdGlmaWNhdGlvbjo6QVhBY3Rp dmVEZXNjZW5kYW50Q2hhbmdlZCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvYXRzcGkvQVhPYmplY3RDYWNoZUF0c3BpLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvYXRzcGkvQVhPYmplY3RDYWNoZUF0c3BpLmNwcAppbmRleCA2MzQ1YWE5Nzcz ODAuLmU0ZDgxMjQ4OTk1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9hdHNwaS9BWE9iamVjdENhY2hlQXRzcGkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvYXRzcGkvQVhPYmplY3RDYWNoZUF0c3BpLmNwcApAQCAtMTM2LDEyICsxMzYsNyBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbihBY2Nlc3NpYmls aXR5T2JqZWN0JiBjb3JlT2JqZWN0LCBBWAogICAgICAgICB3cmFwcGVyLT5zdGF0ZUNoYW5nZWQo InJlcXVpcmVkIiwgY29yZU9iamVjdC5pc1JlcXVpcmVkKCkpOwogICAgICAgICBicmVhazsKICAg ICBjYXNlIEFYQWN0aXZlRGVzY2VuZGFudENoYW5nZWQ6Ci0gICAgICAgIGlmIChhdXRvKiBkZXNj ZW5kYW50ID0gY29yZU9iamVjdC5hY3RpdmVEZXNjZW5kYW50KCkpIHsKLSAgICAgICAgICAgIGlm IChjb3JlT2JqZWN0LmlzQ29tYm9Cb3goKSB8fCBjb3JlT2JqZWN0LmNhbkJlQ29udHJvbGxlZEJ5 KEFjY2Vzc2liaWxpdHlSb2xlOjpDb21ib0JveCkpCi0gICAgICAgICAgICAgICAgd3JhcHBlci0+ YWN0aXZlRGVzY2VuZGFudENoYW5nZWQoKTsKLSAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAg ICAgICBwbGF0Zm9ybUhhbmRsZUZvY3VzZWRVSUVsZW1lbnRDaGFuZ2VkKG51bGxwdHIsIGRlc2Nl bmRhbnQtPm5vZGUoKSk7Ci0gICAgICAgIH0KKyAgICAgICAgd3JhcHBlci0+YWN0aXZlRGVzY2Vu ZGFudENoYW5nZWQoKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBBWENoaWxkcmVuQ2hhbmdl ZDoKICAgICAgICAgY29yZU9iamVjdC51cGRhdGVDaGlsZHJlbklmTmVjZXNzYXJ5KCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFj Lm1tIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5t bQppbmRleCBhNGRjMGQ0NGNhNmYuLjYwMjJmMWVjOTEzZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvQVhPYmplY3RDYWNoZU1hYy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9BWE9iamVjdENhY2hlTWFjLm1tCkBAIC0zMjgsMTAg KzMyOCw3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6cG9zdFBsYXRmb3JtTm90aWZpY2F0aW9uKEFj Y2Vzc2liaWxpdHlPYmplY3QmIG9iamVjdCwgQVhOb3RpCiAgICAgTlNTdHJpbmcgKm1hY05vdGlm aWNhdGlvbjsKICAgICBzd2l0Y2ggKG5vdGlmaWNhdGlvbikgewogICAgIGNhc2UgQVhBY3RpdmVE ZXNjZW5kYW50Q2hhbmdlZDoKLSAgICAgICAgaWYgKG9iamVjdC5pc0NvbWJvQm94KCkgfHwgb2Jq ZWN0LmNhbkJlQ29udHJvbGxlZEJ5KEFjY2Vzc2liaWxpdHlSb2xlOjpDb21ib0JveCkpCi0gICAg ICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBAIkFYQWN0aXZlRWxlbWVudENoYW5nZWQiOwotICAg ICAgICBlbHNlCi0gICAgICAgICAgICBtYWNOb3RpZmljYXRpb24gPSBOU0FjY2Vzc2liaWxpdHlG b2N1c2VkVUlFbGVtZW50Q2hhbmdlZE5vdGlmaWNhdGlvbjsKKyAgICAgICAgbWFjTm90aWZpY2F0 aW9uID0gQCJBWEFjdGl2ZUVsZW1lbnRDaGFuZ2VkIjsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBBWEF1dG9jb3JyZWN0aW9uT2NjdXJlZDoKICAgICAgICAgbWFjTm90aWZpY2F0aW9uID0gQCJB WEF1dG9jb3JyZWN0aW9uT2NjdXJyZWQiOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L2FyaWEtY29tYm9i b3gtY29udHJvbC1vd25zLWVsZW1lbnRzLWV4cGVjdGVkLnR4dAppbmRleCA5Y2M4ZmRkYzU1Njku LjA0NDY2N2VlYWQyYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21i b2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRy b2wtb3ducy1lbGVtZW50cy1leHBlY3RlZC50eHQKQEAgLTEsMTMgKzEsMTMgQEAKIFRoaXMgdGVz dHMgdmFyaWF0aW9ucyBvZiB0aGUgY29tYm9ib3hlcyBhbmQgZWxlbWVudHMgaXQgY2FuIGNvbnRy b2wgYW5kIG93bi4gVGhlbiB2ZXJpZmllcyB0aGUgYWN0aXZlLWRlc2NlbmRhbnQgaXMgcmVmbGVj dGVkIGNvcnJlY3RseS4KIAotUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBMaXN0MQotUEFTUzog bGlzdC5hY3RpdmVFbGVtZW50LmlzRXF1YWwobGlzdGl0ZW0xKSA9PT0gdHJ1ZQotUmVjZWl2ZWQg bm90aWZpY2F0aW9uIGZvciBMaXN0Ym94MgotUEFTUzogbGlzdGJveC5hY3RpdmVFbGVtZW50Lmlz RXF1YWwob3B0aW9uMl8xKSA9PT0gdHJ1ZQotUmVjZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBHcmlk MwotUEFTUzogZ3JpZC5hY3RpdmVFbGVtZW50LmlzRXF1YWwocm93M18xKSA9PT0gdHJ1ZQotUmVj ZWl2ZWQgbm90aWZpY2F0aW9uIGZvciBUcmVlNAotUEFTUzogdHJlZS5hY3RpdmVFbGVtZW50Lmlz RXF1YWwodHJlZWl0ZW00XzEpID09PSB0cnVlCitSZWNlaXZlZCBub3RpZmljYXRpb24gZm9yIENv bWJvYm94MQorUEFTUzogY29tYm9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3RpdGVtMSkg PT09IHRydWUKK1JlY2VpdmVkIG5vdGlmaWNhdGlvbiBmb3IgQ29tYm9ib3gyCitQQVNTOiBjb21i b2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwob3B0aW9uMl8xKSA9PT0gdHJ1ZQorUmVjZWl2ZWQg bm90aWZpY2F0aW9uIGZvciBDb21ib2JveDMKK1BBU1M6IGNvbWJvYm94LmFjdGl2ZUVsZW1lbnQu aXNFcXVhbChyb3czXzEpID09PSB0cnVlCitSZWNlaXZlZCBub3RpZmljYXRpb24gZm9yIENvbWJv Ym94NAorUEFTUzogY29tYm9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKHRyZWVpdGVtNF8xKSA9 PT0gdHJ1ZQogCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9s LW93bnMtZWxlbWVudHMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gv YXJpYS1jb21ib2JveC1jb250cm9sLW93bnMtZWxlbWVudHMuaHRtbAppbmRleCBmN2JkYTk4Y2E3 ZjEuLjQyOGY5OTI5MTZmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9j b21ib2JveC9hcmlhLWNvbWJvYm94LWNvbnRyb2wtb3ducy1lbGVtZW50cy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1jb250cm9sLW93 bnMtZWxlbWVudHMuaHRtbApAQCAtNTEsNDUgKzUxLDQ1IEBAIGlmICh3aW5kb3cuYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIpIHsKIAogICAgIC8vIEV4YW1wbGUgMTogYXJpYS1jb250cm9scyBhIGxp c3QuCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94MSIpLmZvY3VzKCk7Ci0g ICAgbGlzdCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgi bGlzdDEiKTsKKyAgICBjb21ib2JveCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgiY29tYm9ib3gxIik7CiAgICAgLy8gU2V0IGFjdGl2ZS1kZXNjZW5kYW50 LCB2ZXJpZnkgbm90aWZpY2F0aW9uIGlzIHNlbnQgYW5kIHRoYXQgbGlzdCBoYXMgY29ycmVjdCBh Y3RpdmUgZWxlbWVudC4KICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3gxIiku c2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAiaXRlbTFfMSIpOwogICAgIHNl dFRpbWVvdXQoYXN5bmMgKCkgPT4gewogICAgICAgICBsaXN0aXRlbTEgPSBhY2Nlc3NpYmlsaXR5 Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoIml0ZW0xXzEiKTsKLSAgICAgICAgb3V0 cHV0ICs9IGV4cGVjdCgibGlzdC5hY3RpdmVFbGVtZW50LmlzRXF1YWwobGlzdGl0ZW0xKSIsICJ0 cnVlIik7CisgICAgICAgIG91dHB1dCArPSBleHBlY3QoImNvbWJvYm94LmFjdGl2ZUVsZW1lbnQu aXNFcXVhbChsaXN0aXRlbTEpIiwgInRydWUiKTsKIAogICAgICAgICAvLyBFeGFtcGxlIDI6IGFy aWEtb3ducyBhIGxpc3Rib3guCiAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21i b2JveDIiKS5mb2N1cygpOwotICAgICAgICBsaXN0Ym94ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJsaXN0Ym94MiIpOworICAgICAgICBjb21ib2JveCA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY29tYm9ib3gy Iik7CiAgICAgICAgIC8vIFNldCBhY3RpdmUtZGVzY2VuZGFudCwgdmVyaWZ5IG5vdGlmaWNhdGlv biBpcyBzZW50IGFuZCB0aGF0IGxpc3QgaGFzIGNvcnJlY3QgYWN0aXZlIGVsZW1lbnQuCiAgICAg ICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21ib2JveDIiKS5zZXRBdHRyaWJ1dGUoImFy aWEtYWN0aXZlZGVzY2VuZGFudCIsICJvcHRpb24yXzEiKTsKICAgICAgICAgb3B0aW9uMl8xID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJvcHRpb24yXzEi KTsKICAgICAgICAgYXdhaXQgd2FpdEZvcigoKSA9PiB7CiAgICAgICAgICAgICByZXR1cm4gYWN0 aXZlRWxlbWVudENoYW5nZUNvdW50ID09IDI7CiAgICAgICAgIH0pOwotICAgICAgICBvdXRwdXQg Kz0gZXhwZWN0KCJsaXN0Ym94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChvcHRpb24yXzEpIiwgInRy dWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgiY29tYm9ib3guYWN0aXZlRWxlbWVudC5p c0VxdWFsKG9wdGlvbjJfMSkiLCAidHJ1ZSIpOwogCiAgICAgICAgIC8vIEV4YW1wbGUgMzogYXJp YS1vd25zIGEgZ3JpZC4KICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94 MyIpLmZvY3VzKCk7Ci0gICAgICAgIGdyaWQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nl c3NpYmxlRWxlbWVudEJ5SWQoImdyaWQzIik7CisgICAgICAgIGNvbWJvYm94ID0gYWNjZXNzaWJp bGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjb21ib2JveDMiKTsKICAgICAg ICAgLy8gU2V0IGFjdGl2ZS1kZXNjZW5kYW50LCB2ZXJpZnkgbm90aWZpY2F0aW9uIGlzIHNlbnQg YW5kIHRoYXQgbGlzdCBoYXMgY29ycmVjdCBhY3RpdmUgZWxlbWVudC4KICAgICAgICAgZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94MyIpLnNldEF0dHJpYnV0ZSgiYXJpYS1hY3RpdmVk ZXNjZW5kYW50IiwgInJvdzNfMSIpOwogICAgICAgICByb3czXzEgPSBhY2Nlc3NpYmlsaXR5Q29u dHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInJvdzNfMSIpOwogICAgICAgICBhd2FpdCB3 YWl0Rm9yKCgpID0+IHsKICAgICAgICAgICAgIHJldHVybiBhY3RpdmVFbGVtZW50Q2hhbmdlQ291 bnQgPT0gMzsKICAgICAgICAgfSk7Ci0gICAgICAgIG91dHB1dCArPSBleHBlY3QoImdyaWQuYWN0 aXZlRWxlbWVudC5pc0VxdWFsKHJvdzNfMSkiLCAidHJ1ZSIpOworICAgICAgICBvdXRwdXQgKz0g ZXhwZWN0KCJjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwocm93M18xKSIsICJ0cnVlIik7 CiAKICAgICAgICAgLy8gRXhhbXBsZSA0OiBhcmlhLW93bnMgYSB0cmVlLgogICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9ib3g0IikuZm9jdXMoKTsKLSAgICAgICAgdHJlZSA9 IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidHJlZTQiKTsK KyAgICAgICAgY29tYm9ib3ggPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxl bWVudEJ5SWQoImNvbWJvYm94NCIpOwogICAgICAgICAvLyBTZXQgYWN0aXZlLWRlc2NlbmRhbnQs IHZlcmlmeSBub3RpZmljYXRpb24gaXMgc2VudCBhbmQgdGhhdCB0cmVlIGhhcyBjb3JyZWN0IGFj dGl2ZSBkZXNjZW5kYW50LgogICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tYm9i b3g0Iikuc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAidHJlZWl0ZW00XzEi KTsKICAgICAgICAgdHJlZWl0ZW00XzEgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3Np YmxlRWxlbWVudEJ5SWQoInRyZWVpdGVtNF8xIik7CiAgICAgICAgIGF3YWl0IHdhaXRGb3IoKCkg PT4gewogICAgICAgICAgICAgcmV0dXJuIGFjdGl2ZUVsZW1lbnRDaGFuZ2VDb3VudCA9PSA0Owog ICAgICAgICB9KTsKLSAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgidHJlZS5hY3RpdmVFbGVtZW50 LmlzRXF1YWwodHJlZWl0ZW00XzEpIiwgInRydWUiKTsKKyAgICAgICAgb3V0cHV0ICs9IGV4cGVj dCgiY29tYm9ib3guYWN0aXZlRWxlbWVudC5pc0VxdWFsKHRyZWVpdGVtNF8xKSIsICJ0cnVlIik7 CiAKICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIucmVtb3ZlTm90aWZpY2F0aW9uTGlz dGVuZXIoKTsKICAgICAgICAgZGVidWcob3V0cHV0KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1vd25zLWV4cGVjdGVkLnR4 dCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2JveC1uby1v d25zLWV4cGVjdGVkLnR4dAppbmRleCBjNjEyZmZjZDNiYzUuLmRkOGI4ZThiOTNmMyAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94LW5v LW93bnMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9i b3gvYXJpYS1jb21ib2JveC1uby1vd25zLWV4cGVjdGVkLnR4dApAQCAtMSw2ICsxLDYgQEAKIEEg Y29tYm9ib3ggc2hvdWxkIHN0aWxsIHN1cHBvcnQgYXJpYS1hY3RpdmVkZXNjZW5kYW50IGV2ZW4g aWYgaXQgZG9lc24ndCB1c2UgYXJpYS1vd25zLgogUmVjZWl2ZWQgQVhBY3RpdmVFbGVtZW50Q2hh bmdlZCBmb3IgQ29tYm9ib3gKLVBBU1M6IGxpc3QuYWN0aXZlRWxlbWVudC5pc0VxdWFsKGxpc3Rp dGVtMSkgPT09IHRydWUKK1BBU1M6IGNvbWJvYm94LmFjdGl2ZUVsZW1lbnQuaXNFcXVhbChsaXN0 aXRlbTEpID09PSB0cnVlCiAKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9hcmlhLWNvbWJvYm94 LW5vLW93bnMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1j b21ib2JveC1uby1vd25zLmh0bWwKaW5kZXggNzdjNTg5MGIxNmE5Li4yNGRmZTlkY2UxYTcgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9ib3gvYXJpYS1jb21ib2Jv eC1uby1vd25zLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9jb21ib2JveC9h cmlhLWNvbWJvYm94LW5vLW93bnMuaHRtbApAQCAtMjcsMTcgKzI3LDE3IEBAIGlmICh3aW5kb3cu YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKICAgICB9KTsKIAogICAgIGRvY3VtZW50LmdldEVs ZW1lbnRCeUlkKCJjb21ib2JveCIpLmZvY3VzKCk7Ci0gICAgdmFyIGxpc3QgPSBhY2Nlc3NpYmls aXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImxpc3QiKTsKKyAgICB2YXIgY29t Ym9ib3ggPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNv bWJvYm94Iik7CiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbWJvYm94Iikuc2V0QXR0 cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAiaXRlbTEiKTsKICAgICB2YXIgbGlzdGl0 ZW0xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJpdGVt MSIpOwogICAgIHNldFRpbWVvdXQoYXN5bmMgZnVuY3Rpb24oKSB7CiAgICAgICAgIGF3YWl0IHdh aXRGb3IoKCkgPT4gewogICAgICAgICAgICAgcmV0dXJuIGFjdGl2ZUVsZW1lbnRDaGFuZ2VDb3Vu dDsKICAgICAgICAgfSk7Ci0gICAgICAgIG91dHB1dCArPSBleHBlY3QoImxpc3QuYWN0aXZlRWxl bWVudC5pc0VxdWFsKGxpc3RpdGVtMSkiLCAidHJ1ZSIpOworICAgICAgICBvdXRwdXQgKz0gZXhw ZWN0KCJjb21ib2JveC5hY3RpdmVFbGVtZW50LmlzRXF1YWwobGlzdGl0ZW0xKSIsICJ0cnVlIik7 CiAKLSAgICAgICAgZGVidWcob3V0cHV0KTsKICAgICAgICAgYWNjZXNzaWJpbGl0eUNvbnRyb2xs ZXIucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKKyAgICAgICAgZGVidWcob3V0cHV0KTsK ICAgICAgICAgZmluaXNoSlNUZXN0KCk7CiAgICAgfSwgMCk7CiB9CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L21hYy9jb21ib2JveC1hY3RpdmVkZXNjZW5k YW50LW5vdGlmaWNhdGlvbnMuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvY29tYm9i b3gvbWFjL2NvbWJvYm94LWFjdGl2ZWRlc2NlbmRhbnQtbm90aWZpY2F0aW9ucy5odG1sCmluZGV4 IGIzMzBhZjYwNjRlOC4uMThlMzgwYTczMjQzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nl c3NpYmlsaXR5L2NvbWJvYm94L21hYy9jb21ib2JveC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNh dGlvbnMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2NvbWJvYm94L21hYy9j b21ib2JveC1hY3RpdmVkZXNjZW5kYW50LW5vdGlmaWNhdGlvbnMuaHRtbApAQCAtOSwzOSArOSwz OCBAQAogPGRpdiBpZD0iY29udGVudCI+CiA8aW5wdXQgdHlwZT0idGV4dCIgcm9sZT0iY29tYm9i b3giIGlkPSJjb21ibyIgYXJpYS1vd25zPSJsaXN0Ij4KIDx1bCBpZD0ibGlzdCIgcm9sZT0ibGlz dGJveCI+Ci08bGkgdGFiaW5kZXg9IjAiIHJvbGU9Im9wdGlvbiIgaWQ9Iml0ZW0xIj5pdGVtMTwv bGk+CisgICAgPGxpIHRhYmluZGV4PSIwIiByb2xlPSJvcHRpb24iIGlkPSJpdGVtMSI+aXRlbTE8 L2xpPgogPC91bD4KIDwvZGl2PgogCiA8c2NyaXB0PgotICAgIGxldCBvdXRwdXQgPSAiVGhpcyB0 ZXN0IG1ha2VzIHN1cmUgdGhhdCBhbiBBUklBIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZSBkb2Vz IG5vdCBjaGFuZ2UgZm9jdXMsIGJlY2F1c2UgZm9jdXMgc2hvdWxkIHJlbWFpbiBpbiB0aGUgdGV4 dGZpZWxkIHBvcnRpb24gb2YgdGhlIGNvbWJvIGJveC5cblxuIjsKK2xldCBvdXRwdXQgPSAiVGhp cyB0ZXN0IG1ha2VzIHN1cmUgdGhhdCBhbiBBUklBIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZSBk b2VzIG5vdCBjaGFuZ2UgZm9jdXMsIGJlY2F1c2UgZm9jdXMgc2hvdWxkIHJlbWFpbiBpbiB0aGUg dGV4dGZpZWxkIHBvcnRpb24gb2YgdGhlIGNvbWJvIGJveC5cblxuIjsKIAotICAgIGlmICh3aW5k b3cudGVzdFJ1bm5lciAmJiB3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKLSAgICAg ICAganNUZXN0SXNBc3luYyA9IHRydWU7CitpZiAod2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9s bGVyKSB7CisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOwogCi0gICAgICAgIGNvbWJv LmZvY3VzKCk7Ci0gICAgICAgIHZhciBheENvbWJvID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIu YWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJjb21ibyIpOwotICAgICAgICBvdXRwdXQgKz0gIlRoZSBD b21ib0JveCBzaG91bGQgc3RhcnQgb3V0IGFzIHRoZSBmb2N1c2VkIGVsZW1lbnQuXG4iOwotICAg ICAgICBvdXRwdXQgKz0gZXhwZWN0KCJheENvbWJvLmlzRXF1YWwoYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuZm9jdXNlZEVsZW1lbnQpIiwgInRydWUiKTsKKyAgICBjb21iby5mb2N1cygpOworICAg IHZhciBheENvbWJvID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRC eUlkKCJjb21ibyIpOworICAgIG91dHB1dCArPSAiVGhlIENvbWJvQm94IHNob3VsZCBzdGFydCBv dXQgYXMgdGhlIGZvY3VzZWQgZWxlbWVudC5cbiI7CisgICAgb3V0cHV0ICs9IGV4cGVjdCgiYXhD b21iby5pc0VxdWFsKGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50KSIsICJ0 cnVlIik7CiAKLSAgICAgICAgLy8gV2hlbiB0aGUgYWN0aXZlIGRlc2NlbmRhbnQgY2hhbmdlcywg d2Ugc2hvdWxkIHJlY2VpdmUgYSBzZWxlY3RlZCBjaGlsZHJlbiBjaGFuZ2VkIG5vdGlmaWNhdGlv bi4KLSAgICAgICAgdmFyIGF4TGlzdCA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2li bGVFbGVtZW50QnlJZCgibGlzdCIpOwotICAgICAgICBheExpc3QuYWRkTm90aWZpY2F0aW9uTGlz dGVuZXIoZnVuY3Rpb24obm90aWZpY2F0aW9uKSB7Ci0gICAgICAgICAgICBvdXRwdXQgKz0gYFJl Y2VpdmVkIG5vdGlmaWNhdGlvbjogJHtub3RpZmljYXRpb259XG5gOwotICAgICAgICAgICAgaWYg KG5vdGlmaWNhdGlvbiA9PSAiQVhBY3RpdmVFbGVtZW50Q2hhbmdlZCIpIHsKLSAgICAgICAgICAg ICAgICBvdXRwdXQgKz0gIlRoZSBDb21ib0JveCBzaG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQg ZWxlbWVudCBldmVuIGFmdGVyIHRoZSBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQgd2FzIGNoYW5nZWQu XG4iOwotICAgICAgICAgICAgICAgIG91dHB1dCArPSBleHBlY3QoImF4Q29tYm8uaXNFcXVhbChh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudCkiLCAidHJ1ZSIpOworICAgIC8v IFdoZW4gdGhlIGFjdGl2ZSBkZXNjZW5kYW50IGNoYW5nZXMsIHdlIHNob3VsZCByZWNlaXZlIGEg c2VsZWN0ZWQgY2hpbGRyZW4gY2hhbmdlZCBub3RpZmljYXRpb24uCisgICAgYXhDb21iby5hZGRO b3RpZmljYXRpb25MaXN0ZW5lcigobm90aWZpY2F0aW9uKSA9PiB7CisgICAgICAgIG91dHB1dCAr PSBgUmVjZWl2ZWQgbm90aWZpY2F0aW9uOiAke25vdGlmaWNhdGlvbn1cbmA7CisgICAgICAgIGlm IChub3RpZmljYXRpb24gPT0gIkFYQWN0aXZlRWxlbWVudENoYW5nZWQiKSB7CisgICAgICAgICAg ICBvdXRwdXQgKz0gIlRoZSBDb21ib0JveCBzaG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgZWxl bWVudCBldmVuIGFmdGVyIHRoZSBhcmlhLWFjdGl2ZWRlc2NlbmRhbnQgd2FzIGNoYW5nZWQuXG4i OworICAgICAgICAgICAgb3V0cHV0ICs9IGV4cGVjdCgiYXhDb21iby5pc0VxdWFsKGFjY2Vzc2li aWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50KSIsICJ0cnVlIik7CiAKLSAgICAgICAgICAg ICAgICBheExpc3QucmVtb3ZlTm90aWZpY2F0aW9uTGlzdGVuZXIoKTsKLSAgICAgICAgICAgICAg ICBjb250ZW50LnN0eWxlLnZpc2liaWxpdHkgPSAiaGlkZGVuIjsKLSAgICAgICAgICAgICAgICBk ZWJ1ZyhvdXRwdXQpOwotICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwotICAgICAgICAg ICAgfQotICAgICAgICB9KTsKKyAgICAgICAgICAgIGF4Q29tYm8ucmVtb3ZlTm90aWZpY2F0aW9u TGlzdGVuZXIoKTsKKyAgICAgICAgICAgIGNvbnRlbnQuc3R5bGUudmlzaWJpbGl0eSA9ICJoaWRk ZW4iOworICAgICAgICAgICAgZGVidWcob3V0cHV0KTsKKyAgICAgICAgICAgIGZpbmlzaEpTVGVz dCgpOworICAgICAgICB9CisgICAgfSk7CiAKLSAgICAgICAgLy8gQWZ0ZXIgdGhlIGRlc2NlbmRh bnQgY2hhbmdlcywgdGhlIGNvbWJvIGJveCBzaG91bGQgc3RpbGwgYmUgdGhlIGZvY3VzZWQgb2Jq ZWN0LgotICAgICAgICBjb21iby5zZXRBdHRyaWJ1dGUoImFyaWEtYWN0aXZlZGVzY2VuZGFudCIs ICJpdGVtMSIpOwotICAgIH0KKyAgICAvLyBBZnRlciB0aGUgZGVzY2VuZGFudCBjaGFuZ2VzLCB0 aGUgY29tYm8gYm94IHNob3VsZCBzdGlsbCBiZSB0aGUgZm9jdXNlZCBvYmplY3QuCisgICAgY29t Ym8uc2V0QXR0cmlidXRlKCJhcmlhLWFjdGl2ZWRlc2NlbmRhbnQiLCAiaXRlbTEiKTsKK30KIDwv c2NyaXB0PgogPC9ib2R5PgogPC9odG1sPgo=