199278 2019-06-27 10:55:45 -0700 Regression(r246526): StorageManager thread hangs 2019-06-27 13:46:30 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen beidson commit-queue ggaren oldest_to_newest 1548526 0 sihui_liu 2019-06-27 10:55:45 -0700 getOrCreateLocalStorageNamespace acquires lock m_localStorageNamespacesMutex when m_localStorageNamespacesMutex is already acquired. 1548527 1 sihui_liu 2019-06-27 10:56:13 -0700 <rdar://problem/52202948> 1548544 2 373039 sihui_liu 2019-06-27 11:16:37 -0700 Created attachment 373039 Patch 1548555 3 373039 ggaren 2019-06-27 11:36:18 -0700 Comment on attachment 373039 Patch r=me Can we add a test for this? 1548603 4 373039 commit-queue 2019-06-27 13:46:29 -0700 Comment on attachment 373039 Patch Clearing flags on attachment: 373039 Committed r246901: <https://trac.webkit.org/changeset/246901> 1548604 5 commit-queue 2019-06-27 13:46:30 -0700 All reviewed patches have been landed. Closing bug. 373039 2019-06-27 11:16:37 -0700 2019-06-27 13:46:29 -0700 Patch bug-199278-20190627111637.patch text/plain 12145 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2ODQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDBiNjkyZTcxZmM0ZGQ2YmIx OTQ5ZjdiMzNhYTJkYTdhMTc3YTI5YzMuLmE4YTE1MGNiMGE5MWIzZGI3Y2Q3MWEzNGY1NTI3MzZh ZDk0M2RmMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYgQEAKKzIwMTktMDYtMjcgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbihyMjQ2NTI2KTog U3RvcmFnZU1hbmFnZXIgdGhyZWFkIGhhbmdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkyNzgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUyMjAy OTQ4PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHIy NDY1MjYgYWRkcyBhIGxvY2sgbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXggdG8gcHJvdGVj dCBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMsIGJlY2F1c2UgCisgICAgICAgIG1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlcyBpcyBkZXN0cm95ZWQgYXQgbWFpbiB0aHJlYWQgd2hpbGUgYWNjZXNzZXMg dG8gbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzIGhhcHBlbiBpbiB0aGUgCisgICAgICAgIGJhY2tn cm91bmQgdGhyZWFkLgorICAgICAgICBBZnRlciByMjQ2NTI2LCBnZXRPckNyZWF0ZUxvY2FsU3Rv cmFnZU5hbWVzcGFjZSBhY3F1aXJlcyBsb2NrIG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4 IHdoZW4gCisgICAgICAgIG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4IGlzIGFscmVhZHkg YWNxdWlyZWQgaW4gY2xvbmVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZSwgc28gdGhlIFN0b3JhZ2VN YW5hZ2VyIHRocmVhZAorICAgICAgICBoYW5ncy4KKyAgICAgICAgVG8gc29sdmUgdGhpcyBpc3N1 ZSwgd2UgY2FuIHJlbW92ZSB0aGUgbG9jayBpbiBnZXRPckNyZWF0ZUxvY2FsU3RvcmFnZU5hbWVz cGFjZSwgb3Igd2UgY2FuIHJlbW92ZSB0aGUgCisgICAgICAgIG1fbG9jYWxTdG9yYWdlTmFtZXNw YWNlc011dGV4LiB3YWl0VW50aWxXcml0ZXNGaW5pc2hlZCgpIGJlZm9yZSB+U3RvcmFnZU1hbmFn ZXIoKSBhbHJlYWR5IGd1YXJhbnRlZXMgbm90aGluZyAKKyAgICAgICAgd2lsbCBiZSBydW5uaW5n IGluIHRoZSBiYWNrZ3JvdW5kIHRocmVhZCwgc28gaXQgaXMgdW5saWtlbHkgd2UgdGhlIGFjY2Vz cyB0byBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMgaW4gdGhlIAorICAgICAgICBiYWNrZ3JvdW5k IHRocmVhZCB3b3VsZCBjb2xsaWRlIHdpdGggdGhlIGRlc3RydWN0aW9uIG9mIG1fbG9jYWxTdG9y YWdlTmFtZXNwYWNlcy4gQWxzbywgd2UgZG9uJ3QgbmVlZCAKKyAgICAgICAgZGlkRGVzdHJveVN0 b3JhZ2VBcmVhIGFzIExvY2FsU3RvcmFnZU5hbWVzcGFjZSBjYW4gaG9sZCB0aGUgbGFzdCByZWZl cmVuY2Ugb2YgU3RvcmFnZUFyZWEgYWZ0ZXIgcjI0NTg4MS4KKworICAgICAgICAqIE5ldHdvcmtQ cm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VBcmVhKToKKyAgICAgICAgKFdlYktp dDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjp+U3RvcmFnZUFyZWEpOgorICAgICAgICAo V2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpMb2NhbFN0b3Jh Z2VOYW1lc3BhY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Y2xvbmVTZXNz aW9uU3RvcmFnZU5hbWVzcGFjZSk6CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpn ZXRMb2NhbFN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6 OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpT dG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UpOgor ICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlRW50cmll c0Zvck9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVh dGVMb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOgorICAgICAgICAoV2ViS2l0OjpTdG9yYWdlTWFuYWdl cjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlOjpkaWREZXN0cm95U3RvcmFnZUFyZWEpOiBEZWxldGVk LgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaDoK KwogMjAxOS0wNi0yNiAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtDb250ZW50Q2hhbmdlT2JzZXJ2ZXJdIERpc3BhdGNoIHN5bnRoZXRpYyBtb3VzZSBldmVudCBh c3luY2hyb25vdXNseSBpbiBjb21wbGV0ZVBlbmRpbmdTeW50aGV0aWNDbGlja0ZvckNvbnRlbnRD aGFuZ2VPYnNlcnZlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9X ZWJTdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNTBmZGU5MGQ2MTVlZDU4ODk2 MDE1YzY5YTJiMDkxNTJmZDJmYjI3Yi4uMjExZjgyMzA0NmRkODc2YzUzNTdjODkwMDk5NjhkNjky ZjRlNGMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9XZWJTdG9y YWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBkaXNwYXRjaEV2ZW50cyhJUEM6OkNvbm5lY3Rpb246OlVuaXF1ZUlEIHNvdXJj ZUNvbm5lY3Rpb24sIHVpbnQ2NF90IHNvdXJjZVN0b3JhZ2VBcmVhSUQsIGNvbnN0IFN0cmluZyYg a2V5LCBjb25zdCBTdHJpbmcmIG9sZFZhbHVlLCBjb25zdCBTdHJpbmcmIG5ld1ZhbHVlLCBjb25z dCBTdHJpbmcmIHVybFN0cmluZykgY29uc3Q7CiAKICAgICAvLyBXaWxsIGJlIG51bGwgaWYgdGhl IHN0b3JhZ2UgYXJlYSBiZWxvbmdzIHRvIGEgc2Vzc2lvbiBzdG9yYWdlIG5hbWVzcGFjZSBvciB0 aGUgc3RvcmFnZSBhcmVhIGlzIGluIGFuIGVwaGVtZXJhbCBzZXNzaW9uLgotICAgIExvY2FsU3Rv cmFnZU5hbWVzcGFjZSogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2U7CisgICAgV2Vha1B0cjxMb2Nh bFN0b3JhZ2VOYW1lc3BhY2U+IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlOwogICAgIG11dGFibGUg UmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNlPiBtX2xvY2FsU3RvcmFnZURhdGFiYXNlOwogICAg IG11dGFibGUgYm9vbCBtX2RpZEltcG9ydEl0ZW1zRnJvbURhdGFiYXNlIHsgZmFsc2UgfTsKIApA QCAtODQsNyArODQsNyBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8c3RkOjpwYWlyPElQQzo6Q29u bmVjdGlvbjo6VW5pcXVlSUQsIHVpbnQ2NF90Pj4gbV9ldmVudExpc3RlbmVyczsKIH07CiAKLWNs YXNzIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBwdWJsaWMgVGhyZWFk U2FmZVJlZkNvdW50ZWQ8TG9jYWxTdG9yYWdlTmFtZXNwYWNlPiB7CitjbGFzcyBTdG9yYWdlTWFu YWdlcjo6TG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogcHVibGljIFRocmVhZFNhZmVSZWZDb3VudGVk PExvY2FsU3RvcmFnZU5hbWVzcGFjZT4sIHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxMb2NhbFN0b3Jh Z2VOYW1lc3BhY2U+IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUmVmPExvY2FsU3RvcmFnZU5hbWVz cGFjZT4gY3JlYXRlKFN0b3JhZ2VNYW5hZ2VyJiwgdWludDY0X3Qgc3RvcmFnZU1hbmFnZXJJRCk7 CiAgICAgfkxvY2FsU3RvcmFnZU5hbWVzcGFjZSgpOwpAQCAtOTMsNyArOTMsNiBAQCBwdWJsaWM6 CiAKICAgICBlbnVtIGNsYXNzIElzRXBoZW1lcmFsIDogYm9vbCB7IE5vLCBZZXMgfTsKICAgICBS ZWY8U3RvcmFnZUFyZWE+IGdldE9yQ3JlYXRlU3RvcmFnZUFyZWEoU2VjdXJpdHlPcmlnaW5EYXRh JiYsIElzRXBoZW1lcmFsKTsKLSAgICB2b2lkIGRpZERlc3Ryb3lTdG9yYWdlQXJlYShTdG9yYWdl QXJlYSopOwogCiAgICAgdm9pZCBjbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKGNvbnN0 IFNlY3VyaXR5T3JpZ2luRGF0YSYpOwogICAgIHZvaWQgY2xlYXJBbGxTdG9yYWdlQXJlYXMoKTsK QEAgLTEwNSw3ICsxMDQsNiBAQCBwcml2YXRlOgogICAgIExvY2FsU3RvcmFnZU5hbWVzcGFjZShT dG9yYWdlTWFuYWdlciYsIHVpbnQ2NF90IHN0b3JhZ2VNYW5hZ2VySUQpOwogCiAgICAgU3RvcmFn ZU1hbmFnZXImIG1fc3RvcmFnZU1hbmFnZXI7Ci0gICAgdWludDY0X3QgbV9zdG9yYWdlTmFtZXNw YWNlSUQ7CiAgICAgdW5zaWduZWQgbV9xdW90YUluQnl0ZXM7CiAKICAgICBIYXNoTWFwPFNlY3Vy aXR5T3JpZ2luRGF0YSwgUmVmUHRyPFN0b3JhZ2VBcmVhPj4gbV9zdG9yYWdlQXJlYU1hcDsKQEAg LTE3Myw3ICsxNzEsNyBAQCBhdXRvIFN0b3JhZ2VNYW5hZ2VyOjpTdG9yYWdlQXJlYTo6Y3JlYXRl KExvY2FsU3RvcmFnZU5hbWVzcGFjZSogbG9jYWxTdG9yYWdlTmFtZQogfQogCiBTdG9yYWdlTWFu YWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VBcmVhKExvY2FsU3RvcmFnZU5hbWVzcGFjZSogbG9j YWxTdG9yYWdlTmFtZXNwYWNlLCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3Jp Z2luLCB1bnNpZ25lZCBxdW90YUluQnl0ZXMpCi0gICAgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFj ZShsb2NhbFN0b3JhZ2VOYW1lc3BhY2UpCisgICAgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZShs b2NhbFN0b3JhZ2VOYW1lc3BhY2UgPyBtYWtlV2Vha1B0cigqbG9jYWxTdG9yYWdlTmFtZXNwYWNl KSA6IG51bGxwdHIpCiAgICAgLCBtX3NlY3VyaXR5T3JpZ2luKHNlY3VyaXR5T3JpZ2luKQogICAg ICwgbV9xdW90YUluQnl0ZXMocXVvdGFJbkJ5dGVzKQogICAgICwgbV9zdG9yYWdlTWFwKFN0b3Jh Z2VNYXA6OmNyZWF0ZShtX3F1b3RhSW5CeXRlcykpCkBAIC0xODMsMTIgKzE4MSwxMCBAQCBTdG9y YWdlTWFuYWdlcjo6U3RvcmFnZUFyZWE6OlN0b3JhZ2VBcmVhKExvY2FsU3RvcmFnZU5hbWVzcGFj ZSogbG9jYWxTdG9yYWdlTmFtZQogU3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VBcmVhOjp+U3RvcmFn ZUFyZWEoKQogewogICAgIEFTU0VSVChtX2V2ZW50TGlzdGVuZXJzLmlzRW1wdHkoKSk7CisgICAg QVNTRVJUKCFtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZSk7CiAKICAgICBpZiAobV9sb2NhbFN0b3Jh Z2VEYXRhYmFzZSkKICAgICAgICAgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZS0+Y2xvc2UoKTsKLQot ICAgIGlmIChtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZSkKLSAgICAgICAgbV9sb2NhbFN0b3JhZ2VO YW1lc3BhY2UtPmRpZERlc3Ryb3lTdG9yYWdlQXJlYSh0aGlzKTsKIH0KIAogdm9pZCBTdG9yYWdl TWFuYWdlcjo6U3RvcmFnZUFyZWE6OmFkZExpc3RlbmVyKElQQzo6Q29ubmVjdGlvbjo6VW5pcXVl SUQgY29ubmVjdGlvbklELCB1aW50NjRfdCBzdG9yYWdlTWFwSUQpCkBAIC0zNTAsNyArMzQ2LDYg QEAgUmVmPFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2U+IFN0b3JhZ2VNYW5h Z2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2UKIC8vIFdlIHNob3VsZCBpbnZlc3RpZ2F0ZSBhIHdh eSB0byBzaGFyZSBpdCB3aXRoIFdlYkNvcmUuCiBTdG9yYWdlTWFuYWdlcjo6TG9jYWxTdG9yYWdl TmFtZXNwYWNlOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2UoU3RvcmFnZU1hbmFnZXImIHN0b3JhZ2VN YW5hZ2VyLCB1aW50NjRfdCBzdG9yYWdlTmFtZXNwYWNlSUQpCiAgICAgOiBtX3N0b3JhZ2VNYW5h Z2VyKHN0b3JhZ2VNYW5hZ2VyKQotICAgICwgbV9zdG9yYWdlTmFtZXNwYWNlSUQoc3RvcmFnZU5h bWVzcGFjZUlEKQogICAgICwgbV9xdW90YUluQnl0ZXMobG9jYWxTdG9yYWdlRGF0YWJhc2VRdW90 YUluQnl0ZXMpCiB7CiB9CkBAIC0zNjgsMTkgKzM2Myw2IEBAIGF1dG8gU3RvcmFnZU1hbmFnZXI6 OkxvY2FsU3RvcmFnZU5hbWVzcGFjZTo6Z2V0T3JDcmVhdGVTdG9yYWdlQXJlYShTZWN1cml0eU9y aWdpCiAgICAgfSkuaXRlcmF0b3ItPnZhbHVlOwogfQogCi12b2lkIFN0b3JhZ2VNYW5hZ2VyOjpM b2NhbFN0b3JhZ2VOYW1lc3BhY2U6OmRpZERlc3Ryb3lTdG9yYWdlQXJlYShTdG9yYWdlQXJlYSog c3RvcmFnZUFyZWEpCi17Ci0gICAgQVNTRVJUKG1fc3RvcmFnZUFyZWFNYXAuY29udGFpbnMoc3Rv cmFnZUFyZWEtPnNlY3VyaXR5T3JpZ2luKCkpKTsKLQotICAgIG1fc3RvcmFnZUFyZWFNYXAucmVt b3ZlKHN0b3JhZ2VBcmVhLT5zZWN1cml0eU9yaWdpbigpKTsKLSAgICBpZiAoIW1fc3RvcmFnZUFy ZWFNYXAuaXNFbXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBzdGQ6OmxvY2tfZ3VhcmQ8 TG9jaz4gbG9jayhtX3N0b3JhZ2VNYW5hZ2VyLm1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4 KTsKLSAgICBBU1NFUlQobV9zdG9yYWdlTWFuYWdlci5tX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMu Y29udGFpbnMobV9zdG9yYWdlTmFtZXNwYWNlSUQpKTsKLSAgICBtX3N0b3JhZ2VNYW5hZ2VyLm1f bG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5yZW1vdmUobV9zdG9yYWdlTmFtZXNwYWNlSUQpOwotfQot CiB2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpMb2NhbFN0b3JhZ2VOYW1lc3BhY2U6OmNsZWFyU3RvcmFn ZUFyZWFzTWF0Y2hpbmdPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBzZWN1cml0eU9y aWdpbikKIHsKICAgICBhdXRvIG9yaWdpbkFuZFN0b3JhZ2VBcmVhID0gbV9zdG9yYWdlQXJlYU1h cC5maW5kKHNlY3VyaXR5T3JpZ2luKTsKQEAgLTU3Myw3ICs1NTUsNiBAQCB2b2lkIFN0b3JhZ2VN YW5hZ2VyOjpjbG9uZVNlc3Npb25TdG9yYWdlTmFtZXNwYWNlKHVpbnQ2NF90IHN0b3JhZ2VOYW1l c3BhY2VJRCwgdQogICAgICAgICBzZXNzaW9uU3RvcmFnZU5hbWVzcGFjZS0+Y2xvbmVUbygqbmV3 U2Vzc2lvblN0b3JhZ2VOYW1lc3BhY2UpOwogCiAgICAgICAgIGlmICghbV9sb2NhbFN0b3JhZ2VE YXRhYmFzZVRyYWNrZXIpIHsKLSAgICAgICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2Nr KG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKICAgICAgICAgICAgIGlmIChhdXRvKiBs b2NhbFN0b3JhZ2VOYW1lc3BhY2UgPSBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMuZ2V0KHN0b3Jh Z2VOYW1lc3BhY2VJRCkpIHsKICAgICAgICAgICAgICAgICBMb2NhbFN0b3JhZ2VOYW1lc3BhY2Uq IG5ld2xvY2FsU3RvcmFnZU5hbWVzcGFjZSA9IGdldE9yQ3JlYXRlTG9jYWxTdG9yYWdlTmFtZXNw YWNlKG5ld1N0b3JhZ2VOYW1lc3BhY2VJRCk7CiAgICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdl TmFtZXNwYWNlLT5jbG9uZVRvKCpuZXdsb2NhbFN0b3JhZ2VOYW1lc3BhY2UpOwpAQCAtNjY0LDcg KzY0NSw2IEBAIHZvaWQgU3RvcmFnZU1hbmFnZXI6OmdldExvY2FsU3RvcmFnZU9yaWdpbnMoRnVu Y3Rpb248dm9pZChIYXNoU2V0PFdlYkNvcmU6OlNlY3VyCiAgICAgICAgICAgICBmb3IgKGF1dG8m IG9yaWdpbiA6IG1fbG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLT5vcmlnaW5zKCkpCiAgICAg ICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgIHN0ZDo6bG9ja19ndWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNl c011dGV4KTsKICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0byYgbG9jYWxTdG9yYWdlTmFtZVNw YWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKSB7CiAgICAgICAgICAgICAg ICAgZm9yIChhdXRvJiBvcmlnaW4gOiBsb2NhbFN0b3JhZ2VOYW1lU3BhY2UtPmVwaGVtZXJhbE9y aWdpbnMoKSkKICAgICAgICAgICAgICAgICAgICAgb3JpZ2lucy5hZGQob3JpZ2luKTsKQEAgLTY5 OCwxMSArNjc4LDggQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0TG9jYWxTdG9yYWdlT3JpZ2lu RGV0YWlscyhGdW5jdGlvbjx2b2lkKFZlY3RvcjxMb2NhbFN0b3IKIHZvaWQgU3RvcmFnZU1hbmFn ZXI6OmRlbGV0ZUxvY2FsU3RvcmFnZUVudHJpZXNGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmln aW5EYXRhJiBzZWN1cml0eU9yaWdpbikKIHsKICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbdGhpcywg cHJvdGVjdGVkVGhpcyA9IG1ha2VSZWYoKnRoaXMpLCBjb3BpZWRPcmlnaW4gPSBzZWN1cml0eU9y aWdpbi5pc29sYXRlZENvcHkoKV0oKSBtdXRhYmxlIHsKLSAgICAgICAgewotICAgICAgICAgICAg c3RkOjpsb2NrX2d1YXJkPExvY2s+IGxvY2sobV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzTXV0ZXgp OwotICAgICAgICAgICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBtX2xvY2Fs U3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCi0gICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdl TmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01hdGNoaW5nT3JpZ2luKGNvcGllZE9yaWdpbik7 Ci0gICAgICAgIH0KKyAgICAgICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UgOiBt X2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCisgICAgICAgICAgICBsb2NhbFN0b3Jh Z2VOYW1lc3BhY2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4oY29waWVkT3JpZ2lu KTsKIAogICAgICAgICBmb3IgKGF1dG8mIHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZSA6 IG1fdHJhbnNpZW50TG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKICAgICAgICAgICAg IHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGlu Z09yaWdpbihjb3BpZWRPcmlnaW4pOwpAQCAtNzIyLDE2ICs2OTksMTIgQEAgdm9pZCBTdG9yYWdl TWFuYWdlcjo6ZGVsZXRlTG9jYWxTdG9yYWdlT3JpZ2luc01vZGlmaWVkU2luY2UoV2FsbFRpbWUg dGltZSwgRnVuY3QKICAgICAgICAgICAgICAgICB0cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CiAKICAgICAgICAgICAgIGZvciAoY29uc3QgYXV0 byYgb3JpZ2luIDogb3JpZ2luc1RvRGVsZXRlKSB7Ci0gICAgICAgICAgICAgICAgewotICAgICAg ICAgICAgICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5h bWVzcGFjZXNNdXRleCk7Ci0gICAgICAgICAgICAgICAgICAgIGZvciAoYXV0byYgbG9jYWxTdG9y YWdlTmFtZXNwYWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1lc3BhY2VzLnZhbHVlcygpKQotICAgICAg ICAgICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVh c01hdGNoaW5nT3JpZ2luKG9yaWdpbik7Ci0gICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIGZvciAoYXV0byYgbG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV9sb2NhbFN0b3JhZ2VOYW1l c3BhY2VzLnZhbHVlcygpKQorICAgICAgICAgICAgICAgICAgICBsb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UtPmNsZWFyU3RvcmFnZUFyZWFzTWF0Y2hpbmdPcmlnaW4ob3JpZ2luKTsKICAgICAgICAgICAg ICAgICAKICAgICAgICAgICAgICAgICBtX2xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci0+ZGVs ZXRlRGF0YWJhc2VXaXRoT3JpZ2luKG9yaWdpbik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3Rv cmFnZU5hbWVzcGFjZXNNdXRleCk7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIGxvY2FsU3RvcmFn ZU5hbWVzcGFjZSA6IG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy52YWx1ZXMoKSkKICAgICAgICAg ICAgICAgICBsb2NhbFN0b3JhZ2VOYW1lc3BhY2UtPmNsZWFyQWxsU3RvcmFnZUFyZWFzKCk7CiAg ICAgICAgIH0KQEAgLTc1MCwxMSArNzIzLDggQEAgdm9pZCBTdG9yYWdlTWFuYWdlcjo6ZGVsZXRl TG9jYWxTdG9yYWdlRW50cmllc0Zvck9yaWdpbnMoY29uc3QgVmVjdG9yPFdlYkNvcmU6OlMKIAog ICAgIG1fcXVldWUtPmRpc3BhdGNoKFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhp cyksIGNvcGllZE9yaWdpbnMgPSBXVEZNb3ZlKGNvcGllZE9yaWdpbnMpLCBjb21wbGV0aW9uSGFu ZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpXSgpIG11dGFibGUgewogICAgICAgICBm b3IgKGF1dG8mIG9yaWdpbiA6IGNvcGllZE9yaWdpbnMpIHsKLSAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICBzdGQ6OmxvY2tfZ3VhcmQ8TG9jaz4gbG9jayhtX2xvY2FsU3RvcmFnZU5hbWVz cGFjZXNNdXRleCk7Ci0gICAgICAgICAgICAgICAgZm9yIChhdXRvJiBsb2NhbFN0b3JhZ2VOYW1l c3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCi0gICAgICAgICAgICAg ICAgICAgIGxvY2FsU3RvcmFnZU5hbWVzcGFjZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09y aWdpbihvcmlnaW4pOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgZm9yIChhdXRvJiBsb2Nh bFN0b3JhZ2VOYW1lc3BhY2UgOiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXMudmFsdWVzKCkpCisg ICAgICAgICAgICAgICAgbG9jYWxTdG9yYWdlTmFtZXNwYWNlLT5jbGVhclN0b3JhZ2VBcmVhc01h dGNoaW5nT3JpZ2luKG9yaWdpbik7CiAKICAgICAgICAgICAgIGZvciAoYXV0byYgdHJhbnNpZW50 TG9jYWxTdG9yYWdlTmFtZXNwYWNlIDogbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2Vz LnZhbHVlcygpKQogICAgICAgICAgICAgICAgIHRyYW5zaWVudExvY2FsU3RvcmFnZU5hbWVzcGFj ZS0+Y2xlYXJTdG9yYWdlQXJlYXNNYXRjaGluZ09yaWdpbihvcmlnaW4pOwpAQCAtMTAxMiw3ICs5 ODIsNiBAQCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZUFyZWEqIFN0b3JhZ2VNYW5hZ2VyOjpmaW5k U3RvcmFnZUFyZWEoSVBDOjpDb25uZWN0aW9uJiBjbwogCiBTdG9yYWdlTWFuYWdlcjo6TG9jYWxT dG9yYWdlTmFtZXNwYWNlKiBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VO YW1lc3BhY2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKQogewotICAgIHN0ZDo6bG9ja19n dWFyZDxMb2NrPiBsb2NrKG1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlc011dGV4KTsKICAgICBpZiAo IW1fbG9jYWxTdG9yYWdlTmFtZXNwYWNlcy5pc1ZhbGlkS2V5KHN0b3JhZ2VOYW1lc3BhY2VJRCkp CiAgICAgICAgIHJldHVybiBudWxscHRyOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1dlYlN0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCmluZGV4IGM3MWNjNjg2 MzNkNzk1ODQzOTBjYzc2NzZiZGRjOGRiMjY4ZGU4ZGMuLmVmMTlkNWI4MGU2YWI5YTgyNGY1ZjYy ZWE0MjQ5OTg0OTNlNDgyZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvV2ViU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCkBAIC0xMDUsNyArMTA1LDYgQEAg cHJpdmF0ZToKIAogICAgIFJlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI+IG1fbG9j YWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOwogICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxM b2NhbFN0b3JhZ2VOYW1lc3BhY2U+PiBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXM7Ci0gICAgTG9j ayBtX2xvY2FsU3RvcmFnZU5hbWVzcGFjZXNNdXRleDsKIAogICAgIEhhc2hNYXA8c3RkOjpwYWly PHVpbnQ2NF90LCBXZWJDb3JlOjpTZWN1cml0eU9yaWdpbkRhdGE+LCBSZWZQdHI8VHJhbnNpZW50 TG9jYWxTdG9yYWdlTmFtZXNwYWNlPj4gbV90cmFuc2llbnRMb2NhbFN0b3JhZ2VOYW1lc3BhY2Vz OwogCg==