210808 2020-04-21 11:30:32 -0700 [iOS] Provide better names for ProcessThrottler process assertions 2020-04-22 18:02:22 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen ggaren sam webkit-bug-importer oldest_to_newest 1643938 0 cdumez 2020-04-21 11:30:32 -0700 Provide better names for ProcessThrottler process assertions, to facilitate debugging. 1643939 1 397097 cdumez 2020-04-21 11:31:29 -0700 Created attachment 397097 Patch 1643940 2 webkit-bug-importer 2020-04-21 11:32:08 -0700 <rdar://problem/62121697> 1643964 3 397097 sam 2020-04-21 12:20:02 -0700 Comment on attachment 397097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397097&action=review > Source/WebKit/UIProcess/ProcessThrottler.cpp:105 > + String typeString; ASCIILiteral? > Source/WebKit/UIProcess/ProcessThrottler.cpp:115 > + case ProcessAssertionType::Foreground: > + typeString = "Foreground"; > + break; > + case ProcessAssertionType::Background: > + typeString = "Background"; > + break; > + case ProcessAssertionType::Suspended: > + typeString = "Suspended"; > + break; Why only these three? 1643967 4 397097 cdumez 2020-04-21 12:27:19 -0700 Comment on attachment 397097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397097&action=review >> Source/WebKit/UIProcess/ProcessThrottler.cpp:105 >> + String typeString; > > ASCIILiteral? Ok. >> Source/WebKit/UIProcess/ProcessThrottler.cpp:115 >> + break; > > Why only these three? Yes, we only use these 3 in the ProcessThrottler. 1643969 5 397097 cdumez 2020-04-21 12:30:09 -0700 Comment on attachment 397097 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397097&action=review >>> Source/WebKit/UIProcess/ProcessThrottler.cpp:115 >>> + break; >> >> Why only these three? > > Yes, we only use these 3 in the ProcessThrottler. See ProcessThrottler::expectedAssertionType() above. 1643997 6 397114 cdumez 2020-04-21 13:38:35 -0700 Created attachment 397114 Patch 1643999 7 397114 ggaren 2020-04-21 13:41:06 -0700 Comment on attachment 397114 Patch r=me 1644012 8 ews-feeder 2020-04-21 14:22:31 -0700 Committed r260453: <https://trac.webkit.org/changeset/260453> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397114. 1644607 9 397114 sam 2020-04-22 18:02:22 -0700 Comment on attachment 397114 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=397114&action=review > Source/WebKit/UIProcess/ProcessThrottler.cpp:115 > + case ProcessAssertionType::UnboundedNetworking: > + case ProcessAssertionType::MediaPlayback: > + case ProcessAssertionType::DependentProcessLink: Thumbs up. 397097 2020-04-21 11:31:29 -0700 2020-04-21 13:38:34 -0700 Patch bug-210808-20200421113128.patch text/plain 13027 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFkZmJiZjAzYWQwZmViYzc5 MjJlOTg5N2ViZDVkOGEzMWE2NThkZWIuLmFjYzU5ZmUwN2RlZjIxMDgyZWQxZmJiYjhhMWIzYmM5 ZmQwZWNjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBQcm92aWRlIGJldHRlciBu YW1lcyBmb3IgUHJvY2Vzc1Rocm90dGxlciBwcm9jZXNzIGFzc2VydGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDgwOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgYmV0dGVyIG5hbWVz IGZvciBQcm9jZXNzVGhyb3R0bGVyIHByb2Nlc3MgYXNzZXJ0aW9ucywgdG8gZmFjaWxpdGF0ZSBk ZWJ1Z2dpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Q cm9jZXNzQXNzZXJ0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjphc3NlcnRpb25OYW1lIGNv bnN0KToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlw ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NB bmRVSUFzc2VydGlvbik6CisKIDIwMjAtMDQtMjEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBUaWdodGVuIHVwIHNvbWUgbW9yZSBJUEMg bWVzc2FnZSBjaGVja3MgaW4gV2ViUGFzdGVib2FyZFByb3h5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgKaW5kZXggYmFkNzlhMzNmODM2MDBiYzMzZWFm NmY5OGIxZWFmNTY3ZTk3NDhkOS4uMzNiM2UyNzExYzU3MzFmMzE1NGY3MmZiNWNjMjFiN2U3OTg2 OWE3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQ cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHku aApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBQcm9jZXNzVGhyb3R0bGVyQ2xp ZW50CiAgICAgdm9pZCBzZW5kUHJvY2Vzc0RpZFJlc3VtZSgpIGZpbmFsIHsgfQorICAgIEFTQ0lJ TGl0ZXJhbCBjbGllbnROYW1lKCkgY29uc3QgZmluYWwgeyByZXR1cm4gIkdQVVByb2Nlc3MiX3M7 IH0KIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgdm9pZCBzZXRVc2VNb2NrQ2FwdHVy ZURldmljZXMoYm9vbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCmluZGV4IGVjYzkyZjljMTYyMDMyMzkxMTI0Y2RiMWVh ODI0ZjA2MzM0YTQ5MDEuLmIzNWMwNDUxZDI4YmFhMGNlZDc2NGMyYTZjYWMwN2I1MTZiYzI0Yjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1By b2Nlc3NQcm94eS5oCkBAIC0yMDcsNiArMjA3LDcgQEAgcHVibGljOgogCiAgICAgLy8gUHJvY2Vz c1Rocm90dGxlckNsaWVudAogICAgIHZvaWQgc2VuZFByb2Nlc3NEaWRSZXN1bWUoKSBmaW5hbDsK KyAgICBBU0NJSUxpdGVyYWwgY2xpZW50TmFtZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuICJOZXR3 b3JrUHJvY2VzcyJfczsgfQogICAgIAogICAgIHZvaWQgc2VuZFByb2Nlc3NXaWxsU3VzcGVuZElt bWluZW50bHlGb3JUZXN0aW5nKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vz c0Fzc2VydGlvbi5jcHAKaW5kZXggYjVhOTAxNDFkZDBmMWEwYmI3Y2VmMTBlNjE1ZTc1MTE5NDky YmFmMy4uZWM2ZDI5ZTg1Yjk1NDM4Y2ViZTZlNDZlOGVjYTNmN2I2MDhlMGFiMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTMyLDcgKzMyLDcg QEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24oUHJvY2Vzc0lEIHBpZCwgQVNDSUlMaXRlcmFsLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBh c3NlcnRpb25UeXBlKQorUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihQcm9jZXNz SUQgcGlkLCBjb25zdCBTdHJpbmcmLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBhc3NlcnRpb25UeXBl KQogICAgIDogbV9hc3NlcnRpb25UeXBlKGFzc2VydGlvblR5cGUpCiAgICAgLCBtX3BpZChwaWQp CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9u LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKaW5kZXggZDdi MDUwMWU1Mjg4M2VjZTA3NjFmNWJmODc3NGU5NmYwM2U0MWRkMC4uNGIwYjdmYjM1YTIyOGFjNWZm YTZhODgzZmRiNmQxZTJkMDE4NzYxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uaApAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZpcnR1YWwg dm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkgPSAwOwogICAgIH07CiAKLSAg ICBQcm9jZXNzQXNzZXJ0aW9uKFByb2Nlc3NJRCwgQVNDSUlMaXRlcmFsIHJlYXNvbiwgUHJvY2Vz c0Fzc2VydGlvblR5cGUpOworICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBjb25zdCBT dHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUpOwogICAgIHZpcnR1YWwgflByb2Nl c3NBc3NlcnRpb24oKTsKIAogICAgIHZvaWQgc2V0Q2xpZW50KENsaWVudCYgY2xpZW50KSB7IG1f Y2xpZW50ID0gJmNsaWVudDsgfQpAQCAtOTUsNyArOTUsNyBAQCBwcml2YXRlOgogCiBjbGFzcyBQ cm9jZXNzQW5kVUlBc3NlcnRpb24gZmluYWwgOiBwdWJsaWMgUHJvY2Vzc0Fzc2VydGlvbiB7CiBw dWJsaWM6Ci0gICAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKFByb2Nlc3NJRCwgQVNDSUlMaXRlcmFs IHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUpOworICAgIFByb2Nlc3NBbmRVSUFzc2VydGlv bihQcm9jZXNzSUQsIGNvbnN0IFN0cmluZyYgcmVhc29uLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSk7 CiAgICAgflByb2Nlc3NBbmRVSUFzc2VydGlvbigpOwogCiAgICAgdm9pZCB1aUFzc2VydGlvbldp bGxFeHBpcmVJbW1pbmVudGx5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm9jZXNzVGhyb3R0bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCmluZGV4IDdmNjc5NzE4OWVmMTdlYTAxZWM2MWQ4OTI1ZjM3ZjI0MzQ2Nzcy ZWIuLjRjOWIzOTk4ZTNkNDBlYzlkYTNlOTRjYjMyNzhjYjFkZDBmNzQ0YWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCkBAIC0xMDAsNiArMTAwLDI4 IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uVHlwZU5vdygpCiAgICAg c2V0QXNzZXJ0aW9uVHlwZShleHBlY3RlZEFzc2VydGlvblR5cGUoKSk7CiB9CiAKK1N0cmluZyBQ cm9jZXNzVGhyb3R0bGVyOjphc3NlcnRpb25OYW1lKFByb2Nlc3NBc3NlcnRpb25UeXBlIHR5cGUp IGNvbnN0Cit7CisgICAgU3RyaW5nIHR5cGVTdHJpbmc7CisgICAgc3dpdGNoICh0eXBlKSB7Cisg ICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6Rm9yZWdyb3VuZDoKKyAgICAgICAgdHlwZVN0 cmluZyA9ICJGb3JlZ3JvdW5kIjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQcm9jZXNzQXNz ZXJ0aW9uVHlwZTo6QmFja2dyb3VuZDoKKyAgICAgICAgdHlwZVN0cmluZyA9ICJCYWNrZ3JvdW5k IjsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6U3VzcGVu ZGVkOgorICAgICAgICB0eXBlU3RyaW5nID0gIlN1c3BlbmRlZCI7CisgICAgICAgIGJyZWFrOwor ICAgIGRlZmF1bHQ6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICB0eXBl U3RyaW5nID0gIlVua25vd24iOworICAgICAgICBicmVhazsKKyAgICB9CisKKyAgICByZXR1cm4g bWFrZVN0cmluZyhtX3Byb2Nlc3MuY2xpZW50TmFtZSgpLCAiICIsIHR5cGVTdHJpbmcsICIgQXNz ZXJ0aW9uIik7Cit9CisKIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlwZShQ cm9jZXNzQXNzZXJ0aW9uVHlwZSBuZXdUeXBlKQogewogICAgIGlmIChtX2Fzc2VydGlvbiAmJiBt X2Fzc2VydGlvbi0+dHlwZSgpID09IG5ld1R5cGUpCkBAIC0xMDcsOSArMTI5LDkgQEAgdm9pZCBQ cm9jZXNzVGhyb3R0bGVyOjpzZXRBc3NlcnRpb25UeXBlKFByb2Nlc3NBc3NlcnRpb25UeXBlIG5l d1R5cGUpCiAKICAgICBQUk9DRVNTVEhST1RUTEVSX1JFTEVBU0VfTE9HKCJzZXRBc3NlcnRpb25U eXBlOiBVcGRhdGluZyBwcm9jZXNzIGFzc2VydGlvbiB0eXBlIHRvICV1IChmb3JlZ3JvdW5kQWN0 aXZpdGllczogJXUsIGJhY2tncm91bmRBY3Rpdml0aWVzOiAldSkiLCBuZXdUeXBlLCBtX2ZvcmVn cm91bmRBY3Rpdml0aWVzLnNpemUoKSwgbV9iYWNrZ3JvdW5kQWN0aXZpdGllcy5zaXplKCkpOwog ICAgIGlmIChtX3Nob3VsZFRha2VVSUJhY2tncm91bmRBc3NlcnRpb24pCi0gICAgICAgIG1fYXNz ZXJ0aW9uID0gbWFrZVVuaXF1ZTxQcm9jZXNzQW5kVUlBc3NlcnRpb24+KG1fcHJvY2Vzc0lkZW50 aWZpZXIsICJXZWIgY29udGVudCB2aXNpYmlsaXR5Il9zLCBuZXdUeXBlKTsKKyAgICAgICAgbV9h c3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBbmRVSUFzc2VydGlvbj4obV9wcm9jZXNzSWRl bnRpZmllciwgYXNzZXJ0aW9uTmFtZShuZXdUeXBlKSwgbmV3VHlwZSk7CiAgICAgZWxzZQotICAg ICAgICBtX2Fzc2VydGlvbiA9IG1ha2VVbmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4obV9wcm9jZXNz SWRlbnRpZmllciwgIldlYiBjb250ZW50IHZpc2liaWxpdHkiX3MsIG5ld1R5cGUpOworICAgICAg ICBtX2Fzc2VydGlvbiA9IG1ha2VVbmlxdWU8UHJvY2Vzc0Fzc2VydGlvbj4obV9wcm9jZXNzSWRl bnRpZmllciwgYXNzZXJ0aW9uTmFtZShuZXdUeXBlKSwgbmV3VHlwZSk7CiAgICAgbV9wcm9jZXNz LmRpZFNldEFzc2VydGlvblR5cGUobmV3VHlwZSk7CiB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgKaW5kZXggNTUzZjk3MjlhNDlkMmY3MjYyNTJhYmQw NzM4NzE3NWYwMzFkNDA2OC4uODQwYjQ1ZDU2NmQzMzU0ZDA4ZWE5ODQ0YjQyNjBkZjFkMDRiOGFi MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaApAQCAtMTIw LDYgKzEyMCw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZW1vdmVBY3Rpdml0eShGb3JlZ3JvdW5k QWN0aXZpdHkmKTsKICAgICB2b2lkIHJlbW92ZUFjdGl2aXR5KEJhY2tncm91bmRBY3Rpdml0eSYp OwogICAgIHZvaWQgaW52YWxpZGF0ZUFsbEFjdGl2aXRpZXMoKTsKKyAgICBTdHJpbmcgYXNzZXJ0 aW9uTmFtZShQcm9jZXNzQXNzZXJ0aW9uVHlwZSkgY29uc3Q7CiAKICAgICAvLyBQcm9jZXNzQXNz ZXJ0aW9uQ2xpZW50CiAgICAgdm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkg b3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhy b3R0bGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVy Q2xpZW50LmgKaW5kZXggNTdlMzgxNzI1ZDNjYmZkMWI5ODU2MjA5NmRiNjAyOTQ2MzgyZWE4Ni4u MTE4YmYwZGQyMzU4MjI0YzJlYzdkZjliOTY1MWU5ZjEzNzhlNmUwMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXJDbGllbnQuaApAQCAtMzksNiArMzks NyBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCB2b2lkIHNlbmRQcmVwYXJlVG9TdXNwZW5kKElzU3Vz cGVuc2lvbkltbWluZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpID0gMDsKICAgICB2 aXJ0dWFsIHZvaWQgc2VuZFByb2Nlc3NEaWRSZXN1bWUoKSA9IDA7CiAgICAgdmlydHVhbCB2b2lk IGRpZFNldEFzc2VydGlvblR5cGUoUHJvY2Vzc0Fzc2VydGlvblR5cGUpIHsgfTsKKyAgICB2aXJ0 dWFsIEFTQ0lJTGl0ZXJhbCBjbGllbnROYW1lKCkgY29uc3QgPSAwOwogfTsKIAogfSAvLyBuYW1l c3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCmlu ZGV4IDQxNjhjODU2YjJlMjk2MTllMjIxZjcwNTY1ZGZmODIyYjlhNWUwODYuLmMzNDRjNzliZjA5 ZmIxMThlMGIzMWUxYTU5YTcwMWYzYmI0MTQxNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlByb2Nlc3NQcm94eS5oCkBAIC0zMTgsNiArMzE4LDcgQEAgcHVibGljOgogICAgIHZvaWQg c2VuZFByZXBhcmVUb1N1c3BlbmQoSXNTdXNwZW5zaW9uSW1taW5lbnQsIENvbXBsZXRpb25IYW5k bGVyPHZvaWQoKT4mJikgZmluYWw7CiAgICAgdm9pZCBzZW5kUHJvY2Vzc0RpZFJlc3VtZSgpIGZp bmFsOwogICAgIHZvaWQgZGlkU2V0QXNzZXJ0aW9uVHlwZShQcm9jZXNzQXNzZXJ0aW9uVHlwZSkg ZmluYWw7CisgICAgQVNDSUlMaXRlcmFsIGNsaWVudE5hbWUoKSBjb25zdCBmaW5hbCB7IHJldHVy biAiV2ViUHJvY2VzcyJfczsgfQogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgZW51bSBTYW5k Ym94RXh0ZW5zaW9uVHlwZSA6IHVpbnQzMl90IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggNDZkN2UzNGU0ODExYTFiMDdj ODNkZTJlMzMyYzcyZjliNTU4MzY4MC4uYzllMWU5YWFmM2Q3NjVkMmNkYWE3MTdiMWE5Mzc3ZThk OTVlMDMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0KQEAgLTM1NywyMiArMzU3LDIxIEBAIHN0YXRpYyBCS1NQcm9jZXNzQXNz ZXJ0aW9uUmVhc29uIHRvQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbihQcm9jZXNzQXNzZXJ0aW9u VHlwCiAgICAgfQogfQogCi1Qcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90 IHBpZCwgQVNDSUlMaXRlcmFsIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUgYXNzZXJ0aW9u VHlwZSkKK1Byb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBjb25z dCBTdHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUgYXNzZXJ0aW9uVHlwZSkKICAg ICA6IG1fYXNzZXJ0aW9uVHlwZShhc3NlcnRpb25UeXBlKQogICAgICwgbV9waWQocGlkKQogewog ICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7Ci0gICAgTlNTdHJpbmcgKm5z UmVhc29uID0gW05TU3RyaW5nIHN0cmluZ1dpdGhDU3RyaW5nOnJlYXNvbi5jaGFyYWN0ZXJzKCkg ZW5jb2Rpbmc6TlNBU0NJSVN0cmluZ0VuY29kaW5nXTsKICAgICBOU1N0cmluZyAqcnVubmluZ0Jv YXJkQXNzZXJ0aW9uTmFtZSA9IHJ1bm5pbmdCb2FyZE5hbWVGb3JBc3NlcnRpb25UeXBlKGFzc2Vy dGlvblR5cGUpOwogICAgIGlmIChydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lKSB7CiAgICAgICAg IGlmICghcGlkKSB7Ci0gICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVu c2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjogRmFpbGVkIHRvIGFjcXVpcmUgUkJTICV7cHVi bGljfUAgYXNzZXJ0aW9uICcle3B1YmxpY31zJyBmb3IgcHJvY2VzcyBiZWNhdXNlIFBJRCBpcyBp bnZhbGlkIiwgdGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLmNoYXJhY3Rl cnMoKSk7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwg IiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjogRmFpbGVkIHRvIGFjcXVpcmUgUkJTICV7cHVibGljfUAg YXNzZXJ0aW9uICcle3B1YmxpY31zJyBmb3IgcHJvY2VzcyBiZWNhdXNlIFBJRCBpcyBpbnZhbGlk IiwgdGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLnV0ZjgoKS5kYXRhKCkp OwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgUkJTVGFyZ2V0ICp0 YXJnZXQgPSBbUkJTVGFyZ2V0IHRhcmdldFdpdGhQaWQ6cGlkXTsKICAgICAgICAgUkJTRG9tYWlu QXR0cmlidXRlICpkb21haW5BdHRyaWJ1dGUgPSBbUkJTRG9tYWluQXR0cmlidXRlIGF0dHJpYnV0 ZVdpdGhEb21haW46QCJjb20uYXBwbGUud2Via2l0IiBuYW1lOnJ1bm5pbmdCb2FyZEFzc2VydGlv bk5hbWVdOwotICAgICAgICBtX3Jic0Fzc2VydGlvbiA9IGFkb3B0TlMoW1tSQlNBc3NlcnRpb24g YWxsb2NdIGluaXRXaXRoRXhwbGFuYXRpb246bnNSZWFzb24gdGFyZ2V0OnRhcmdldCBhdHRyaWJ1 dGVzOkBbZG9tYWluQXR0cmlidXRlXV0pOworICAgICAgICBtX3Jic0Fzc2VydGlvbiA9IGFkb3B0 TlMoW1tSQlNBc3NlcnRpb24gYWxsb2NdIGluaXRXaXRoRXhwbGFuYXRpb246cmVhc29uIHRhcmdl dDp0YXJnZXQgYXR0cmlidXRlczpAW2RvbWFpbkF0dHJpYnV0ZV1dKTsKIAogICAgICAgICBtX2Rl bGVnYXRlID0gYWRvcHROUyhbW1dLUkJTQXNzZXJ0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK ICAgICAgICAgW21fcmJzQXNzZXJ0aW9uIGFkZE9ic2VydmVyOm1fZGVsZWdhdGUuZ2V0KCldOwpA QCAtMzgzLDEzICszODIsMTMgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihw aWRfdCBwaWQsIEFTQ0lJTGl0ZXJhbCByZWFzb24sIFByb2Nlc3NBc3NlcnQKIAogICAgICAgICBO U0Vycm9yICphY3F1aXNpdGlvbkVycm9yID0gbmlsOwogICAgICAgICBpZiAoIVttX3Jic0Fzc2Vy dGlvbiBhY3F1aXJlV2l0aEVycm9yOiZhY3F1aXNpdGlvbkVycm9yXSkgewotICAgICAgICAgICAg UkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRp b246IEZhaWxlZCB0byBhY3F1aXJlIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9 cycgZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQsIGVycm9yOiAle3B1YmxpY31AIiwgdGhpcywgcnVu bmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLmNoYXJhY3RlcnMoKSwgcGlkLCBhY3F1aXNp dGlvbkVycm9yKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5z aW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBGYWlsZWQgdG8gYWNxdWlyZSBSQlMgJXtwdWJs aWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9jZXNzIHdpdGggUElEICVkLCBlcnJv cjogJXtwdWJsaWN9QCIsIHRoaXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi51 dGY4KCkuZGF0YSgpLCBwaWQsIGFjcXVpc2l0aW9uRXJyb3IpOwogICAgICAgICAgICAgZGlzcGF0 Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKICAgICAgICAgICAgICAgICBp ZiAod2Vha1RoaXMpCiAgICAgICAgICAgICAgICAgICAgIHByb2Nlc3NBc3NlcnRpb25XYXNJbnZh bGlkYXRlZCgpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAg UkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb246IFN1 Y2Nlc3NmdWxseSB0b29rIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9cycgZm9y IHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCBy ZWFzb24uY2hhcmFjdGVycygpLCBwaWQpOworICAgICAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vz c1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb246IFN1Y2Nlc3NmdWxseSB0b29rIFJC UyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3Mgd2l0aCBQSUQg JWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCByZWFzb24udXRmOCgpLmRhdGEo KSwgcGlkKTsKICAgICB9IGVsc2UgewogICAgICAgICAvLyBMZWdhY3kgY29kZSBwYXRoLgogICAg ICAgICBCS1NQcm9jZXNzQXNzZXJ0aW9uQWNxdWlzaXRpb25IYW5kbGVyIGhhbmRsZXIgPSBeKEJP T0wgYWNxdWlyZWQpIHsKQEAgLTQwMSw5ICs0MDAsOSBAQCBQcm9jZXNzQXNzZXJ0aW9uOjpQcm9j ZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgQVNDSUlMaXRlcmFsIHJlYXNvbiwgUHJvY2Vzc0Fzc2Vy dAogICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQogICAgICAgICB9OwotICAgICAg ICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigp IFBJRCAlZCBhY3F1aXJpbmcgQktTIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCwg bmFtZSAnJXMnIiwgdGhpcywgZ2V0cGlkKCksIHBpZCwgcmVhc29uLmNoYXJhY3RlcnMoKSk7Cisg ICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0 aW9uKCkgUElEICVkIGFjcXVpcmluZyBCS1MgYXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElE ICVkLCBuYW1lICclcyciLCB0aGlzLCBnZXRwaWQoKSwgcGlkLCByZWFzb24udXRmOCgpLmRhdGEo KSk7CiAKLSAgICAgICAgbV9ia3NBc3NlcnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2Vy dGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6cGlkIGZsYWdzOmZsYWdzRm9yQXNzZXJ0aW9uVHlwZShh c3NlcnRpb25UeXBlKSByZWFzb246dG9CS1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uKGFzc2VydGlv blR5cGUpIG5hbWU6bnNSZWFzb24gd2l0aEhhbmRsZXI6aGFuZGxlcl0pOworICAgICAgICBtX2Jr c0Fzc2VydGlvbiA9IGFkb3B0TlMoW1tCS1NQcm9jZXNzQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0 aFBJRDpwaWQgZmxhZ3M6ZmxhZ3NGb3JBc3NlcnRpb25UeXBlKGFzc2VydGlvblR5cGUpIHJlYXNv bjp0b0JLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb24oYXNzZXJ0aW9uVHlwZSkgbmFtZTpyZWFzb24g d2l0aEhhbmRsZXI6aGFuZGxlcl0pOwogCiAgICAgICAgIG1fYmtzQXNzZXJ0aW9uLmdldCgpLmlu dmFsaWRhdGlvbkhhbmRsZXIgPSBeKCkgewogICAgICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKQEAgLTQ1MCw3ICs0NDksNyBAQCB2b2lkIFByb2Nl c3NBbmRVSUFzc2VydGlvbjo6dXBkYXRlUnVuSW5CYWNrZ3JvdW5kQ291bnQoKQogICAgIG1faXNI b2xkaW5nQmFja2dyb3VuZFRhc2sgPSBzaG91bGRIb2xkQmFja2dyb3VuZFRhc2s7CiB9CiAKLVBy b2Nlc3NBbmRVSUFzc2VydGlvbjo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKHBpZF90IHBpZCwgQVND SUlMaXRlcmFsIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUgYXNzZXJ0aW9uVHlwZSkKK1By b2Nlc3NBbmRVSUFzc2VydGlvbjo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKHBpZF90IHBpZCwgY29u c3QgU3RyaW5nJiByZWFzb24sIFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvblR5cGUpCiAg ICAgOiBQcm9jZXNzQXNzZXJ0aW9uKHBpZCwgcmVhc29uLCBhc3NlcnRpb25UeXBlKQogewogICAg IHVwZGF0ZVJ1bkluQmFja2dyb3VuZENvdW50KCk7Cg== 397114 2020-04-21 13:38:35 -0700 2020-04-21 14:22:31 -0700 Patch bug-210808-20200421133834.patch text/plain 13250 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFkZmJiZjAzYWQwZmViYzc5 MjJlOTg5N2ViZDVkOGEzMWE2NThkZWIuLmFjYzU5ZmUwN2RlZjIxMDgyZWQxZmJiYjhhMWIzYmM5 ZmQwZWNjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBQcm92aWRlIGJldHRlciBu YW1lcyBmb3IgUHJvY2Vzc1Rocm90dGxlciBwcm9jZXNzIGFzc2VydGlvbnMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDgwOAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUgYmV0dGVyIG5hbWVz IGZvciBQcm9jZXNzVGhyb3R0bGVyIHByb2Nlc3MgYXNzZXJ0aW9ucywgdG8gZmFjaWxpdGF0ZSBk ZWJ1Z2dpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQcm94eS5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaDoKKyAgICAg ICAgKiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBy b2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Q cm9jZXNzQXNzZXJ0aW9uLmg6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzVGhyb3R0bGVyOjphc3NlcnRpb25OYW1lIGNv bnN0KToKKyAgICAgICAgKFdlYktpdDo6UHJvY2Vzc1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlw ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlckNsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRp b25JT1MubW06CisgICAgICAgIChXZWJLaXQ6OlByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24pOgorICAgICAgICAoV2ViS2l0OjpQcm9jZXNzQW5kVUlBc3NlcnRpb246OlByb2Nlc3NB bmRVSUFzc2VydGlvbik6CisKIDIwMjAtMDQtMjEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBUaWdodGVuIHVwIHNvbWUgbW9yZSBJUEMg bWVzc2FnZSBjaGVja3MgaW4gV2ViUGFzdGVib2FyZFByb3h5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9HUFUvR1BVUHJvY2Vzc1Byb3h5LmgKaW5kZXggYmFkNzlhMzNmODM2MDBiYzMzZWFm NmY5OGIxZWFmNTY3ZTk3NDhkOS4uMzNiM2UyNzExYzU3MzFmMzE1NGY3MmZiNWNjMjFiN2U3OTg2 OWE3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvR1BVL0dQVVByb2Nlc3NQ cm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0dQVS9HUFVQcm9jZXNzUHJveHku aApAQCAtNjIsNiArNjIsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBQcm9jZXNzVGhyb3R0bGVyQ2xp ZW50CiAgICAgdm9pZCBzZW5kUHJvY2Vzc0RpZFJlc3VtZSgpIGZpbmFsIHsgfQorICAgIEFTQ0lJ TGl0ZXJhbCBjbGllbnROYW1lKCkgY29uc3QgZmluYWwgeyByZXR1cm4gIkdQVVByb2Nlc3MiX3M7 IH0KIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgdm9pZCBzZXRVc2VNb2NrQ2FwdHVy ZURldmljZXMoYm9vbCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3 b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdv cmsvTmV0d29ya1Byb2Nlc3NQcm94eS5oCmluZGV4IGVjYzkyZjljMTYyMDMyMzkxMTI0Y2RiMWVh ODI0ZjA2MzM0YTQ5MDEuLmIzNWMwNDUxZDI4YmFhMGNlZDc2NGMyYTZjYWMwN2I1MTZiYzI0Yjcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nl c3NQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1By b2Nlc3NQcm94eS5oCkBAIC0yMDcsNiArMjA3LDcgQEAgcHVibGljOgogCiAgICAgLy8gUHJvY2Vz c1Rocm90dGxlckNsaWVudAogICAgIHZvaWQgc2VuZFByb2Nlc3NEaWRSZXN1bWUoKSBmaW5hbDsK KyAgICBBU0NJSUxpdGVyYWwgY2xpZW50TmFtZSgpIGNvbnN0IGZpbmFsIHsgcmV0dXJuICJOZXR3 b3JrUHJvY2VzcyJfczsgfQogICAgIAogICAgIHZvaWQgc2VuZFByb2Nlc3NXaWxsU3VzcGVuZElt bWluZW50bHlGb3JUZXN0aW5nKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1Byb2Nlc3NBc3NlcnRpb24uY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vz c0Fzc2VydGlvbi5jcHAKaW5kZXggYjVhOTAxNDFkZDBmMWEwYmI3Y2VmMTBlNjE1ZTc1MTE5NDky YmFmMy4uZWM2ZDI5ZTg1Yjk1NDM4Y2ViZTZlNDZlOGVjYTNmN2I2MDhlMGFiMyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5jcHAKQEAgLTMyLDcgKzMyLDcg QEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3Nl cnRpb24oUHJvY2Vzc0lEIHBpZCwgQVNDSUlMaXRlcmFsLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBh c3NlcnRpb25UeXBlKQorUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihQcm9jZXNz SUQgcGlkLCBjb25zdCBTdHJpbmcmLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBhc3NlcnRpb25UeXBl KQogICAgIDogbV9hc3NlcnRpb25UeXBlKGFzc2VydGlvblR5cGUpCiAgICAgLCBtX3BpZChwaWQp CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9u LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgKaW5kZXggZDdi MDUwMWU1Mjg4M2VjZTA3NjFmNWJmODc3NGU5NmYwM2U0MWRkMC4uNGIwYjdmYjM1YTIyOGFjNWZm YTZhODgzZmRiNmQxZTJkMDE4NzYxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nl c3NBc3NlcnRpb24uaApAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIHZpcnR1YWwg dm9pZCB1aUFzc2VydGlvbldpbGxFeHBpcmVJbW1pbmVudGx5KCkgPSAwOwogICAgIH07CiAKLSAg ICBQcm9jZXNzQXNzZXJ0aW9uKFByb2Nlc3NJRCwgQVNDSUlMaXRlcmFsIHJlYXNvbiwgUHJvY2Vz c0Fzc2VydGlvblR5cGUpOworICAgIFByb2Nlc3NBc3NlcnRpb24oUHJvY2Vzc0lELCBjb25zdCBT dHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUpOwogICAgIHZpcnR1YWwgflByb2Nl c3NBc3NlcnRpb24oKTsKIAogICAgIHZvaWQgc2V0Q2xpZW50KENsaWVudCYgY2xpZW50KSB7IG1f Y2xpZW50ID0gJmNsaWVudDsgfQpAQCAtOTUsNyArOTUsNyBAQCBwcml2YXRlOgogCiBjbGFzcyBQ cm9jZXNzQW5kVUlBc3NlcnRpb24gZmluYWwgOiBwdWJsaWMgUHJvY2Vzc0Fzc2VydGlvbiB7CiBw dWJsaWM6Ci0gICAgUHJvY2Vzc0FuZFVJQXNzZXJ0aW9uKFByb2Nlc3NJRCwgQVNDSUlMaXRlcmFs IHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUpOworICAgIFByb2Nlc3NBbmRVSUFzc2VydGlv bihQcm9jZXNzSUQsIGNvbnN0IFN0cmluZyYgcmVhc29uLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSk7 CiAgICAgflByb2Nlc3NBbmRVSUFzc2VydGlvbigpOwogCiAgICAgdm9pZCB1aUFzc2VydGlvbldp bGxFeHBpcmVJbW1pbmVudGx5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9Qcm9jZXNzVGhyb3R0bGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NU aHJvdHRsZXIuY3BwCmluZGV4IDdmNjc5NzE4OWVmMTdlYTAxZWM2MWQ4OTI1ZjM3ZjI0MzQ2Nzcy ZWIuLjBkZWNjZjVkZWJjMmE1MTNlM2M3ZDIzNTJiODMxNDRkMmQwYTIwYmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuY3BwCkBAIC0xMDAsNiArMTAwLDI4 IEBAIHZvaWQgUHJvY2Vzc1Rocm90dGxlcjo6dXBkYXRlQXNzZXJ0aW9uVHlwZU5vdygpCiAgICAg c2V0QXNzZXJ0aW9uVHlwZShleHBlY3RlZEFzc2VydGlvblR5cGUoKSk7CiB9CiAKK1N0cmluZyBQ cm9jZXNzVGhyb3R0bGVyOjphc3NlcnRpb25OYW1lKFByb2Nlc3NBc3NlcnRpb25UeXBlIHR5cGUp IGNvbnN0Cit7CisgICAgQVNDSUlMaXRlcmFsIHR5cGVTdHJpbmcgPSBbdHlwZV0geworICAgICAg ICBzd2l0Y2ggKHR5cGUpIHsKKyAgICAgICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6Rm9y ZWdyb3VuZDoKKyAgICAgICAgICAgIHJldHVybiAiRm9yZWdyb3VuZCJfczsKKyAgICAgICAgY2Fz ZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6QmFja2dyb3VuZDoKKyAgICAgICAgICAgIHJldHVybiAi QmFja2dyb3VuZCJfczsKKyAgICAgICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6U3VzcGVu ZGVkOgorICAgICAgICAgICAgcmV0dXJuICJTdXNwZW5kZWQiX3M7CisgICAgICAgIGNhc2UgUHJv Y2Vzc0Fzc2VydGlvblR5cGU6OlVuYm91bmRlZE5ldHdvcmtpbmc6CisgICAgICAgIGNhc2UgUHJv Y2Vzc0Fzc2VydGlvblR5cGU6Ok1lZGlhUGxheWJhY2s6CisgICAgICAgIGNhc2UgUHJvY2Vzc0Fz c2VydGlvblR5cGU6OkRlcGVuZGVudFByb2Nlc3NMaW5rOgorICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7IC8vIFRoZXNlIG90aGVyIGFzc2VydGlvbiB0eXBlcyBhcmUgbm90IHVzZWQg YnkgdGhlIFByb2Nlc3NUaHJvdHRsZXIuCisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQor ICAgICAgICByZXR1cm4gIlVua25vd24iX3M7CisgICAgfSgpOworCisgICAgcmV0dXJuIG1ha2VT dHJpbmcobV9wcm9jZXNzLmNsaWVudE5hbWUoKSwgIiAiLCB0eXBlU3RyaW5nLCAiIEFzc2VydGlv biIpOworfQorCiB2b2lkIFByb2Nlc3NUaHJvdHRsZXI6OnNldEFzc2VydGlvblR5cGUoUHJvY2Vz c0Fzc2VydGlvblR5cGUgbmV3VHlwZSkKIHsKICAgICBpZiAobV9hc3NlcnRpb24gJiYgbV9hc3Nl cnRpb24tPnR5cGUoKSA9PSBuZXdUeXBlKQpAQCAtMTA3LDkgKzEyOSw5IEBAIHZvaWQgUHJvY2Vz c1Rocm90dGxlcjo6c2V0QXNzZXJ0aW9uVHlwZShQcm9jZXNzQXNzZXJ0aW9uVHlwZSBuZXdUeXBl KQogCiAgICAgUFJPQ0VTU1RIUk9UVExFUl9SRUxFQVNFX0xPRygic2V0QXNzZXJ0aW9uVHlwZTog VXBkYXRpbmcgcHJvY2VzcyBhc3NlcnRpb24gdHlwZSB0byAldSAoZm9yZWdyb3VuZEFjdGl2aXRp ZXM6ICV1LCBiYWNrZ3JvdW5kQWN0aXZpdGllczogJXUpIiwgbmV3VHlwZSwgbV9mb3JlZ3JvdW5k QWN0aXZpdGllcy5zaXplKCksIG1fYmFja2dyb3VuZEFjdGl2aXRpZXMuc2l6ZSgpKTsKICAgICBp ZiAobV9zaG91bGRUYWtlVUlCYWNrZ3JvdW5kQXNzZXJ0aW9uKQotICAgICAgICBtX2Fzc2VydGlv biA9IG1ha2VVbmlxdWU8UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uPihtX3Byb2Nlc3NJZGVudGlmaWVy LCAiV2ViIGNvbnRlbnQgdmlzaWJpbGl0eSJfcywgbmV3VHlwZSk7CisgICAgICAgIG1fYXNzZXJ0 aW9uID0gbWFrZVVuaXF1ZTxQcm9jZXNzQW5kVUlBc3NlcnRpb24+KG1fcHJvY2Vzc0lkZW50aWZp ZXIsIGFzc2VydGlvbk5hbWUobmV3VHlwZSksIG5ld1R5cGUpOwogICAgIGVsc2UKLSAgICAgICAg bV9hc3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KG1fcHJvY2Vzc0lkZW50 aWZpZXIsICJXZWIgY29udGVudCB2aXNpYmlsaXR5Il9zLCBuZXdUeXBlKTsKKyAgICAgICAgbV9h c3NlcnRpb24gPSBtYWtlVW5pcXVlPFByb2Nlc3NBc3NlcnRpb24+KG1fcHJvY2Vzc0lkZW50aWZp ZXIsIGFzc2VydGlvbk5hbWUobmV3VHlwZSksIG5ld1R5cGUpOwogICAgIG1fcHJvY2Vzcy5kaWRT ZXRBc3NlcnRpb25UeXBlKG5ld1R5cGUpOwogfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUHJvY2Vzc1Rocm90dGxlci5oCmluZGV4IDU1M2Y5NzI5YTQ5ZDJmNzI2MjUyYWJkMDczODcx NzVmMDMxZDQwNjguLjg0MGI0NWQ1NjZkMzM1NGQwOGVhOTg0NGI0MjYwZGYxZDA0YjhhYjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXIuaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyLmgKQEAgLTEyMCw2ICsx MjAsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVtb3ZlQWN0aXZpdHkoRm9yZWdyb3VuZEFjdGl2 aXR5Jik7CiAgICAgdm9pZCByZW1vdmVBY3Rpdml0eShCYWNrZ3JvdW5kQWN0aXZpdHkmKTsKICAg ICB2b2lkIGludmFsaWRhdGVBbGxBY3Rpdml0aWVzKCk7CisgICAgU3RyaW5nIGFzc2VydGlvbk5h bWUoUHJvY2Vzc0Fzc2VydGlvblR5cGUpIGNvbnN0OwogCiAgICAgLy8gUHJvY2Vzc0Fzc2VydGlv bkNsaWVudAogICAgIHZvaWQgdWlBc3NlcnRpb25XaWxsRXhwaXJlSW1taW5lbnRseSgpIG92ZXJy aWRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxl ckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc1Rocm90dGxlckNsaWVu dC5oCmluZGV4IDU3ZTM4MTcyNWQzY2JmZDFiOTg1NjIwOTZkYjYwMjk0NjM4MmVhODYuLjExOGJm MGRkMjM1ODIyNGMyZWM3ZGY5Yjk2NTFlOWYxMzc4ZTZlMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NUaHJvdHRsZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9Qcm9jZXNzVGhyb3R0bGVyQ2xpZW50LmgKQEAgLTM5LDYgKzM5LDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZW5kUHJlcGFyZVRvU3VzcGVuZChJc1N1c3BlbnNp b25JbW1pbmVudCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKSA9IDA7CiAgICAgdmlydHVh bCB2b2lkIHNlbmRQcm9jZXNzRGlkUmVzdW1lKCkgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRT ZXRBc3NlcnRpb25UeXBlKFByb2Nlc3NBc3NlcnRpb25UeXBlKSB7IH07CisgICAgdmlydHVhbCBB U0NJSUxpdGVyYWwgY2xpZW50TmFtZSgpIGNvbnN0ID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA0 MTY4Yzg1NmIyZTI5NjE5ZTIyMWY3MDU2NWRmZjgyMmI5YTVlMDg2Li5jMzQ0Yzc5YmYwOWZiMTE4 ZTBiMzFlMWE1OWE3MDFmM2JiNDE0MTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuaApAQCAtMzE4LDYgKzMxOCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNlbmRQ cmVwYXJlVG9TdXNwZW5kKElzU3VzcGVuc2lvbkltbWluZW50LCBDb21wbGV0aW9uSGFuZGxlcjx2 b2lkKCk+JiYpIGZpbmFsOwogICAgIHZvaWQgc2VuZFByb2Nlc3NEaWRSZXN1bWUoKSBmaW5hbDsK ICAgICB2b2lkIGRpZFNldEFzc2VydGlvblR5cGUoUHJvY2Vzc0Fzc2VydGlvblR5cGUpIGZpbmFs OworICAgIEFTQ0lJTGl0ZXJhbCBjbGllbnROYW1lKCkgY29uc3QgZmluYWwgeyByZXR1cm4gIldl YlByb2Nlc3MiX3M7IH0KIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIGVudW0gU2FuZGJveEV4 dGVuc2lvblR5cGUgOiB1aW50MzJfdCB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tCmluZGV4IDQ2ZDdlMzRlNDgxMWExYjA3YzgzZGUy ZTMzMmM3MmY5YjU1ODM2ODAuLmM5ZTFlOWFhZjNkNzY1ZDJjZGFhNzE3YjFhOTM3N2U4ZDk1ZTAz MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0 aW9uSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0 aW9uSU9TLm1tCkBAIC0zNTcsMjIgKzM1NywyMSBAQCBzdGF0aWMgQktTUHJvY2Vzc0Fzc2VydGlv blJlYXNvbiB0b0JLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb24oUHJvY2Vzc0Fzc2VydGlvblR5cAog ICAgIH0KIH0KIAotUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fzc2VydGlvbihwaWRfdCBwaWQs IEFTQ0lJTGl0ZXJhbCByZWFzb24sIFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvblR5cGUp CitQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgY29uc3QgU3Ry aW5nJiByZWFzb24sIFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvblR5cGUpCiAgICAgOiBt X2Fzc2VydGlvblR5cGUoYXNzZXJ0aW9uVHlwZSkKICAgICAsIG1fcGlkKHBpZCkKIHsKICAgICBh dXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpOwotICAgIE5TU3RyaW5nICpuc1JlYXNv biA9IFtOU1N0cmluZyBzdHJpbmdXaXRoQ1N0cmluZzpyZWFzb24uY2hhcmFjdGVycygpIGVuY29k aW5nOk5TQVNDSUlTdHJpbmdFbmNvZGluZ107CiAgICAgTlNTdHJpbmcgKnJ1bm5pbmdCb2FyZEFz c2VydGlvbk5hbWUgPSBydW5uaW5nQm9hcmROYW1lRm9yQXNzZXJ0aW9uVHlwZShhc3NlcnRpb25U eXBlKTsKICAgICBpZiAocnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSkgewogICAgICAgICBpZiAo IXBpZCkgewotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24s ICIlcCAtIFByb2Nlc3NBc3NlcnRpb246IEZhaWxlZCB0byBhY3F1aXJlIFJCUyAle3B1YmxpY31A IGFzc2VydGlvbiAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3MgYmVjYXVzZSBQSUQgaXMgaW52YWxp ZCIsIHRoaXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi5jaGFyYWN0ZXJzKCkp OworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAt IFByb2Nlc3NBc3NlcnRpb246IEZhaWxlZCB0byBhY3F1aXJlIFJCUyAle3B1YmxpY31AIGFzc2Vy dGlvbiAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3MgYmVjYXVzZSBQSUQgaXMgaW52YWxpZCIsIHRo aXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogCiAgICAgICAgIFJCU1RhcmdldCAqdGFyZ2V0 ID0gW1JCU1RhcmdldCB0YXJnZXRXaXRoUGlkOnBpZF07CiAgICAgICAgIFJCU0RvbWFpbkF0dHJp YnV0ZSAqZG9tYWluQXR0cmlidXRlID0gW1JCU0RvbWFpbkF0dHJpYnV0ZSBhdHRyaWJ1dGVXaXRo RG9tYWluOkAiY29tLmFwcGxlLndlYmtpdCIgbmFtZTpydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1l XTsKLSAgICAgICAgbV9yYnNBc3NlcnRpb24gPSBhZG9wdE5TKFtbUkJTQXNzZXJ0aW9uIGFsbG9j XSBpbml0V2l0aEV4cGxhbmF0aW9uOm5zUmVhc29uIHRhcmdldDp0YXJnZXQgYXR0cmlidXRlczpA W2RvbWFpbkF0dHJpYnV0ZV1dKTsKKyAgICAgICAgbV9yYnNBc3NlcnRpb24gPSBhZG9wdE5TKFtb UkJTQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aEV4cGxhbmF0aW9uOnJlYXNvbiB0YXJnZXQ6dGFy Z2V0IGF0dHJpYnV0ZXM6QFtkb21haW5BdHRyaWJ1dGVdXSk7CiAKICAgICAgICAgbV9kZWxlZ2F0 ZSA9IGFkb3B0TlMoW1tXS1JCU0Fzc2VydGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CiAgICAg ICAgIFttX3Jic0Fzc2VydGlvbiBhZGRPYnNlcnZlcjptX2RlbGVnYXRlLmdldCgpXTsKQEAgLTM4 MywxMyArMzgyLDEzIEBAIFByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3Qg cGlkLCBBU0NJSUxpdGVyYWwgcmVhc29uLCBQcm9jZXNzQXNzZXJ0CiAKICAgICAgICAgTlNFcnJv ciAqYWNxdWlzaXRpb25FcnJvciA9IG5pbDsKICAgICAgICAgaWYgKCFbbV9yYnNBc3NlcnRpb24g YWNxdWlyZVdpdGhFcnJvcjomYWNxdWlzaXRpb25FcnJvcl0pIHsKLSAgICAgICAgICAgIFJFTEVB U0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBG YWlsZWQgdG8gYWNxdWlyZSBSQlMgJXtwdWJsaWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZv ciBwcm9jZXNzIHdpdGggUElEICVkLCBlcnJvcjogJXtwdWJsaWN9QCIsIHRoaXMsIHJ1bm5pbmdC b2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi5jaGFyYWN0ZXJzKCksIHBpZCwgYWNxdWlzaXRpb25F cnJvcik7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwg IiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjogRmFpbGVkIHRvIGFjcXVpcmUgUkJTICV7cHVibGljfUAg YXNzZXJ0aW9uICcle3B1YmxpY31zJyBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCwgZXJyb3I6ICV7 cHVibGljfUAiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCByZWFzb24udXRmOCgp LmRhdGEoKSwgcGlkLCBhY3F1aXNpdGlvbkVycm9yKTsKICAgICAgICAgICAgIGRpc3BhdGNoX2Fz eW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF57CiAgICAgICAgICAgICAgICAgaWYgKHdl YWtUaGlzKQogICAgICAgICAgICAgICAgICAgICBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0 ZWQoKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBTdWNjZXNz ZnVsbHkgdG9vayBSQlMgJXtwdWJsaWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9j ZXNzIHdpdGggUElEICVkIiwgdGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29u LmNoYXJhY3RlcnMoKSwgcGlkKTsKKyAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNw ZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBTdWNjZXNzZnVsbHkgdG9vayBSQlMgJXtw dWJsaWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwg dGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLnV0ZjgoKS5kYXRhKCksIHBp ZCk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gTGVnYWN5IGNvZGUgcGF0aC4KICAgICAgICAg QktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5kbGVyID0gXihCT09MIGFj cXVpcmVkKSB7CkBAIC00MDEsOSArNDAwLDkgQEAgUHJvY2Vzc0Fzc2VydGlvbjo6UHJvY2Vzc0Fz c2VydGlvbihwaWRfdCBwaWQsIEFTQ0lJTGl0ZXJhbCByZWFzb24sIFByb2Nlc3NBc3NlcnQKICAg ICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfTsKLSAgICAgICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb24oKSBQSUQg JWQgYWNxdWlyaW5nIEJLUyBhc3NlcnRpb24gZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQsIG5hbWUg JyVzJyIsIHRoaXMsIGdldHBpZCgpLCBwaWQsIHJlYXNvbi5jaGFyYWN0ZXJzKCkpOworICAgICAg ICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigp IFBJRCAlZCBhY3F1aXJpbmcgQktTIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCwg bmFtZSAnJXMnIiwgdGhpcywgZ2V0cGlkKCksIHBpZCwgcmVhc29uLnV0ZjgoKS5kYXRhKCkpOwog Ci0gICAgICAgIG1fYmtzQXNzZXJ0aW9uID0gYWRvcHROUyhbW0JLU1Byb2Nlc3NBc3NlcnRpb24g YWxsb2NdIGluaXRXaXRoUElEOnBpZCBmbGFnczpmbGFnc0ZvckFzc2VydGlvblR5cGUoYXNzZXJ0 aW9uVHlwZSkgcmVhc29uOnRvQktTUHJvY2Vzc0Fzc2VydGlvblJlYXNvbihhc3NlcnRpb25UeXBl KSBuYW1lOm5zUmVhc29uIHdpdGhIYW5kbGVyOmhhbmRsZXJdKTsKKyAgICAgICAgbV9ia3NBc3Nl cnRpb24gPSBhZG9wdE5TKFtbQktTUHJvY2Vzc0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhQSUQ6 cGlkIGZsYWdzOmZsYWdzRm9yQXNzZXJ0aW9uVHlwZShhc3NlcnRpb25UeXBlKSByZWFzb246dG9C S1NQcm9jZXNzQXNzZXJ0aW9uUmVhc29uKGFzc2VydGlvblR5cGUpIG5hbWU6cmVhc29uIHdpdGhI YW5kbGVyOmhhbmRsZXJdKTsKIAogICAgICAgICBtX2Jrc0Fzc2VydGlvbi5nZXQoKS5pbnZhbGlk YXRpb25IYW5kbGVyID0gXigpIHsKICAgICAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNo X2dldF9tYWluX3F1ZXVlKCksIF57CkBAIC00NTAsNyArNDQ5LDcgQEAgdm9pZCBQcm9jZXNzQW5k VUlBc3NlcnRpb246OnVwZGF0ZVJ1bkluQmFja2dyb3VuZENvdW50KCkKICAgICBtX2lzSG9sZGlu Z0JhY2tncm91bmRUYXNrID0gc2hvdWxkSG9sZEJhY2tncm91bmRUYXNrOwogfQogCi1Qcm9jZXNz QW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlvbihwaWRfdCBwaWQsIEFTQ0lJTGl0 ZXJhbCByZWFzb24sIFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvblR5cGUpCitQcm9jZXNz QW5kVUlBc3NlcnRpb246OlByb2Nlc3NBbmRVSUFzc2VydGlvbihwaWRfdCBwaWQsIGNvbnN0IFN0 cmluZyYgcmVhc29uLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBhc3NlcnRpb25UeXBlKQogICAgIDog UHJvY2Vzc0Fzc2VydGlvbihwaWQsIHJlYXNvbiwgYXNzZXJ0aW9uVHlwZSkKIHsKICAgICB1cGRh dGVSdW5JbkJhY2tncm91bmRDb3VudCgpOwo=