210212 2020-04-08 14:24:30 -0700 [iOS] Port MediaPlayback process assertion to RunningBoard 2020-04-23 09:27:08 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 209990 1 cdumez cdumez achristensen ggaren webkit-bug-importer oldest_to_newest 1639291 0 cdumez 2020-04-08 14:24:30 -0700 Port MediaPlayback process assertion to RunningBoard instead of the legacy BKSProcessAssertion. 1639292 1 webkit-bug-importer 2020-04-08 14:24:47 -0700 <rdar://problem/61476951> 1639295 2 395870 cdumez 2020-04-08 14:31:00 -0700 Created attachment 395870 Patch 1639319 3 395870 ggaren 2020-04-08 15:31:11 -0700 Comment on attachment 395870 Patch r=me 1644775 4 397343 cdumez 2020-04-23 08:27:49 -0700 Created attachment 397343 Patch 1644799 5 ews-feeder 2020-04-23 09:27:07 -0700 Committed r260574: <https://trac.webkit.org/changeset/260574> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397343. 395870 2020-04-08 14:31:00 -0700 2020-04-23 08:27:47 -0700 Patch bug-210212-20200408143059.patch text/plain 8459 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NzU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBkNTFiMjJlM2YyNjMzYjNj ZTZjODk0YmMxMTg4MjkyMjU1OTgxYWEuLjM4ZjY5YTNjNjZhODFkZGM4OGFiOTY2MjA0Njg3M2U4 OTE1ZTZmOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMDggIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBQb3J0IE1lZGlhUGxheWJh Y2sgcHJvY2VzcyBhc3NlcnRpb24gdG8gUnVubmluZ0JvYXJkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyMTIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzYxNDc2OTUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFBvcnQgTWVkaWFQbGF5YmFjayBwcm9jZXNzIGFzc2VydGlvbiB0byBSdW5uaW5nQm9h cmQgaW5zdGVhZCBvZiB0aGUgbGVnYWN5IEJLU1Byb2Nlc3NBc3NlcnRpb24uCisgICAgICAgIFdl IGNhbiBub3cgI2lmZGVmIG91dCB0aGUgbGVnYWN5IEJLU1Byb2Nlc3NBc3NlcnRpb24gb24gcmVj ZW50IGlPUyBidWlsZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbToKKyAgICAg ICAgKFdlYktpdDo6cnVubmluZ0JvYXJkTmFtZUZvckFzc2VydGlvblR5cGUpOgorICAgICAgICAo V2ViS2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKFdl YktpdDo6UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24pOgorCiAyMDIwLTA0LTA4 ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbbWFjT1Nd IENyYXNoIHVuZGVyIFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6Y29uc3VtZQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCmluZGV4IGVlMGM4ZGI0YWU4MDg3OWE3 OWU3ODc0Njc3MTJmM2FmZjQ4OGRlY2YuLmNkZTIwZDZiNWU5ODAyNzJjMmM4ZjM2NDViOTFiYzBi NmM5MDVkZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1Byb2Nlc3NBc3Nl cnRpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9uLmgK QEAgLTM5LDcgKzM5LDkgQEAKIAogT0JKQ19DTEFTUyBSQlNBc3NlcnRpb247CiBPQkpDX0NMQVNT IFdLUkJTQXNzZXJ0aW9uRGVsZWdhdGU7CisjaWYgIUhBVkUoUlVOTklOR0JPQVJEX1ZJU0lCSUxJ VFlfQVNTRVJUSU9OUykKIE9CSkNfQ0xBU1MgQktTUHJvY2Vzc0Fzc2VydGlvbjsKKyNlbmRpZgog I2VuZGlmIC8vIFBMQVRGT1JNKElPU19GQU1JTFkpCiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAt ODQsNyArODYsOSBAQCBwcml2YXRlOgogICAgIGNvbnN0IFByb2Nlc3NJRCBtX3BpZDsKICAgICBS ZXRhaW5QdHI8UkJTQXNzZXJ0aW9uPiBtX3Jic0Fzc2VydGlvbjsKICAgICBSZXRhaW5QdHI8V0tS QlNBc3NlcnRpb25EZWxlZ2F0ZT4gbV9kZWxlZ2F0ZTsKKyNpZiAhSEFWRShSVU5OSU5HQk9BUkRf VklTSUJJTElUWV9BU1NFUlRJT05TKQogICAgIFJldGFpblB0cjxCS1NQcm9jZXNzQXNzZXJ0aW9u PiBtX2Jrc0Fzc2VydGlvbjsgLy8gTGVnYWN5LgorI2VuZGlmCiAgICAgVmFsaWRpdHkgbV92YWxp ZGl0eSB7IFZhbGlkaXR5OjpVbnNldCB9OwogI2VuZGlmCiAgICAgQ2xpZW50KiBtX2NsaWVudCB7 IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9j ZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NB c3NlcnRpb25JT1MubW0KaW5kZXggNTVlY2IzNWE4YjBkMjFhYTM2NjMyY2I3ZjdkMTAzY2E1Nzgz NGVhZS4uYWQ0M2RkMGU2Y2I3MTkyZTVkNDg2MmNmMGViMjU2MjA0N2ZiMjViYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KQEAg LTMwNCw3ICszMDQsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnJ1bm5pbmdCb2FyZE5hbWVGb3JBc3Nl cnRpb25UeXBlKFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvbgogICAgIGNhc2UgUHJvY2Vz c0Fzc2VydGlvblR5cGU6OkRlcGVuZGVudFByb2Nlc3NMaW5rOgogICAgICAgICByZXR1cm4gQCJE ZXBlbmRlbnRQcm9jZXNzTGluayI7CiAgICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlwZTo6TWVk aWFQbGF5YmFjazoKLSAgICAgICAgcmV0dXJuIG5pbDsgLy8gRklYTUU6IE5hbWUgdG8gYmUgZGVm aW5lZCBpbiA8cmRhcjovL3Byb2JsZW0vNjEyNjMxNDc+LgorICAgICAgICByZXR1cm4gQCJNZWRp YVBsYXliYWNrIjsKICAgICB9CiAjZWxzZQogICAgIGlmIChhc3NlcnRpb25UeXBlID09IFByb2Nl c3NBc3NlcnRpb25UeXBlOjpEZXBlbmRlbnRQcm9jZXNzTGluaykKQEAgLTMxMyw2ICszMTMsOCBA QCBzdGF0aWMgTlNTdHJpbmcgKnJ1bm5pbmdCb2FyZE5hbWVGb3JBc3NlcnRpb25UeXBlKFByb2Nl c3NBc3NlcnRpb25UeXBlIGFzc2VydGlvbgogI2VuZGlmCiB9CiAKKyNpZiAhSEFWRShSVU5OSU5H Qk9BUkRfVklTSUJJTElUWV9BU1NFUlRJT05TKQorCiBjb25zdCBCS1NQcm9jZXNzQXNzZXJ0aW9u RmxhZ3Mgc3VzcGVuZGVkVGFiRmxhZ3MgPSAoQktTUHJvY2Vzc0Fzc2VydGlvbkFsbG93SWRsZVNs ZWVwKTsKIGNvbnN0IEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBiYWNrZ3JvdW5kVGFiRmxhZ3Mg PSAoQktTUHJvY2Vzc0Fzc2VydGlvblByZXZlbnRUYXNrU3VzcGVuZCk7CiBjb25zdCBCS1NQcm9j ZXNzQXNzZXJ0aW9uRmxhZ3MgZm9yZWdyb3VuZFRhYkZsYWdzID0gKEJLU1Byb2Nlc3NBc3NlcnRp b25QcmV2ZW50VGFza1N1c3BlbmQgfCBCS1NQcm9jZXNzQXNzZXJ0aW9uV2FudHNGb3JlZ3JvdW5k UmVzb3VyY2VQcmlvcml0eSB8IEJLU1Byb2Nlc3NBc3NlcnRpb25QcmV2ZW50VGFza1Rocm90dGxl RG93bik7CkBAIC0zNTEsNDAgKzM1MywxOCBAQCBzdGF0aWMgQktTUHJvY2Vzc0Fzc2VydGlvblJl YXNvbiB0b0JLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb24oUHJvY2Vzc0Fzc2VydGlvblR5cAogICAg IH0KIH0KIAorI2VuZGlmIC8vICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElP TlMpCisKIFByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBU0NJ SUxpdGVyYWwgcmVhc29uLCBQcm9jZXNzQXNzZXJ0aW9uVHlwZSBhc3NlcnRpb25UeXBlKQogICAg IDogbV9hc3NlcnRpb25UeXBlKGFzc2VydGlvblR5cGUpCiAgICAgLCBtX3BpZChwaWQpCiB7CiAg ICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKICAgICBOU1N0cmluZyAqbnNS ZWFzb24gPSBbTlNTdHJpbmcgc3RyaW5nV2l0aENTdHJpbmc6cmVhc29uLmNoYXJhY3RlcnMoKSBl bmNvZGluZzpOU0FTQ0lJU3RyaW5nRW5jb2RpbmddOwotICAgIE5TU3RyaW5nICpydW5uaW5nQm9h cmRBc3NlcnRpb25OYW1lID0gcnVubmluZ0JvYXJkTmFtZUZvckFzc2VydGlvblR5cGUoYXNzZXJ0 aW9uVHlwZSk7Ci0gICAgaWYgKHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUpIHsKLSAgICAgICAg aWYgKCFwaWQpIHsKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5z aW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBGYWlsZWQgdG8gYWNxdWlyZSBSQlMgJXtwdWJs aWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9jZXNzIGJlY2F1c2UgUElEIGlzIGlu dmFsaWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCByZWFzb24uY2hhcmFjdGVy cygpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0gICAgICAgIFJCU1Rhcmdl dCAqdGFyZ2V0ID0gW1JCU1RhcmdldCB0YXJnZXRXaXRoUGlkOnBpZF07Ci0gICAgICAgIFJCU0Rv bWFpbkF0dHJpYnV0ZSAqZG9tYWluQXR0cmlidXRlID0gW1JCU0RvbWFpbkF0dHJpYnV0ZSBhdHRy aWJ1dGVXaXRoRG9tYWluOkAiY29tLmFwcGxlLndlYmtpdCIgbmFtZTpydW5uaW5nQm9hcmRBc3Nl cnRpb25OYW1lXTsKLSAgICAgICAgbV9yYnNBc3NlcnRpb24gPSBhZG9wdE5TKFtbUkJTQXNzZXJ0 aW9uIGFsbG9jXSBpbml0V2l0aEV4cGxhbmF0aW9uOm5zUmVhc29uIHRhcmdldDp0YXJnZXQgYXR0 cmlidXRlczpAW2RvbWFpbkF0dHJpYnV0ZV1dKTsKIAotICAgICAgICBtX2RlbGVnYXRlID0gYWRv cHROUyhbW1dLUkJTQXNzZXJ0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsKLSAgICAgICAgW21f cmJzQXNzZXJ0aW9uIGFkZE9ic2VydmVyOm1fZGVsZWdhdGUuZ2V0KCldOwotICAgICAgICBtX2Rl bGVnYXRlLmdldCgpLmludmFsaWRhdGlvbkNhbGxiYWNrID0gXnsKLSAgICAgICAgICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uKCkgUkJTICV7 cHVibGljfUAgYXNzZXJ0aW9uIGZvciBwcm9jZXNzIHdpdGggUElEICVkIHdhcyBpbnZhbGlkYXRl ZCIsIHRoaXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHBpZCk7Ci0gICAgICAgICAgICBw cm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKTsKLSAgICAgICAgfTsKLQotICAgICAgICBO U0Vycm9yICphY3F1aXNpdGlvbkVycm9yID0gbmlsOwotICAgICAgICBpZiAoIVttX3Jic0Fzc2Vy dGlvbiBhY3F1aXJlV2l0aEVycm9yOiZhY3F1aXNpdGlvbkVycm9yXSkgewotICAgICAgICAgICAg UkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRp b246IEZhaWxlZCB0byBhY3F1aXJlIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9 cycgZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQsIGVycm9yOiAle3B1YmxpY31AIiwgdGhpcywgcnVu bmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLmNoYXJhY3RlcnMoKSwgcGlkLCBhY3F1aXNp dGlvbkVycm9yKTsKLSAgICAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWlu X3F1ZXVlKCksIF57Ci0gICAgICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQotICAgICAgICAgICAg ICAgICAgICBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKTsKLSAgICAgICAgICAgIH0p OwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5z aW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBTdWNjZXNzZnVsbHkgdG9vayBSQlMgJXtwdWJs aWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9jZXNzIHdpdGggUElEICVkIiwgdGhp cywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLmNoYXJhY3RlcnMoKSwgcGlkKTsK LSAgICB9IGVsc2UgeworICAgIE5TU3RyaW5nICpydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lID0g cnVubmluZ0JvYXJkTmFtZUZvckFzc2VydGlvblR5cGUoYXNzZXJ0aW9uVHlwZSk7CisjaWYgIUhB VkUoUlVOTklOR0JPQVJEX1ZJU0lCSUxJVFlfQVNTRVJUSU9OUykKKyAgICBpZiAoIXJ1bm5pbmdC b2FyZEFzc2VydGlvbk5hbWUpIHsKICAgICAgICAgLy8gTGVnYWN5IGNvZGUgcGF0aC4KICAgICAg ICAgQktTUHJvY2Vzc0Fzc2VydGlvbkFjcXVpc2l0aW9uSGFuZGxlciBoYW5kbGVyID0gXihCT09M IGFjcXVpcmVkKSB7CiAgICAgICAgICAgICBpZiAoIWFjcXVpcmVkKSB7CkBAIC00MDYsNyArMzg2 LDM2IEBAIFByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlkLCBBU0NJ SUxpdGVyYWwgcmVhc29uLCBQcm9jZXNzQXNzZXJ0CiAgICAgICAgICAgICAgICAgICAgIHByb2Nl c3NBc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpOwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH07 CisgICAgICAgIHJldHVybjsKICAgICB9CisjZW5kaWYgLy8gIUhBVkUoUlVOTklOR0JPQVJEX1ZJ U0lCSUxJVFlfQVNTRVJUSU9OUykKKworICAgIEFTU0VSVChydW5uaW5nQm9hcmRBc3NlcnRpb25O YW1lKTsKKyAgICBpZiAoIXBpZCkgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNz U3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjogRmFpbGVkIHRvIGFjcXVpcmUgUkJT ICV7cHVibGljfUAgYXNzZXJ0aW9uICcle3B1YmxpY31zJyBmb3IgcHJvY2VzcyBiZWNhdXNlIFBJ RCBpcyBpbnZhbGlkIiwgdGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29uLmNo YXJhY3RlcnMoKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBSQlNUYXJnZXQgKnRh cmdldCA9IFtSQlNUYXJnZXQgdGFyZ2V0V2l0aFBpZDpwaWRdOworICAgIFJCU0RvbWFpbkF0dHJp YnV0ZSAqZG9tYWluQXR0cmlidXRlID0gW1JCU0RvbWFpbkF0dHJpYnV0ZSBhdHRyaWJ1dGVXaXRo RG9tYWluOkAiY29tLmFwcGxlLndlYmtpdCIgbmFtZTpydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1l XTsKKyAgICBtX3Jic0Fzc2VydGlvbiA9IGFkb3B0TlMoW1tSQlNBc3NlcnRpb24gYWxsb2NdIGlu aXRXaXRoRXhwbGFuYXRpb246bnNSZWFzb24gdGFyZ2V0OnRhcmdldCBhdHRyaWJ1dGVzOkBbZG9t YWluQXR0cmlidXRlXV0pOworCisgICAgbV9kZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS1JCU0Fzc2Vy dGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW21fcmJzQXNzZXJ0aW9uIGFkZE9ic2Vy dmVyOm1fZGVsZWdhdGUuZ2V0KCldOworICAgIG1fZGVsZWdhdGUuZ2V0KCkuaW52YWxpZGF0aW9u Q2FsbGJhY2sgPSBeeworICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVw IC0gUHJvY2Vzc0Fzc2VydGlvbigpIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiBmb3IgcHJvY2Vz cyB3aXRoIFBJRCAlZCB3YXMgaW52YWxpZGF0ZWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRp b25OYW1lLCBwaWQpOworICAgICAgICBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKTsK KyAgICB9OworCisgICAgTlNFcnJvciAqYWNxdWlzaXRpb25FcnJvciA9IG5pbDsKKyAgICBpZiAo IVttX3Jic0Fzc2VydGlvbiBhY3F1aXJlV2l0aEVycm9yOiZhY3F1aXNpdGlvbkVycm9yXSkgewor ICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vz c0Fzc2VydGlvbjogRmFpbGVkIHRvIGFjcXVpcmUgUkJTICV7cHVibGljfUAgYXNzZXJ0aW9uICcl e3B1YmxpY31zJyBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCwgZXJyb3I6ICV7cHVibGljfUAiLCB0 aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCByZWFzb24uY2hhcmFjdGVycygpLCBwaWQs IGFjcXVpc2l0aW9uRXJyb3IpOworICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpLCBeeworICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQorICAgICAgICAgICAg ICAgIHByb2Nlc3NBc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpOworICAgICAgICB9KTsKKyAgICB9 IGVsc2UKKyAgICAgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nl c3NBc3NlcnRpb246IFN1Y2Nlc3NmdWxseSB0b29rIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAn JXtwdWJsaWN9cycgZm9yIHByb2Nlc3Mgd2l0aCBQSUQgJWQiLCB0aGlzLCBydW5uaW5nQm9hcmRB c3NlcnRpb25OYW1lLCByZWFzb24uY2hhcmFjdGVycygpLCBwaWQpOwogfQogCiBQcm9jZXNzQXNz ZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbigpCkBAIC00MTYsMTAgKzQyNSwxMyBAQCBQcm9jZXNz QXNzZXJ0aW9uOjp+UHJvY2Vzc0Fzc2VydGlvbigpCiAgICAgaWYgKG1fcmJzQXNzZXJ0aW9uKSB7 CiAgICAgICAgIFttX3Jic0Fzc2VydGlvbiByZW1vdmVPYnNlcnZlcjptX2RlbGVnYXRlLmdldCgp XTsKICAgICAgICAgW21fcmJzQXNzZXJ0aW9uIGludmFsaWRhdGVdOwotICAgIH0gZWxzZSB7Cisg ICAgfQorI2lmICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElPTlMpCisgICAg aWYgKG1fYmtzQXNzZXJ0aW9uKSB7CiAgICAgICAgIG1fYmtzQXNzZXJ0aW9uLmdldCgpLmludmFs aWRhdGlvbkhhbmRsZXIgPSBuaWw7CiAgICAgICAgIFttX2Jrc0Fzc2VydGlvbiBpbnZhbGlkYXRl XTsKICAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBQcm9jZXNzQXNzZXJ0aW9uOjpwcm9jZXNzQXNz ZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKQo= 397343 2020-04-23 08:27:49 -0700 2020-04-23 09:27:08 -0700 Patch bug-210212-20200423082748.patch text/plain 8702 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFmODEzMTVhMDdiMWExMjhk Y2JkNzQ5Y2ZhZGZiOTkzOTliMzYyMDIuLmUxN2NlZTE1YmRjNTE5NDE0ZDJlMDBlMTU0MzNjNTM1 ZWZhNTE1YWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDQtMjMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBQb3J0IE1lZGlhUGxheWJh Y2sgcHJvY2VzcyBhc3NlcnRpb24gdG8gUnVubmluZ0JvYXJkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTAyMTIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzYxNDc2OTUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAg ICAgIFBvcnQgTWVkaWFQbGF5YmFjayBwcm9jZXNzIGFzc2VydGlvbiB0byBSdW5uaW5nQm9hcmQg aW5zdGVhZCBvZiB0aGUgbGVnYWN5IEJLU1Byb2Nlc3NBc3NlcnRpb24uCisgICAgICAgIFdlIGNh biBub3cgI2lmZGVmIG91dCB0aGUgbGVnYWN5IEJLU1Byb2Nlc3NBc3NlcnRpb24gb24gcmVjZW50 IGlPUyBidWlsZHMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvUHJvY2Vzc0Fzc2VydGlvbklPUy5tbToKKyAgICAgICAg KFdlYktpdDo6cnVubmluZ0JvYXJkTmFtZUZvckFzc2VydGlvblR5cGUpOgorICAgICAgICAoV2Vi S2l0OjpQcm9jZXNzQXNzZXJ0aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKToKKyAgICAgICAgKFdlYktp dDo6UHJvY2Vzc0Fzc2VydGlvbjo6flByb2Nlc3NBc3NlcnRpb24pOgorCiAyMDIwLTA0LTIzICBD aHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcmV2 ZXJ0aW5nIHIyNjAxMzMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9j ZXNzQXNzZXJ0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Qcm9jZXNzQXNzZXJ0aW9u LmgKaW5kZXggNGIwYjdmYjM1YTIyOGFjNWZmYTZhODgzZmRiNmQxZTJkMDE4NzYxMS4uM2Y0MjJh MmM1MjY0ODI3ZGU2Mjc5YmZmNWEyODg5NDVjM2NmMDkzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvUHJvY2Vzc0Fzc2VydGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1Byb2Nlc3NBc3NlcnRpb24uaApAQCAtMzksNyArMzksOSBAQAogCiBPQkpDX0NMQVNT IFJCU0Fzc2VydGlvbjsKIE9CSkNfQ0xBU1MgV0tSQlNBc3NlcnRpb25EZWxlZ2F0ZTsKKyNpZiAh SEFWRShSVU5OSU5HQk9BUkRfVklTSUJJTElUWV9BU1NFUlRJT05TKQogT0JKQ19DTEFTUyBCS1NQ cm9jZXNzQXNzZXJ0aW9uOworI2VuZGlmCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TX0ZBTUlMWSkK IAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC04NSw3ICs4Nyw5IEBAIHByaXZhdGU6CiAjaWYgUExB VEZPUk0oSU9TX0ZBTUlMWSkKICAgICBSZXRhaW5QdHI8UkJTQXNzZXJ0aW9uPiBtX3Jic0Fzc2Vy dGlvbjsKICAgICBSZXRhaW5QdHI8V0tSQlNBc3NlcnRpb25EZWxlZ2F0ZT4gbV9kZWxlZ2F0ZTsK KyNpZiAhSEFWRShSVU5OSU5HQk9BUkRfVklTSUJJTElUWV9BU1NFUlRJT05TKQogICAgIFJldGFp blB0cjxCS1NQcm9jZXNzQXNzZXJ0aW9uPiBtX2Jrc0Fzc2VydGlvbjsgLy8gTGVnYWN5LgorI2Vu ZGlmCiAgICAgVmFsaWRpdHkgbV92YWxpZGl0eSB7IFZhbGlkaXR5OjpVbnNldCB9OwogI2VuZGlm CiAgICAgQ2xpZW50KiBtX2NsaWVudCB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9Qcm9jZXNzQXNzZXJ0aW9uSU9TLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1Byb2Nlc3NBc3NlcnRpb25JT1MubW0KaW5kZXggMzc1NmZmNTE1OWU4 NzMyZGE4NmFmYjkwMGMzMmEwOGE4ZWVmNDhlMS4uZTNhOTYzOTMxY2Q4ZTMyNTgxNDc0NmE5NjQ3 MWNmNzRmMDI5M2Q4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1By b2Nlc3NBc3NlcnRpb25JT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1By b2Nlc3NBc3NlcnRpb25JT1MubW0KQEAgLTI4LDcgKzI4LDYgQEAKIAogI2lmIFBMQVRGT1JNKElP U19GQU1JTFkpCiAKLSNpbXBvcnQgIkFzc2VydGlvblNlcnZpY2VzU1BJLmgiCiAjaW1wb3J0ICJM b2dnaW5nLmgiCiAjaW1wb3J0ICJSdW5uaW5nQm9hcmRTZXJ2aWNlc1NQSS5oIgogI2ltcG9ydCAi V2ViUHJvY2Vzc1Bvb2wuaCIKQEAgLTM4LDYgKzM3LDEwIEBACiAjaW1wb3J0IDx3dGYvVmVjdG9y Lmg+CiAjaW1wb3J0IDx3dGYvV2Vha0hhc2hTZXQuaD4KIAorI2lmICFIQVZFKFJVTk5JTkdCT0FS RF9WSVNJQklMSVRZX0FTU0VSVElPTlMpCisjaW1wb3J0ICJBc3NlcnRpb25TZXJ2aWNlc1NQSS5o IgorI2VuZGlmCisKIHVzaW5nIFdlYktpdDo6UHJvY2Vzc0FuZFVJQXNzZXJ0aW9uOwogCiAvLyBU aGlzIGdpdmVzIHNvbWUgdGltZSB0byBvdXIgY2hpbGQgcHJvY2Vzc2VzIHRvIHByb2Nlc3MgdGhl IFByb2Nlc3NXaWxsU3VzcGVuZEltbWluZW50bHkgSVBDIGJ1dCBtYWtlcyBzdXJlIHdlIHJlbGVh c2UKQEAgLTMxMyw3ICszMTYsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnJ1bm5pbmdCb2FyZE5hbWVG b3JBc3NlcnRpb25UeXBlKFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvbgogICAgIGNhc2Ug UHJvY2Vzc0Fzc2VydGlvblR5cGU6OkRlcGVuZGVudFByb2Nlc3NMaW5rOgogICAgICAgICByZXR1 cm4gQCJEZXBlbmRlbnRQcm9jZXNzTGluayI7CiAgICAgY2FzZSBQcm9jZXNzQXNzZXJ0aW9uVHlw ZTo6TWVkaWFQbGF5YmFjazoKLSAgICAgICAgcmV0dXJuIG5pbDsgLy8gRklYTUU6IE5hbWUgdG8g YmUgZGVmaW5lZCBpbiA8cmRhcjovL3Byb2JsZW0vNjEyNjMxNDc+LgorICAgICAgICByZXR1cm4g QCJNZWRpYVBsYXliYWNrIjsKICAgICB9CiAjZWxzZQogICAgIGlmIChhc3NlcnRpb25UeXBlID09 IFByb2Nlc3NBc3NlcnRpb25UeXBlOjpEZXBlbmRlbnRQcm9jZXNzTGluaykKQEAgLTMyMiw2ICsz MjUsOCBAQCBzdGF0aWMgTlNTdHJpbmcgKnJ1bm5pbmdCb2FyZE5hbWVGb3JBc3NlcnRpb25UeXBl KFByb2Nlc3NBc3NlcnRpb25UeXBlIGFzc2VydGlvbgogI2VuZGlmCiB9CiAKKyNpZiAhSEFWRShS VU5OSU5HQk9BUkRfVklTSUJJTElUWV9BU1NFUlRJT05TKQorCiBjb25zdCBCS1NQcm9jZXNzQXNz ZXJ0aW9uRmxhZ3Mgc3VzcGVuZGVkVGFiRmxhZ3MgPSAoQktTUHJvY2Vzc0Fzc2VydGlvbkFsbG93 SWRsZVNsZWVwKTsKIGNvbnN0IEJLU1Byb2Nlc3NBc3NlcnRpb25GbGFncyBiYWNrZ3JvdW5kVGFi RmxhZ3MgPSAoQktTUHJvY2Vzc0Fzc2VydGlvblByZXZlbnRUYXNrU3VzcGVuZCk7CiBjb25zdCBC S1NQcm9jZXNzQXNzZXJ0aW9uRmxhZ3MgZm9yZWdyb3VuZFRhYkZsYWdzID0gKEJLU1Byb2Nlc3NB c3NlcnRpb25QcmV2ZW50VGFza1N1c3BlbmQgfCBCS1NQcm9jZXNzQXNzZXJ0aW9uV2FudHNGb3Jl Z3JvdW5kUmVzb3VyY2VQcmlvcml0eSB8IEJLU1Byb2Nlc3NBc3NlcnRpb25QcmV2ZW50VGFza1Ro cm90dGxlRG93bik7CkBAIC0zNjAsMzkgKzM2NSwxNyBAQCBzdGF0aWMgQktTUHJvY2Vzc0Fzc2Vy dGlvblJlYXNvbiB0b0JLU1Byb2Nlc3NBc3NlcnRpb25SZWFzb24oUHJvY2Vzc0Fzc2VydGlvblR5 cAogICAgIH0KIH0KIAorI2VuZGlmIC8vICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJQklMSVRZX0FT U0VSVElPTlMpCisKIFByb2Nlc3NBc3NlcnRpb246OlByb2Nlc3NBc3NlcnRpb24ocGlkX3QgcGlk LCBjb25zdCBTdHJpbmcmIHJlYXNvbiwgUHJvY2Vzc0Fzc2VydGlvblR5cGUgYXNzZXJ0aW9uVHlw ZSkKICAgICA6IG1fYXNzZXJ0aW9uVHlwZShhc3NlcnRpb25UeXBlKQogICAgICwgbV9waWQocGlk KQogewogICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyk7CiAgICAgTlNTdHJp bmcgKnJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUgPSBydW5uaW5nQm9hcmROYW1lRm9yQXNzZXJ0 aW9uVHlwZShhc3NlcnRpb25UeXBlKTsKLSAgICBpZiAocnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFt ZSkgewotICAgICAgICBpZiAoIXBpZCkgewotICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1Io UHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb246IEZhaWxlZCB0byBhY3F1 aXJlIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3MgYmVj YXVzZSBQSUQgaXMgaW52YWxpZCIsIHRoaXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJl YXNvbi51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotCi0g ICAgICAgIFJCU1RhcmdldCAqdGFyZ2V0ID0gW1JCU1RhcmdldCB0YXJnZXRXaXRoUGlkOnBpZF07 Ci0gICAgICAgIFJCU0RvbWFpbkF0dHJpYnV0ZSAqZG9tYWluQXR0cmlidXRlID0gW1JCU0RvbWFp bkF0dHJpYnV0ZSBhdHRyaWJ1dGVXaXRoRG9tYWluOkAiY29tLmFwcGxlLndlYmtpdCIgbmFtZTpy dW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lXTsKLSAgICAgICAgbV9yYnNBc3NlcnRpb24gPSBhZG9w dE5TKFtbUkJTQXNzZXJ0aW9uIGFsbG9jXSBpbml0V2l0aEV4cGxhbmF0aW9uOnJlYXNvbiB0YXJn ZXQ6dGFyZ2V0IGF0dHJpYnV0ZXM6QFtkb21haW5BdHRyaWJ1dGVdXSk7Ci0KLSAgICAgICAgbV9k ZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS1JCU0Fzc2VydGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7 Ci0gICAgICAgIFttX3Jic0Fzc2VydGlvbiBhZGRPYnNlcnZlcjptX2RlbGVnYXRlLmdldCgpXTsK LSAgICAgICAgbV9kZWxlZ2F0ZS5nZXQoKS5pbnZhbGlkYXRpb25DYWxsYmFjayA9IF57Ci0gICAg ICAgICAgICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2Vy dGlvbigpIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCB3 YXMgaW52YWxpZGF0ZWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCBwaWQpOwot ICAgICAgICAgICAgcHJvY2Vzc0Fzc2VydGlvbldhc0ludmFsaWRhdGVkKCk7Ci0gICAgICAgIH07 CiAKLSAgICAgICAgTlNFcnJvciAqYWNxdWlzaXRpb25FcnJvciA9IG5pbDsKLSAgICAgICAgaWYg KCFbbV9yYnNBc3NlcnRpb24gYWNxdWlyZVdpdGhFcnJvcjomYWNxdWlzaXRpb25FcnJvcl0pIHsK LSAgICAgICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQ cm9jZXNzQXNzZXJ0aW9uOiBGYWlsZWQgdG8gYWNxdWlyZSBSQlMgJXtwdWJsaWN9QCBhc3NlcnRp b24gJyV7cHVibGljfXMnIGZvciBwcm9jZXNzIHdpdGggUElEICVkLCBlcnJvcjogJXtwdWJsaWN9 QCIsIHRoaXMsIHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi51dGY4KCkuZGF0YSgp LCBwaWQsIGFjcXVpc2l0aW9uRXJyb3IpOwotICAgICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAgICAgICAgICAgICAgICBpZiAod2Vha1RoaXMp Ci0gICAgICAgICAgICAgICAgICAgIHByb2Nlc3NBc3NlcnRpb25XYXNJbnZhbGlkYXRlZCgpOwot ICAgICAgICAgICAgfSk7Ci0gICAgICAgIH0gZWxzZQotICAgICAgICAgICAgUkVMRUFTRV9MT0co UHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFByb2Nlc3NBc3NlcnRpb246IFN1Y2Nlc3NmdWxseSB0 b29rIFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3Mgd2l0 aCBQSUQgJWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCByZWFzb24udXRmOCgp LmRhdGEoKSwgcGlkKTsKLSAgICB9IGVsc2UgeworI2lmICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJ QklMSVRZX0FTU0VSVElPTlMpCisgICAgaWYgKCFydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lKSB7 CiAgICAgICAgIC8vIExlZ2FjeSBjb2RlIHBhdGguCiAgICAgICAgIEJLU1Byb2Nlc3NBc3NlcnRp b25BY3F1aXNpdGlvbkhhbmRsZXIgaGFuZGxlciA9IF4oQk9PTCBhY3F1aXJlZCkgewogICAgICAg ICAgICAgaWYgKCFhY3F1aXJlZCkgewpAQCAtNDE0LDcgKzM5NywzNiBAQCBQcm9jZXNzQXNzZXJ0 aW9uOjpQcm9jZXNzQXNzZXJ0aW9uKHBpZF90IHBpZCwgY29uc3QgU3RyaW5nJiByZWFzb24sIFBy b2Nlc3NBc3NlcgogICAgICAgICAgICAgICAgICAgICBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxp ZGF0ZWQoKTsKICAgICAgICAgICAgIH0pOwogICAgICAgICB9OworICAgICAgICByZXR1cm47CiAg ICAgfQorI2VuZGlmIC8vICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJQklMSVRZX0FTU0VSVElPTlMp CisKKyAgICBBU1NFUlQocnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSk7CisgICAgaWYgKCFwaWQp IHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFBy b2Nlc3NBc3NlcnRpb246IEZhaWxlZCB0byBhY3F1aXJlIFJCUyAle3B1YmxpY31AIGFzc2VydGlv biAnJXtwdWJsaWN9cycgZm9yIHByb2Nlc3MgYmVjYXVzZSBQSUQgaXMgaW52YWxpZCIsIHRoaXMs IHJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWUsIHJlYXNvbi51dGY4KCkuZGF0YSgpKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIFJCU1RhcmdldCAqdGFyZ2V0ID0gW1JCU1RhcmdldCB0 YXJnZXRXaXRoUGlkOnBpZF07CisgICAgUkJTRG9tYWluQXR0cmlidXRlICpkb21haW5BdHRyaWJ1 dGUgPSBbUkJTRG9tYWluQXR0cmlidXRlIGF0dHJpYnV0ZVdpdGhEb21haW46QCJjb20uYXBwbGUu d2Via2l0IiBuYW1lOnJ1bm5pbmdCb2FyZEFzc2VydGlvbk5hbWVdOworICAgIG1fcmJzQXNzZXJ0 aW9uID0gYWRvcHROUyhbW1JCU0Fzc2VydGlvbiBhbGxvY10gaW5pdFdpdGhFeHBsYW5hdGlvbjpy ZWFzb24gdGFyZ2V0OnRhcmdldCBhdHRyaWJ1dGVzOkBbZG9tYWluQXR0cmlidXRlXV0pOworCisg ICAgbV9kZWxlZ2F0ZSA9IGFkb3B0TlMoW1tXS1JCU0Fzc2VydGlvbkRlbGVnYXRlIGFsbG9jXSBp bml0XSk7CisgICAgW21fcmJzQXNzZXJ0aW9uIGFkZE9ic2VydmVyOm1fZGVsZWdhdGUuZ2V0KCld OworICAgIG1fZGVsZWdhdGUuZ2V0KCkuaW52YWxpZGF0aW9uQ2FsbGJhY2sgPSBeeworICAgICAg ICBSRUxFQVNFX0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbigp IFJCUyAle3B1YmxpY31AIGFzc2VydGlvbiBmb3IgcHJvY2VzcyB3aXRoIFBJRCAlZCB3YXMgaW52 YWxpZGF0ZWQiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3NlcnRpb25OYW1lLCBwaWQpOworICAgICAg ICBwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKTsKKyAgICB9OworCisgICAgTlNFcnJv ciAqYWNxdWlzaXRpb25FcnJvciA9IG5pbDsKKyAgICBpZiAoIVttX3Jic0Fzc2VydGlvbiBhY3F1 aXJlV2l0aEVycm9yOiZhY3F1aXNpdGlvbkVycm9yXSkgeworICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gUHJvY2Vzc0Fzc2VydGlvbjogRmFpbGVkIHRv IGFjcXVpcmUgUkJTICV7cHVibGljfUAgYXNzZXJ0aW9uICcle3B1YmxpY31zJyBmb3IgcHJvY2Vz cyB3aXRoIFBJRCAlZCwgZXJyb3I6ICV7cHVibGljfUAiLCB0aGlzLCBydW5uaW5nQm9hcmRBc3Nl cnRpb25OYW1lLCByZWFzb24udXRmOCgpLmRhdGEoKSwgcGlkLCBhY3F1aXNpdGlvbkVycm9yKTsK KyAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAg ICAgICAgICAgIGlmICh3ZWFrVGhpcykKKyAgICAgICAgICAgICAgICBwcm9jZXNzQXNzZXJ0aW9u V2FzSW52YWxpZGF0ZWQoKTsKKyAgICAgICAgfSk7CisgICAgfSBlbHNlCisgICAgICAgIFJFTEVB U0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBQcm9jZXNzQXNzZXJ0aW9uOiBTdWNjZXNz ZnVsbHkgdG9vayBSQlMgJXtwdWJsaWN9QCBhc3NlcnRpb24gJyV7cHVibGljfXMnIGZvciBwcm9j ZXNzIHdpdGggUElEICVkIiwgdGhpcywgcnVubmluZ0JvYXJkQXNzZXJ0aW9uTmFtZSwgcmVhc29u LnV0ZjgoKS5kYXRhKCksIHBpZCk7CiB9CiAKIFByb2Nlc3NBc3NlcnRpb246On5Qcm9jZXNzQXNz ZXJ0aW9uKCkKQEAgLTQyNywxMCArNDM5LDE0IEBAIFByb2Nlc3NBc3NlcnRpb246On5Qcm9jZXNz QXNzZXJ0aW9uKCkKIAogICAgICAgICBbbV9yYnNBc3NlcnRpb24gcmVtb3ZlT2JzZXJ2ZXI6bV9k ZWxlZ2F0ZS5nZXQoKV07CiAgICAgICAgIFttX3Jic0Fzc2VydGlvbiBpbnZhbGlkYXRlXTsKLSAg ICB9IGVsc2UgeworICAgIH0KKworI2lmICFIQVZFKFJVTk5JTkdCT0FSRF9WSVNJQklMSVRZX0FT U0VSVElPTlMpCisgICAgaWYgKG1fYmtzQXNzZXJ0aW9uKSB7CiAgICAgICAgIG1fYmtzQXNzZXJ0 aW9uLmdldCgpLmludmFsaWRhdGlvbkhhbmRsZXIgPSBuaWw7CiAgICAgICAgIFttX2Jrc0Fzc2Vy dGlvbiBpbnZhbGlkYXRlXTsKICAgICB9CisjZW5kaWYKIH0KIAogdm9pZCBQcm9jZXNzQXNzZXJ0 aW9uOjpwcm9jZXNzQXNzZXJ0aW9uV2FzSW52YWxpZGF0ZWQoKQo=