171299 2017-04-25 17:02:29 -0700 Update WebProcess(Pool) to assume there's always a WebsiteDataStore 2017-04-25 17:52:54 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen commit-queue oldest_to_newest 1301327 0 beidson 2017-04-25 17:02:29 -0700 Update WebProcess(Pool) to assume there's always a WebsiteDataStore 1301329 1 308168 beidson 2017-04-25 17:04:49 -0700 Created attachment 308168 Patch 1301361 2 308168 commit-queue 2017-04-25 17:52:52 -0700 Comment on attachment 308168 Patch Clearing flags on attachment: 308168 Committed r215778: <http://trac.webkit.org/changeset/215778> 1301362 3 commit-queue 2017-04-25 17:52:54 -0700 All reviewed patches have been landed. Closing bug. 308168 2017-04-25 17:04:49 -0700 2017-04-25 17:52:52 -0700 Patch bug-171299-20170425170448.patch text/plain 13205 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1NzQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGM0MzU2Y2Y5NjkzNGQ3 YjM0Yzg0ZDg0NjY1MWU3MDA3ZDgzOTAwYi4uZDdlODc5NmNhMTNiNjA0NjQwYWI2N2E0NWQ5ODBk MGVhNDE3ZmNhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTA0LTI1ICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgV2ViUHJvY2Vz cyhQb29sKSB0byBhc3N1bWUgdGhlcmUncyBhbHdheXMgYSBXZWJzaXRlRGF0YVN0b3JlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzEyOTkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNo VG9XZWJQcm9jZXNzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTmV3V2ViUHJvY2Vzcyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp3YXJtSW5pdGlhbFByb2Nlc3MpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTmV3V2ViUHJvY2Vzc1Jlc3BlY3Rp bmdQcm9jZXNzQ291bnRMaW1pdCk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpj cmVhdGVXZWJQYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJv eHk6OldlYlByb2Nlc3NQcm94eSk6CisgICAgICAgIChXZWJLaXQ6Om1fdXNlck1lZGlhQ2FwdHVy ZU1hbmFnZXJQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oOgor ICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OndlYnNpdGVEYXRhU3RvcmUpOgorCiAy MDE3LTA0LTI1ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAg IFJlc291cmNlIExvYWQgU3RhdGlzdGljczogQ2xlYXIgbmV0d29yayBwcm9jZXNzIGNhY2hlIHdo ZW4gY2xlYXJpbmcgc3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKaW5kZXggMWRiZWM0NTk3YzlmMjM1YmE5ODcyNjk2ZDljMmM0N2ZhNzMwYTM3ZC4uNmEzYThl MDRkODBjYzUyN2I1ZjMwNDE1YjUxN2UwMTQxMzQ3YWQ0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTcxNSw3ICs3MTUsNyBAQCB2b2lkIFdlYlBhZ2VQ cm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3MoKQogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFn ZShtX3BhZ2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2Fn ZXM6OldlYlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7CiAKLSAg ICBtX3Byb2Nlc3MgPSBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuY3JlYXRlTmV3V2ViUHJvY2Vz c1Jlc3BlY3RpbmdQcm9jZXNzQ291bnRMaW1pdChtX3dlYnNpdGVEYXRhU3RvcmUucHRyKCkpOwor ICAgIG1fcHJvY2VzcyA9IG1fcHJvY2Vzcy0+cHJvY2Vzc1Bvb2woKS5jcmVhdGVOZXdXZWJQcm9j ZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KG1fd2Vic2l0ZURhdGFTdG9yZS5nZXQoKSk7 CiAKICAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpICE9IENoaWxkUHJvY2Vzc1Byb3h5OjpT dGF0ZTo6VGVybWluYXRlZCk7CiAgICAgaWYgKG1fcHJvY2Vzcy0+c3RhdGUoKSA9PSBDaGlsZFBy b2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcAppbmRleCBmOWE3YzAwMzMyZjIzY2VjMGYxYjIzZTAyZGFhODNmODRm OTBjZTJkLi40MGRlM2QxZGEyZTY0ODIxMGJhZWM4MDZkZmM2MzJkNjM1YTk4NjhmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTYyMSw3ICs2MjEs NyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpyZXNvbHZlUGF0aHNGb3JTYW5kYm94RXh0ZW5zaW9u cygpCiAgICAgcGxhdGZvcm1SZXNvbHZlUGF0aHNGb3JTYW5kYm94RXh0ZW5zaW9ucygpOwogfQog Ci1XZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzKFdl YnNpdGVEYXRhU3RvcmUqIHdlYnNpdGVEYXRhU3RvcmUpCitXZWJQcm9jZXNzUHJveHkmIFdlYlBy b2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzKFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVE YXRhU3RvcmUpCiB7CiAgICAgZW5zdXJlTmV0d29ya1Byb2Nlc3MoKTsKIApAQCAtNjI5LDggKzYy OSw3IEBAIFdlYlByb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nl c3MoV2Vic2l0ZURhdGFTdG9yZSogd2Vic2l0ZURhCiAKICAgICBXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzIHBhcmFtZXRlcnM7CiAKLSAgICBpZiAod2Vic2l0ZURhdGFTdG9yZSkKLSAgICAg ICAgd2Vic2l0ZURhdGFTdG9yZS0+cmVzb2x2ZURpcmVjdG9yaWVzSWZOZWNlc3NhcnkoKTsKKyAg ICB3ZWJzaXRlRGF0YVN0b3JlLnJlc29sdmVEaXJlY3Rvcmllc0lmTmVjZXNzYXJ5KCk7CiAKICAg ICBwYXJhbWV0ZXJzLmluamVjdGVkQnVuZGxlUGF0aCA9IG1fcmVzb2x2ZWRQYXRocy5pbmplY3Rl ZEJ1bmRsZVBhdGg7CiAgICAgaWYgKCFwYXJhbWV0ZXJzLmluamVjdGVkQnVuZGxlUGF0aC5pc0Vt cHR5KCkpCkBAIC02NDAsNyArNjM5LDcgQEAgV2ViUHJvY2Vzc1Byb3h5JiBXZWJQcm9jZXNzUG9v bDo6Y3JlYXRlTmV3V2ViUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3ZWJzaXRlRGEKICAgICBm b3IgKHNpemVfdCBpID0gMCwgc2l6ZSA9IG1fcmVzb2x2ZWRQYXRocy5hZGRpdGlvbmFsV2ViUHJv Y2Vzc1NhbmRib3hFeHRlbnNpb25QYXRocy5zaXplKCk7IGkgPCBzaXplOyArK2kpCiAgICAgICAg IFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKG1fcmVz b2x2ZWRQYXRocy5hZGRpdGlvbmFsV2ViUHJvY2Vzc1NhbmRib3hFeHRlbnNpb25QYXRoc1tpXSwg U2FuZGJveEV4dGVuc2lvbjo6UmVhZE9ubHksIHBhcmFtZXRlcnMuYWRkaXRpb25hbFNhbmRib3hF eHRlbnNpb25IYW5kbGVzW2ldKTsKIAotICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeSA9IHdlYnNpdGVEYXRhU3RvcmUgPyB3ZWJzaXRlRGF0YVN0b3JlLT5yZXNvbHZlZEFw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSA6IG1fcmVzb2x2ZWRQYXRocy5hcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5OworICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSA9 IHdlYnNpdGVEYXRhU3RvcmUucmVzb2x2ZWRBcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCk7CiAg ICAgaWYgKHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAg ICAgICAgIHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSA9IG1fcmVzb2x2ZWRQ YXRocy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OwogICAgIGlmICghcGFyYW1ldGVycy5hcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKQEAgLTY0OCwxOSArNjQ3LDE5IEBAIFdl YlByb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nlc3MoV2Vic2l0 ZURhdGFTdG9yZSogd2Vic2l0ZURhCiAKICAgICBwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVG bGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUgPSBtX2NvbmZpZ3VyYXRpb24tPmFwcGxpY2F0aW9uQ2Fj aGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUoKTsKIAotICAgIHBhcmFtZXRlcnMud2ViU1FMRGF0 YWJhc2VEaXJlY3RvcnkgPSB3ZWJzaXRlRGF0YVN0b3JlID8gd2Vic2l0ZURhdGFTdG9yZS0+cmVz b2x2ZWREYXRhYmFzZURpcmVjdG9yeSgpIDogbV9yZXNvbHZlZFBhdGhzLndlYlNRTERhdGFiYXNl RGlyZWN0b3J5OworICAgIHBhcmFtZXRlcnMud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSB3ZWJz aXRlRGF0YVN0b3JlLnJlc29sdmVkRGF0YWJhc2VEaXJlY3RvcnkoKTsKICAgICBpZiAocGFyYW1l dGVycy53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIHBhcmFtZXRl cnMud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSBtX3Jlc29sdmVkUGF0aHMud2ViU1FMRGF0YWJh c2VEaXJlY3Rvcnk7CiAgICAgaWYgKCFwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5 LmlzRW1wdHkoKSkKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0aG91 dFJlc29sdmluZ1BhdGgocGFyYW1ldGVycy53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSwgU2FuZGJv eEV4dGVuc2lvbjo6UmVhZFdyaXRlLCBwYXJhbWV0ZXJzLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5 RXh0ZW5zaW9uSGFuZGxlKTsKIAotICAgIHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeSA9 IHdlYnNpdGVEYXRhU3RvcmUgPyB3ZWJzaXRlRGF0YVN0b3JlLT5yZXNvbHZlZE1lZGlhQ2FjaGVE aXJlY3RvcnkoKSA6IG1fcmVzb2x2ZWRQYXRocy5tZWRpYUNhY2hlRGlyZWN0b3J5OworICAgIHBh cmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeSA9IHdlYnNpdGVEYXRhU3RvcmUucmVzb2x2ZWRN ZWRpYUNhY2hlRGlyZWN0b3J5KCk7CiAgICAgaWYgKHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVj dG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIHBhcmFtZXRlcnMubWVkaWFDYWNoZURpcmVjdG9yeSA9 IG1fcmVzb2x2ZWRQYXRocy5tZWRpYUNhY2hlRGlyZWN0b3J5OwogICAgIGlmICghcGFyYW1ldGVy cy5tZWRpYUNhY2hlRGlyZWN0b3J5LmlzRW1wdHkoKSkKICAgICAgICAgU2FuZGJveEV4dGVuc2lv bjo6Y3JlYXRlSGFuZGxlV2l0aG91dFJlc29sdmluZ1BhdGgocGFyYW1ldGVycy5tZWRpYUNhY2hl RGlyZWN0b3J5LCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMubWVkaWFD YWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAKLSAgICBwYXJhbWV0ZXJzLm1lZGlhS2V5 U3RvcmFnZURpcmVjdG9yeSA9IHdlYnNpdGVEYXRhU3RvcmUgPyB3ZWJzaXRlRGF0YVN0b3JlLT5y ZXNvbHZlZE1lZGlhS2V5c0RpcmVjdG9yeSgpIDogbV9yZXNvbHZlZFBhdGhzLm1lZGlhS2V5U3Rv cmFnZURpcmVjdG9yeTsKKyAgICBwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFnZURpcmVjdG9yeSA9 IHdlYnNpdGVEYXRhU3RvcmUucmVzb2x2ZWRNZWRpYUtleXNEaXJlY3RvcnkoKTsKICAgICBpZiAo cGFyYW1ldGVycy5tZWRpYUtleVN0b3JhZ2VEaXJlY3RvcnkuaXNFbXB0eSgpKQogICAgICAgICBw YXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFnZURpcmVjdG9yeSA9IG1fcmVzb2x2ZWRQYXRocy5tZWRp YUtleVN0b3JhZ2VEaXJlY3Rvcnk7CiAgICAgaWYgKCFwYXJhbWV0ZXJzLm1lZGlhS2V5U3RvcmFn ZURpcmVjdG9yeS5pc0VtcHR5KCkpCkBAIC02NzEsNyArNjcwLDcgQEAgV2ViUHJvY2Vzc1Byb3h5 JiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlTmV3V2ViUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlKiB3 ZWJzaXRlRGEKICNlbmRpZgogCiAgICAgaWYgKGphdmFTY3JpcHRDb25maWd1cmF0aW9uRmlsZUVu YWJsZWQoKSkgewotICAgICAgICBwYXJhbWV0ZXJzLmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGly ZWN0b3J5ID0gd2Vic2l0ZURhdGFTdG9yZSA/IHdlYnNpdGVEYXRhU3RvcmUtPnJlc29sdmVkSmF2 YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKSA6IFN0cmluZygpOworICAgICAgICBwYXJh bWV0ZXJzLmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5ID0gd2Vic2l0ZURhdGFTdG9y ZS5yZXNvbHZlZEphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5KCk7CiAgICAgICAgIGlm ICghcGFyYW1ldGVycy5qYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeS5pc0VtcHR5KCkp CiAgICAgICAgICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5kbGVXaXRob3V0UmVzb2x2 aW5nUGF0aChwYXJhbWV0ZXJzLmphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5LCBTYW5k Ym94RXh0ZW5zaW9uOjpSZWFkV3JpdGUsIHBhcmFtZXRlcnMuamF2YVNjcmlwdENvbmZpZ3VyYXRp b25EaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwogICAgIH0KQEAgLTc4NSw3ICs3ODQsNyBAQCB2 b2lkIFdlYlByb2Nlc3NQb29sOjp3YXJtSW5pdGlhbFByb2Nlc3MoKQogICAgIGlmIChtX3Byb2Nl c3Nlcy5zaXplKCkgPj0gbWF4aW11bU51bWJlck9mUHJvY2Vzc2VzKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGNyZWF0ZU5ld1dlYlByb2Nlc3MobnVsbHB0cik7CisgICAgY3JlYXRlTmV3V2Vi UHJvY2VzcyhtX3dlYnNpdGVEYXRhU3RvcmUtPndlYnNpdGVEYXRhU3RvcmUoKSk7CiAgICAgbV9o YXZlSW5pdGlhbEVtcHR5UHJvY2VzcyA9IHRydWU7CiB9CiAKQEAgLTg2MSwxMyArODYwLDEzIEBA IHZvaWQgV2ViUHJvY2Vzc1Bvb2w6OmRpc2Nvbm5lY3RQcm9jZXNzKFdlYlByb2Nlc3NQcm94eSog cHJvY2VzcykKICNlbmRpZgogfQogCi1XZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpj cmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KFdlYnNpdGVEYXRh U3RvcmUqIHdlYnNpdGVEYXRhU3RvcmUpCitXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29s OjpjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KFdlYnNpdGVE YXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCiB7CiAgICAgLy8gRklYTUU6IGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjg2NzYKLSAgICAvLyBPbmNlIFdlYnNpdGVE YXRhU3RvcmVzIGFyZSBub3QgcGVyLXByb2Nlc3MsIHJlbW92ZSB0aGlzIG5vbnNlbnNlLgorICAg IC8vIE9uY2UgV2Vic2l0ZURhdGFTdG9yZXMgYXJlIHRydWx5IHBlci12aWV3IGluc3RlYWQgb2Yg cGVyLXByb2Nlc3MsIHJlbW92ZSB0aGlzIG5vbnNlbnNlLgogCiAjaWYgUExBVEZPUk0oQ09DT0Ep Ci0gICAgYm9vbCBtdXN0TWF0Y2hEYXRhU3RvcmUgPSB3ZWJzaXRlRGF0YVN0b3JlICYmIHdlYnNp dGVEYXRhU3RvcmUgIT0gJkFQSTo6V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZSgp LT53ZWJzaXRlRGF0YVN0b3JlKCk7CisgICAgYm9vbCBtdXN0TWF0Y2hEYXRhU3RvcmUgPSAmd2Vi c2l0ZURhdGFTdG9yZSAhPSAmQVBJOjpXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3Jl KCktPndlYnNpdGVEYXRhU3RvcmUoKTsKICNlbHNlCiAgICAgYm9vbCBtdXN0TWF0Y2hEYXRhU3Rv cmUgPSBmYWxzZTsKICNlbmRpZgpAQCAtODc4LDcgKzg3Nyw3IEBAIFdlYlByb2Nlc3NQcm94eSYg V2ViUHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nlc3NSZXNwZWN0aW5nUHJvY2Vzc0NvdW50 TGltaXQoCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJQcm9jZXNzUHJveHk+PiBwcm9jZXNzZXNNYXRj aGluZ0RhdGFTdG9yZTsKICAgICBpZiAobXVzdE1hdGNoRGF0YVN0b3JlKSB7CiAgICAgICAgIGZv ciAoYXV0byYgcHJvY2VzcyA6IG1fcHJvY2Vzc2VzKSB7Ci0gICAgICAgICAgICBpZiAocHJvY2Vz cy0+d2Vic2l0ZURhdGFTdG9yZSgpID09IHdlYnNpdGVEYXRhU3RvcmUpCisgICAgICAgICAgICBp ZiAoJnByb2Nlc3MtPndlYnNpdGVEYXRhU3RvcmUoKSA9PSAmd2Vic2l0ZURhdGFTdG9yZSkKICAg ICAgICAgICAgICAgICBwcm9jZXNzZXNNYXRjaGluZ0RhdGFTdG9yZS5hcHBlbmQocHJvY2Vzcyk7 CiAgICAgICAgIH0KIApAQCAtOTIxLDcgKzkyMCw3IEBAIFJlZjxXZWJQYWdlUHJveHk+IFdlYlBy b2Nlc3NQb29sOjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFJlZjxBUEk6 CiAgICAgICAgIC8vIFNoYXJpbmcgcHJvY2Vzc2VzLCBlLmcuIHdoZW4gY3JlYXRpbmcgdGhlIHBh Z2UgdmlhIHdpbmRvdy5vcGVuKCkuCiAgICAgICAgIHByb2Nlc3MgPSAmcGFnZUNvbmZpZ3VyYXRp b24tPnJlbGF0ZWRQYWdlKCktPnByb2Nlc3MoKTsKICAgICB9IGVsc2UKLSAgICAgICAgcHJvY2Vz cyA9ICZjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3NDb3VudExpbWl0KCZwYWdl Q29uZmlndXJhdGlvbi0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOwor ICAgICAgICBwcm9jZXNzID0gJmNyZWF0ZU5ld1dlYlByb2Nlc3NSZXNwZWN0aW5nUHJvY2Vzc0Nv dW50TGltaXQocGFnZUNvbmZpZ3VyYXRpb24tPndlYnNpdGVEYXRhU3RvcmUoKS0+d2Vic2l0ZURh dGFTdG9yZSgpKTsKIAogICAgIHJldHVybiBwcm9jZXNzLT5jcmVhdGVXZWJQYWdlKHBhZ2VDbGll bnQsIFdURk1vdmUocGFnZUNvbmZpZ3VyYXRpb24pKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggMTNlZGMxZDM3YmQxZGZhYjdlMDlhZTk5Mzc0N2Zk MGQ3N2EyMTU3ZC4uYmY3NjUwOWY0ZmM5YjQ4MTZhYzQ3N2MzNTdiNGJhMjRkMmY5MTg4OCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTI2NSw3ICsyNjUs NyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFsbG93U3BlY2lmaWNIVFRQU0NlcnRpZmljYXRlRm9y SG9zdChjb25zdCBXZWJDZXJ0aWZpY2F0ZUluZm8qLCBjb25zdCBTdHJpbmcmIGhvc3QpOwogCi0g ICAgV2ViUHJvY2Vzc1Byb3h5JiBjcmVhdGVOZXdXZWJQcm9jZXNzUmVzcGVjdGluZ1Byb2Nlc3ND b3VudExpbWl0KFdlYnNpdGVEYXRhU3RvcmUqKTsgLy8gV2lsbCByZXR1cm4gYW4gZXhpc3Rpbmcg b25lIGlmIGxpbWl0IGlzIG1ldC4KKyAgICBXZWJQcm9jZXNzUHJveHkmIGNyZWF0ZU5ld1dlYlBy b2Nlc3NSZXNwZWN0aW5nUHJvY2Vzc0NvdW50TGltaXQoV2Vic2l0ZURhdGFTdG9yZSYpOyAvLyBX aWxsIHJldHVybiBhbiBleGlzdGluZyBvbmUgaWYgbGltaXQgaXMgbWV0LgogICAgIHZvaWQgd2Fy bUluaXRpYWxQcm9jZXNzKCk7CiAKICAgICBib29sIHNob3VsZFRlcm1pbmF0ZShXZWJQcm9jZXNz UHJveHkqKTsKQEAgLTQxNCw3ICs0MTQsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcGxhdGZvcm1J bml0aWFsaXplV2ViUHJvY2VzcyhXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJik7CiAgICAg dm9pZCBwbGF0Zm9ybUludmFsaWRhdGVDb250ZXh0KCk7CiAKLSAgICBXZWJQcm9jZXNzUHJveHkm IGNyZWF0ZU5ld1dlYlByb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSopOworICAgIFdlYlByb2Nlc3NQ cm94eSYgY3JlYXRlTmV3V2ViUHJvY2VzcyhXZWJzaXRlRGF0YVN0b3JlJik7CiAKICAgICB2b2lk IHJlcXVlc3RXZWJDb250ZW50U3RhdGlzdGljcyhTdGF0aXN0aWNzUmVxdWVzdCopOwogICAgIHZv aWQgcmVxdWVzdE5ldHdvcmtpbmdTdGF0aXN0aWNzKFN0YXRpc3RpY3NSZXF1ZXN0Kik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IDY4ZWE3YWY0 Yzk5ZGM4M2RjZDVkZTk5NjEyZDY5ZjU0OTg1ZTgyNDUuLjE1ODk3ZjIwNmVmM2QzOTQyZmZmYTFl OTE4NDlmNWNjZDRiNmNhZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUHJveHkuY3BwCkBAIC05MCwxMiArOTAsMTIgQEAgc3RhdGljIFdlYlByb2Nlc3NQcm94eTo6 V2ViUGFnZVByb3h5TWFwJiBnbG9iYWxQYWdlTWFwKCkKICAgICByZXR1cm4gcGFnZU1hcDsKIH0K IAotUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGUoV2ViUHJvY2Vz c1Bvb2wmIHByb2Nlc3NQb29sLCBXZWJzaXRlRGF0YVN0b3JlKiB3ZWJzaXRlRGF0YVN0b3JlKQor UmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGUoV2ViUHJvY2Vzc1Bv b2wmIHByb2Nlc3NQb29sLCBXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3JlKQogewog ICAgIHJldHVybiBhZG9wdFJlZigqbmV3IFdlYlByb2Nlc3NQcm94eShwcm9jZXNzUG9vbCwgd2Vi c2l0ZURhdGFTdG9yZSkpOwogfQogCi1XZWJQcm9jZXNzUHJveHk6OldlYlByb2Nlc3NQcm94eShX ZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wsIFdlYnNpdGVEYXRhU3RvcmUqIHdlYnNpdGVEYXRh U3RvcmUpCitXZWJQcm9jZXNzUHJveHk6OldlYlByb2Nlc3NQcm94eShXZWJQcm9jZXNzUG9vbCYg cHJvY2Vzc1Bvb2wsIFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCiAgICAgOiBD aGlsZFByb2Nlc3NQcm94eShwcm9jZXNzUG9vbC5hbHdheXNSdW5zQXRCYWNrZ3JvdW5kUHJpb3Jp dHkoKSkKICAgICAsIG1fcmVzcG9uc2l2ZW5lc3NUaW1lcigqdGhpcykKICAgICAsIG1fYmFja2dy b3VuZFJlc3BvbnNpdmVuZXNzVGltZXIoKnRoaXMpCkBAIC0xMTIsOCArMTEyLDYgQEAgV2ViUHJv Y2Vzc1Byb3h5OjpXZWJQcm9jZXNzUHJveHkoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sLCBX ZWJzaXRlRGF0YVN0b3JlKgogewogICAgIFdlYlBhc3RlYm9hcmRQcm94eTo6c2luZ2xldG9uKCku YWRkV2ViUHJvY2Vzc1Byb3h5KCp0aGlzKTsKIAotCi0KICAgICBjb25uZWN0KCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA5NWI1MzJhMjdl MDdhNzM5ZTYyN2FjNzkwY2ZjYjk3YTQyYTgxODAyLi43NjE2YWRiNmQ5YzJiNzUyODIyNmIwNTA1 MDJlZGM3MDU2NTBiZmU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5oCkBAIC03OCw3ICs3OCw3IEBAIHB1YmxpYzoKICAgICB0eXBlZGVmIEhhc2hNYXA8dWlu dDY0X3QsIFdlYlBhZ2VQcm94eSo+IFdlYlBhZ2VQcm94eU1hcDsKICAgICB0eXBlZGVmIEhhc2hN YXA8dWludDY0X3QsIFJlZlB0cjxBUEk6OlVzZXJJbml0aWF0ZWRBY3Rpb24+PiBVc2VySW5pdGlh dGVkQWN0aW9uTWFwOwogCi0gICAgc3RhdGljIFJlZjxXZWJQcm9jZXNzUHJveHk+IGNyZWF0ZShX ZWJQcm9jZXNzUG9vbCYsIFdlYnNpdGVEYXRhU3RvcmUqKTsKKyAgICBzdGF0aWMgUmVmPFdlYlBy b2Nlc3NQcm94eT4gY3JlYXRlKFdlYlByb2Nlc3NQb29sJiwgV2Vic2l0ZURhdGFTdG9yZSYpOwog ICAgIH5XZWJQcm9jZXNzUHJveHkoKTsKIAogICAgIFdlYkNvbm5lY3Rpb24qIHdlYkNvbm5lY3Rp b24oKSBjb25zdCB7IHJldHVybiBtX3dlYkNvbm5lY3Rpb24uZ2V0KCk7IH0KQEAgLTg2LDcgKzg2 LDcgQEAgcHVibGljOgogICAgIFdlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9vbCgpIHsgcmV0dXJu IG1fcHJvY2Vzc1Bvb2w7IH0KIAogICAgIC8vIEZJWE1FOiBXZWJzaXRlRGF0YVN0b3JlcyBzaG91 bGQgYmUgbWFkZSBwZXItV2ViUGFnZVByb3h5IHRocm91Z2hvdXQgV2ViS2l0MgotICAgIFdlYnNp dGVEYXRhU3RvcmUqIHdlYnNpdGVEYXRhU3RvcmUoKSBjb25zdCB7IHJldHVybiBtX3dlYnNpdGVE YXRhU3RvcmUuZ2V0KCk7IH0KKyAgICBXZWJzaXRlRGF0YVN0b3JlJiB3ZWJzaXRlRGF0YVN0b3Jl KCkgY29uc3QgeyByZXR1cm4gbV93ZWJzaXRlRGF0YVN0b3JlLmdldCgpOyB9CiAKICAgICBzdGF0 aWMgV2ViUGFnZVByb3h5KiB3ZWJQYWdlKHVpbnQ2NF90IHBhZ2VJRCk7CiAgICAgUmVmPFdlYlBh Z2VQcm94eT4gY3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiwgUmVmPEFQSTo6UGFnZUNvbmZpZ3Vy YXRpb24+JiYpOwpAQCAtMTc3LDcgKzE3Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZEV4Y2Vl ZEluYWN0aXZlTWVtb3J5TGltaXQoKTsKIAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBXZWJQcm9j ZXNzUHJveHkoV2ViUHJvY2Vzc1Bvb2wmLCBXZWJzaXRlRGF0YVN0b3JlKik7CisgICAgZXhwbGlj aXQgV2ViUHJvY2Vzc1Byb3h5KFdlYlByb2Nlc3NQb29sJiwgV2Vic2l0ZURhdGFTdG9yZSYpOwog CiAgICAgLy8gRnJvbSBDaGlsZFByb2Nlc3NQcm94eQogICAgIHZvaWQgZ2V0TGF1bmNoT3B0aW9u cyhQcm9jZXNzTGF1bmNoZXI6OkxhdW5jaE9wdGlvbnMmKSBvdmVycmlkZTsKQEAgLTI4Miw3ICsy ODIsNyBAQCBwcml2YXRlOgogICAgIFZpc2libGVXZWJQYWdlQ291bnRlciBtX3Zpc2libGVQYWdl Q291bnRlcjsKIAogICAgIC8vIEZJWE1FOiBXZWJzaXRlRGF0YVN0b3JlcyBzaG91bGQgYmUgbWFk ZSBwZXItV2ViUGFnZVByb3h5IHRocm91Z2hvdXQgV2ViS2l0Mi4gR2V0IHJpZCBvZiB0aGlzIG1l bWJlci4KLSAgICBSZWZQdHI8V2Vic2l0ZURhdGFTdG9yZT4gbV93ZWJzaXRlRGF0YVN0b3JlOwor ICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiBtX3dlYnNpdGVEYXRhU3RvcmU7CiAKICAgICBib29s IG1faXNVbmRlck1lbW9yeVByZXNzdXJlIHsgZmFsc2UgfTsKIAo=