156876 2016-04-21 15:52:37 -0700 Get rid of the last uses of ApplicationCacheStorage::singleton() from WebKit2 2016-04-21 16:06:21 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1185994 0 andersca 2016-04-21 15:52:37 -0700 Get rid of the last uses of ApplicationCacheStorage::singleton() from WebKit2 1185995 1 276978 andersca 2016-04-21 15:56:59 -0700 Created attachment 276978 Patch 1185996 2 andersca 2016-04-21 16:06:21 -0700 Committed r199842: <http://trac.webkit.org/changeset/199842> 276978 2016-04-21 15:56:59 -0700 2016-04-21 16:01:53 -0700 Patch bug-156876-20160421155722.patch text/plain 19333 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5ODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjU1NzYyNzU2Y2ZkOTcy NzA1MGZjYzI5MWQzMGZjMWRkMjUyN2U4Mi4uOGNkOGEzZmQwYzhiMDYxZTcxNDhiOGJhMzhkNTQy Y2VhMmJjNTIwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYyIEBACiAyMDE2LTA0LTIxICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2V0IHJpZCBvZiB0 aGUgbGFzdCB1c2VzIG9mIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKSBmcm9t IFdlYktpdDIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE1Njg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUpOgorICAgICAgICAqIFNo YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmg6CisgICAgICAgIEFkZCBhbmQgZW5j b2RlIGFuZCBkZWNvZGUgYSBhcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1l LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u Y3BwOgorICAgICAgICAoQVBJOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb246OmNyZWF0ZVdpdGhM ZWdhY3lPcHRpb25zKToKKyAgICAgICAgU2V0IG1fYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3Vi ZGlyZWN0b3J5TmFtZSB0byAiQXBwbGljYXRpb25DYWNoZSIuCisKKyAgICAgICAgKEFQSTo6UHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24pOgorICAgICAg ICBTZXQgbV9hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lIHRvICJGaWxl cyIuCisKKyAgICAgICAgKEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpjb3B5KToKKyAg ICAgICAgQ29weSBtX2FwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUuCisK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oOgor ICAgICAgICBBZGQgZ2V0dGVyIGZvciBhcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3Rv cnlOYW1lLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6bGVnYWN5V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24pOgorICAgICAg ICBJbml0aWFsaXplIGFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUgZnJv bSB0aGUgcHJvY2VzcyBwb29sIGNvbmZpZ3VyYXRpb24uCisKKyAgICAgICAgKFdlYktpdDo6V2Vi UHJvY2Vzc1Bvb2w6OmNyZWF0ZU5ld1dlYlByb2Nlc3MpOgorICAgICAgICBJbml0aWFsaXplIHBh cmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZS4gUmVtb3Zl IGEgY2FsbCB0byAKKyAgICAgICAgQXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OnNpbmdsZXRvbigp LnNldERlZmF1bHRPcmlnaW5RdW90YSBzaW5jZSBpdCBoYWQgbm8gZWZmZWN0IChpdCB3YXMgY2Fs bGVkIGluIHRoZSBVSSBwcm9jZXNzKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0 YS9XZWJzaXRlRGF0YVN0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9y ZTo6V2Vic2l0ZURhdGFTdG9yZSk6CisgICAgICAgIEluaXRpYWxpemUgbV9hcHBsaWNhdGlvbkNh Y2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lLgorCisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVE YXRhU3RvcmU6OmZldGNoRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6 OnJlbW92ZURhdGEpOgorICAgICAgICBQYXNzIG1fYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3Vi ZGlyZWN0b3J5TmFtZSB3aGVuIGNyZWF0aW5nIHRoZSBhcHBsaWNhdGlvbiBjYWNoZSBzdG9yYWdl LgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoK KyAgICAgICAgQWRkIG5ldyBtZW1iZXJzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpXZWJQYWdlKToKKyAgICAg ICAgU2V0IHRoZSBhcHBsaWNhdGlvbiBjYWNoZSBzdG9yYWdlLgorCisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6aW5pdGlh bGl6ZVdlYlByb2Nlc3MpOgorICAgICAgICBJbml0aWFsaXplIHRoZSBhcHBsaWNhdGlvbiBjYWNo ZSBzdG9yYWdlLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmg6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3M6OmFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKToKKyAgICAgICAg QWRkIG5ldyBnZXR0ZXIuCisKKzIwMTYtMDQtMjEgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2Nh QGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdHdvIHVzZXMgb2YgQXBwbGljYXRpb25DYWNo ZVN0b3JhZ2U6OnNpbmdsZXRvbigpIGZyb20gV2ViS2l0MgogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2ODczCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAppbmRleCA3N2Vm M2YzZDY2NjU0NWU4ZjM5OWIwMTM3M2M4ZDYyY2M5OTYwZDY1Li5lMTE0MjVkYmYwY2FmOTU2NTRk YzRmODZmNDk3OGE1ZjM4ZTVkYmIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvU2hh cmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCkBAIC02Miw2ICs2Miw3IEBAIHZv aWQgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgaW5qZWN0ZWRCdW5kbGVQYXRoRXh0 ZW5zaW9uSGFuZGxlOwogICAgIGVuY29kZXIgPDwgaW5pdGlhbGl6YXRpb25Vc2VyRGF0YTsKICAg ICBlbmNvZGVyIDw8IGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnk7CisgICAgZW5jb2RlciA8PCBh cHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lOwogICAgIGVuY29kZXIgPDwg YXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZTsKICAgICBlbmNvZGVyIDw8 IHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5OwogICAgIGVuY29kZXIgPDwgd2ViU1FMRGF0YWJhc2VE aXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CkBAIC0xNTYsNiArMTU3LDggQEAgYm9vbCBXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXImIGRlY29k ZXIsIFdlYlByb2MKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rlci5kZWNv ZGUocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KSkKICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNh Y2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IGlmICghZGVjb2Rlci5kZWNvZGUocGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5 RXh0ZW5zaW9uSGFuZGxlKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIGlmICghZGVjb2Rl ci5kZWNvZGUocGFyYW1ldGVycy53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIGIv U291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAppbmRl eCAxMzhhYTZhODI0YWJkNzY4MDRhOTE0NDcyYWFmMzE1YzViODJiMDZiLi5jMzEwNmRhNjZjZThj ZWQzODg0MDE4NjQwYzgxNGExYzcyMWI5MWQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9T aGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKQEAgLTY4LDcgKzY4LDggQEAg c3RydWN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogCiAgICAgVXNlckRhdGEgaW5p dGlhbGl6YXRpb25Vc2VyRGF0YTsKIAotICAgIFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5OyAgICAKKyAgICBTdHJpbmcgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsKKyAgICBTdHJp bmcgYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZTsKICAgICBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRs ZTsKICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CiAgICAgU2FuZGJveEV4dGVu c2lvbjo6SGFuZGxlIHdlYlNRTERhdGFiYXNlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENvbmZp Z3VyYXRpb24uY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9v bENvbmZpZ3VyYXRpb24uY3BwCmluZGV4IDExYTE2OWIxYzc4MmU5MjBiZmYyMzNkZThlZTRjMGI5 NjFiYThhZjkuLmVmZjU2NWZlYTk5ZTY5YzI1Mjc1MTAwYjgxNGMzZjI5YzRhZjZjNDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQ b29sQ29uZmlndXJhdGlvbi5jcHAKQEAgLTQ1LDYgKzQ1LDcgQEAgUmVmPFByb2Nlc3NQb29sQ29u ZmlndXJhdGlvbj4gUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uOjpjcmVhdGVXaXRoTGVnYWN5T3B0 aW9ucygKICAgICBjb25maWd1cmF0aW9uLT5tX2NhY2hlTW9kZWwgPSBXZWJLaXQ6OkNhY2hlTW9k ZWxEb2N1bWVudFZpZXdlcjsKIAogICAgIGNvbmZpZ3VyYXRpb24tPm1fYXBwbGljYXRpb25DYWNo ZURpcmVjdG9yeSA9IFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVs dEFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKKyAgICBjb25maWd1cmF0aW9uLT5tX2FwcGxp Y2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUgPSAiQXBwbGljYXRpb25DYWNoZSI7 CiAgICAgY29uZmlndXJhdGlvbi0+bV9kaXNrQ2FjaGVEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHROZXR3b3JrQ2FjaGVEaXJlY3RvcnkoKTsK ICAgICBjb25maWd1cmF0aW9uLT5tX21lZGlhQ2FjaGVEaXJlY3RvcnkgPSBXZWJLaXQ6OldlYlBy b2Nlc3NQb29sOjpsZWdhY3lQbGF0Zm9ybURlZmF1bHRNZWRpYUNhY2hlRGlyZWN0b3J5KCk7CiAg ICAgY29uZmlndXJhdGlvbi0+bV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9IFdlYktpdDo6 V2ViUHJvY2Vzc1Bvb2w6OmxlZ2FjeVBsYXRmb3JtRGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KCk7CkBAIC01Nyw2ICs1OCw3IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+ IFByb2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6Y3JlYXRlV2l0aExlZ2FjeU9wdGlvbnMoCiAKIFBy b2Nlc3NQb29sQ29uZmlndXJhdGlvbjo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uKCkKICAgICA6 IG1fYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeShXZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0QXBw bGljYXRpb25DYWNoZURpcmVjdG9yeSgpKQorICAgICwgbV9hcHBsaWNhdGlvbkNhY2hlRmxhdEZp bGVTdWJkaXJlY3RvcnlOYW1lKCJGaWxlcyIpCiAgICAgLCBtX2Rpc2tDYWNoZURpcmVjdG9yeShX ZWJzaXRlRGF0YVN0b3JlOjpkZWZhdWx0TmV0d29ya0NhY2hlRGlyZWN0b3J5KCkpCiAgICAgLCBt X21lZGlhQ2FjaGVEaXJlY3RvcnkoV2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdE1lZGlhQ2FjaGVE aXJlY3RvcnkoKSkKICAgICAsIG1faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkoV2Vic2l0ZURh dGFTdG9yZTo6ZGVmYXVsdEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5KCkpCkBAIC04MCw2ICs4 Miw3IEBAIFJlZjxQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24+IFByb2Nlc3NQb29sQ29uZmlndXJh dGlvbjo6Y29weSgpCiAgICAgY29weS0+bV9kaXNrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25F bmFibGVkID0gdGhpcy0+bV9kaXNrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkOwog ICAgIGNvcHktPm1fZGlza0NhY2hlU2l6ZU92ZXJyaWRlID0gdGhpcy0+bV9kaXNrQ2FjaGVTaXpl T3ZlcnJpZGU7CiAgICAgY29weS0+bV9hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gdGhpcy0+ bV9hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OworICAgIGNvcHktPm1fYXBwbGljYXRpb25DYWNo ZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSA9IHRoaXMtPm1fYXBwbGljYXRpb25DYWNoZUZsYXRG aWxlU3ViZGlyZWN0b3J5TmFtZTsKICAgICBjb3B5LT5tX2Rpc2tDYWNoZURpcmVjdG9yeSA9IHRo aXMtPm1fZGlza0NhY2hlRGlyZWN0b3J5OwogICAgIGNvcHktPm1fbWVkaWFDYWNoZURpcmVjdG9y eSA9IHRoaXMtPm1fbWVkaWFDYWNoZURpcmVjdG9yeTsKICAgICBjb3B5LT5tX2luZGV4ZWREQkRh dGFiYXNlRGlyZWN0b3J5ID0gdGhpcy0+bV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5oCmluZGV4IGIxMjkzZDMwMWZhNjhhNjNmMTQ2N2MzNmU3YWMxN2Y5YzIy NTIyMWMuLjAzNDdlY2U2NDNmYWNkMzJmOTIxMzZhYzk2MmUwOGVhNDAxNTMyYTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJUHJvY2Vzc1Bvb2xDb25maWd1cmF0 aW9uLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24uaApAQCAtNjIsNiArNjIsOCBAQCBwdWJsaWM6CiAgICAgY29uc3QgV1RGOjpT dHJpbmcmIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoKSBjb25zdCB7IHJldHVybiBtX2FwcGxp Y2F0aW9uQ2FjaGVEaXJlY3Rvcnk7IH0KICAgICB2b2lkIHNldEFwcGxpY2F0aW9uQ2FjaGVEaXJl Y3RvcnkoY29uc3QgV1RGOjpTdHJpbmcmIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpIHsgbV9h cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeTsgfQog CisgICAgY29uc3QgV1RGOjpTdHJpbmcmIGFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVj dG9yeU5hbWUoKSBjb25zdCB7IHJldHVybiBtX2FwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRp cmVjdG9yeU5hbWU7IH0KKwogICAgIGNvbnN0IFdURjo6U3RyaW5nJiBkaXNrQ2FjaGVEaXJlY3Rv cnkoKSBjb25zdCB7IHJldHVybiBtX2Rpc2tDYWNoZURpcmVjdG9yeTsgfQogICAgIHZvaWQgc2V0 RGlza0NhY2hlRGlyZWN0b3J5KGNvbnN0IFdURjo6U3RyaW5nJiBkaXNrQ2FjaGVEaXJlY3Rvcnkp IHsgbV9kaXNrQ2FjaGVEaXJlY3RvcnkgPSBkaXNrQ2FjaGVEaXJlY3Rvcnk7IH0KIApAQCAtMTA0 LDYgKzEwNiw3IEBAIHByaXZhdGU6CiAgICAgaW50NjRfdCBtX2Rpc2tDYWNoZVNpemVPdmVycmlk ZSB7IC0xIH07CiAKICAgICBXVEY6OlN0cmluZyBtX2FwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnk7 CisgICAgV1RGOjpTdHJpbmcgbV9hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlO YW1lOwogICAgIFdURjo6U3RyaW5nIG1fZGlza0NhY2hlRGlyZWN0b3J5OwogICAgIFdURjo6U3Ry aW5nIG1fbWVkaWFDYWNoZURpcmVjdG9yeTsKICAgICBXVEY6OlN0cmluZyBtX2luZGV4ZWREQkRh dGFiYXNlRGlyZWN0b3J5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5jcHAKaW5kZXggMmQxNDQwNWRiMjU1MWQ2MTJkYjJkNDQ5YTAwMTk0ZjFjNWViZTJkYS4uZWI5 YzJmZDI3OWVmZDc0ZmQzYjgwMmVlYzFhNGJmY2EzZmU5ZTJkYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xMjgsNiArMTI4LDcgQEAgc3RhdGlj IFdlYnNpdGVEYXRhU3RvcmU6OkNvbmZpZ3VyYXRpb24gbGVnYWN5V2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24oQVBJOjoKICAgICBjb25maWd1cmF0aW9uLmxvY2FsU3RvcmFnZURpcmVjdG9y eSA9IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKTsKICAg ICBjb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi5h cHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5ID0gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmFwcGxp Y2F0aW9uQ2FjaGVEaXJlY3RvcnkoKTsKKyAgICBjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9uQ2Fj aGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUgPSBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uYXBw bGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSgpOwogICAgIGNvbmZpZ3VyYXRp b24ubWVkaWFDYWNoZURpcmVjdG9yeSA9IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5tZWRpYUNh Y2hlRGlyZWN0b3J5KCk7CiAgICAgY29uZmlndXJhdGlvbi5tZWRpYUtleXNTdG9yYWdlRGlyZWN0 b3J5ID0gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rvcnko KTsKICAgICBjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSA9IHByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5kaXNrQ2FjaGVEaXJlY3RvcnkoKTsKQEAgLTUzOCw2ICs1MzksOCBAQCBX ZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVhdGVOZXdXZWJQcm9jZXNzKCkKICAg ICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlKHBhcmFtZXRlcnMuaW5qZWN0ZWRC dW5kbGVQYXRoLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgcGFyYW1ldGVycy5pbmplY3Rl ZEJ1bmRsZVBhdGhFeHRlbnNpb25IYW5kbGUpOwogCiAgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlv bkNhY2hlRGlyZWN0b3J5ID0gbV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbkNhY2hlRGlyZWN0 b3J5KCk7CisgICAgcGFyYW1ldGVycy5hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3Rv cnlOYW1lID0gbV9jb25maWd1cmF0aW9uLT5hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJl Y3RvcnlOYW1lKCk7CisKICAgICBpZiAoIXBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVj dG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZUZv clJlYWRXcml0ZURpcmVjdG9yeShwYXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnks IHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeUV4dGVuc2lvbkhhbmRsZSk7CiAK QEAgLTY0Niw5ICs2NDksNiBAQCBXZWJQcm9jZXNzUHJveHkmIFdlYlByb2Nlc3NQb29sOjpjcmVh dGVOZXdXZWJQcm9jZXNzKCkKICNpZiBQTEFURk9STShDT0NPQSkKICAgICBwcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpTZXRRT1Mod2ViUHJvY2Vzc0xhdGVuY3lRT1MoKSwgd2Vi UHJvY2Vzc1Rocm91Z2hwdXRRT1MoKSksIDApOwogI2VuZGlmCi0jaWYgUExBVEZPUk0oSU9TKQot ICAgIEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5zZXREZWZhdWx0T3JpZ2lu UXVvdGEoMjVVTEwgKiAxMDI0ICogMTAyNCk7Ci0jZW5kaWYKIAogICAgIGlmIChXZWJQcmVmZXJl bmNlczo6YW55UGFnZXNBcmVVc2luZ1ByaXZhdGVCcm93c2luZygpKQogICAgICAgICBwcm9jZXNz LT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpFbnN1cmVQcml2YXRlQnJvd3NpbmdTZXNzaW9u KFNlc3Npb25JRDo6bGVnYWN5UHJpdmF0ZVNlc3Npb25JRCgpKSwgMCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5j cHAKaW5kZXggOTE5ZWVhNjI5MWFlMjljMTZmYTFiZGM5MzgwZTU5ZGQ4ZTFjMjNjMi4uMjQ1OWVi NTIwY2QxN2JhYjM1NDZmNDZmNjcxMTU2OTgxZjU4YjhkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApA QCAtNzgsNiArNzgsNyBAQCBXZWJzaXRlRGF0YVN0b3JlOjpXZWJzaXRlRGF0YVN0b3JlKENvbmZp Z3VyYXRpb24gY29uZmlndXJhdGlvbikKICAgICAsIG1fc2Vzc2lvbklEKFdlYkNvcmU6OlNlc3Np b25JRDo6ZGVmYXVsdFNlc3Npb25JRCgpKQogICAgICwgbV9uZXR3b3JrQ2FjaGVEaXJlY3Rvcnko V1RGTW92ZShjb25maWd1cmF0aW9uLm5ldHdvcmtDYWNoZURpcmVjdG9yeSkpCiAgICAgLCBtX2Fw cGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkoV1RGTW92ZShjb25maWd1cmF0aW9uLmFwcGxpY2F0aW9u Q2FjaGVEaXJlY3RvcnkpKQorICAgICwgbV9hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJl Y3RvcnlOYW1lKFdURk1vdmUoY29uZmlndXJhdGlvbi5hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVT dWJkaXJlY3RvcnlOYW1lKSkKICAgICAsIG1fbWVkaWFDYWNoZURpcmVjdG9yeShXVEZNb3ZlKGNv bmZpZ3VyYXRpb24ubWVkaWFDYWNoZURpcmVjdG9yeSkpCiAgICAgLCBtX3dlYlNRTERhdGFiYXNl RGlyZWN0b3J5KFdURk1vdmUoY29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkp CiAgICAgLCBtX21lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV1RGTW92ZShjb25maWd1cmF0aW9u Lm1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkpKQpAQCAtMzU1LDExICszNTYsMTIgQEAgdm9pZCBX ZWJzaXRlRGF0YVN0b3JlOjpmZXRjaERhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0 YVR5cGVzLCBPcHRpb25TZXQKIAogICAgIGlmIChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURh dGFUeXBlOjpPZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSkgJiYgaXNQZXJzaXN0ZW50KCkpIHsK ICAgICAgICAgU3RyaW5nQ2FwdHVyZSBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5IHsgbV9hcHBs aWNhdGlvbkNhY2hlRGlyZWN0b3J5IH07CisgICAgICAgIFN0cmluZ0NhcHR1cmUgYXBwbGljYXRp b25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSB7IG1fYXBwbGljYXRpb25DYWNoZUZsYXRG aWxlU3ViZGlyZWN0b3J5TmFtZSB9OwogCiAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRk UGVuZGluZ0NhbGxiYWNrKCk7CiAKLSAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW2ZldGNoT3B0 aW9ucywgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSwgY2FsbGJhY2tBZ2dyZWdhdG9yXSB7Ci0g ICAgICAgICAgICBhdXRvIHN0b3JhZ2UgPSBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFn ZTo6Y3JlYXRlKGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnkuc3RyaW5nKCksICJBcHBsaWNhdGlv bkNhY2hlIik7CisgICAgICAgIG1fcXVldWUtPmRpc3BhdGNoKFtmZXRjaE9wdGlvbnMsIGFwcGxp Y2F0aW9uQ2FjaGVEaXJlY3RvcnksIGFwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9y eU5hbWUsIGNhbGxiYWNrQWdncmVnYXRvcl0geworICAgICAgICAgICAgYXV0byBzdG9yYWdlID0g V2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmNyZWF0ZShhcHBsaWNhdGlvbkNhY2hl RGlyZWN0b3J5LnN0cmluZygpLCBhcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlO YW1lLnN0cmluZygpKTsKIAogICAgICAgICAgICAgV2Vic2l0ZURhdGEqIHdlYnNpdGVEYXRhID0g bmV3IFdlYnNpdGVEYXRhOwogCkBAIC02MzIsMTEgKzYzNCwxMiBAQCB2b2lkIFdlYnNpdGVEYXRh U3RvcmU6OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBz dGQ6OmNocgogCiAgICAgaWYgKGRhdGFUeXBlcy5jb250YWlucyhXZWJzaXRlRGF0YVR5cGU6Ok9m ZmxpbmVXZWJBcHBsaWNhdGlvbkNhY2hlKSAmJiBpc1BlcnNpc3RlbnQoKSkgewogICAgICAgICBT dHJpbmdDYXB0dXJlIGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkgeyBtX2FwcGxpY2F0aW9uQ2Fj aGVEaXJlY3RvcnkgfTsKKyAgICAgICAgU3RyaW5nQ2FwdHVyZSBhcHBsaWNhdGlvbkNhY2hlRmxh dEZpbGVTdWJkaXJlY3RvcnlOYW1lIHsgbV9hcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJl Y3RvcnlOYW1lIH07CiAKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2Fs bGJhY2soKTsKIAotICAgICAgICBtX3F1ZXVlLT5kaXNwYXRjaChbYXBwbGljYXRpb25DYWNoZURp cmVjdG9yeSwgY2FsbGJhY2tBZ2dyZWdhdG9yXSB7Ci0gICAgICAgICAgICBhdXRvIHN0b3JhZ2Ug PSBXZWJDb3JlOjpBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6Y3JlYXRlKGFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3Rvcnkuc3RyaW5nKCksICJBcHBsaWNhdGlvbkNhY2hlIik7CisgICAgICAgIG1fcXVl dWUtPmRpc3BhdGNoKFthcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5LCBhcHBsaWNhdGlvbkNhY2hl RmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lLCBjYWxsYmFja0FnZ3JlZ2F0b3JdIHsKKyAgICAgICAg ICAgIGF1dG8gc3RvcmFnZSA9IFdlYkNvcmU6OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpjcmVh dGUoYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5zdHJpbmcoKSwgYXBwbGljYXRpb25DYWNoZUZs YXRGaWxlU3ViZGlyZWN0b3J5TmFtZS5zdHJpbmcoKSk7CiAKICAgICAgICAgICAgIHN0b3JhZ2Ut PmRlbGV0ZUFsbENhY2hlcygpOwogCkBAIC04ODQsNiArODg3LDcgQEAgdm9pZCBXZWJzaXRlRGF0 YVN0b3JlOjpyZW1vdmVEYXRhKE9wdGlvblNldDxXZWJzaXRlRGF0YVR5cGU+IGRhdGFUeXBlcywg Y29uc3QgVmUKIAogICAgIGlmIChkYXRhVHlwZXMuY29udGFpbnMoV2Vic2l0ZURhdGFUeXBlOjpP ZmZsaW5lV2ViQXBwbGljYXRpb25DYWNoZSkgJiYgaXNQZXJzaXN0ZW50KCkpIHsKICAgICAgICAg U3RyaW5nQ2FwdHVyZSBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5IHsgbV9hcHBsaWNhdGlvbkNh Y2hlRGlyZWN0b3J5IH07CisgICAgICAgIFN0cmluZ0NhcHR1cmUgYXBwbGljYXRpb25DYWNoZUZs YXRGaWxlU3ViZGlyZWN0b3J5TmFtZSB7IG1fYXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGly ZWN0b3J5TmFtZSB9OwogCiAgICAgICAgIEhhc2hTZXQ8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5 T3JpZ2luPj4gb3JpZ2luczsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBkYXRhUmVjb3JkIDog ZGF0YVJlY29yZHMpIHsKQEAgLTg5Miw4ICs4OTYsOCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6 OnJlbW92ZURhdGEoT3B0aW9uU2V0PFdlYnNpdGVEYXRhVHlwZT4gZGF0YVR5cGVzLCBjb25zdCBW ZQogICAgICAgICB9CiAKICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5hZGRQZW5kaW5nQ2Fs bGJhY2soKTsKLSAgICAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goW29yaWdpbnMsIGFwcGxpY2F0aW9u Q2FjaGVEaXJlY3RvcnksIGNhbGxiYWNrQWdncmVnYXRvcl0gewotICAgICAgICAgICAgYXV0byBz dG9yYWdlID0gV2ViQ29yZTo6QXBwbGljYXRpb25DYWNoZVN0b3JhZ2U6OmNyZWF0ZShhcHBsaWNh dGlvbkNhY2hlRGlyZWN0b3J5LnN0cmluZygpLCAiQXBwbGljYXRpb25DYWNoZSIpOworICAgICAg ICBtX3F1ZXVlLT5kaXNwYXRjaChbb3JpZ2lucywgYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSwg YXBwbGljYXRpb25DYWNoZUZsYXRGaWxlU3ViZGlyZWN0b3J5TmFtZSwgY2FsbGJhY2tBZ2dyZWdh dG9yXSB7CisgICAgICAgICAgICBhdXRvIHN0b3JhZ2UgPSBXZWJDb3JlOjpBcHBsaWNhdGlvbkNh Y2hlU3RvcmFnZTo6Y3JlYXRlKGFwcGxpY2F0aW9uQ2FjaGVEaXJlY3Rvcnkuc3RyaW5nKCksIGFw cGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWUuc3RyaW5nKCkpOwogCiAgICAg ICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIG9yaWdpbiA6IG9yaWdpbnMpCiAgICAgICAgICAgICAg ICAgc3RvcmFnZS0+ZGVsZXRlQ2FjaGVGb3JPcmlnaW4oKm9yaWdpbik7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaApp bmRleCBhNGE5ZTEwNDNiNzZhNmViODhkZmYzYzcxMTFmNGY2MmE3N2VjZjc0Li5iNzQ0NTliOTE1 MGE0ODRjNjE1NzkwNThhOGZiM2IyNDZjZjlmNGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTYwLDYg KzYwLDcgQEAgcHVibGljOgogICAgIHN0cnVjdCBDb25maWd1cmF0aW9uIHsKICAgICAgICAgU3Ry aW5nIG5ldHdvcmtDYWNoZURpcmVjdG9yeTsKICAgICAgICAgU3RyaW5nIGFwcGxpY2F0aW9uQ2Fj aGVEaXJlY3Rvcnk7CisgICAgICAgIFN0cmluZyBhcHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJk aXJlY3RvcnlOYW1lOwogCiAgICAgICAgIFN0cmluZyBtZWRpYUNhY2hlRGlyZWN0b3J5OwogICAg ICAgICBTdHJpbmcgd2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk7CkBAIC0xMTgsNiArMTE5LDcgQEAg cHJpdmF0ZToKIAogICAgIGNvbnN0IFN0cmluZyBtX25ldHdvcmtDYWNoZURpcmVjdG9yeTsKICAg ICBjb25zdCBTdHJpbmcgbV9hcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5OworICAgIGNvbnN0IFN0 cmluZyBtX2FwcGxpY2F0aW9uQ2FjaGVGbGF0RmlsZVN1YmRpcmVjdG9yeU5hbWU7CiAgICAgY29u c3QgU3RyaW5nIG1fbWVkaWFDYWNoZURpcmVjdG9yeTsKIAogICAgIGNvbnN0IFN0cmluZyBtX3dl YlNRTERhdGFiYXNlRGlyZWN0b3J5OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwCmluZGV4IGNiZDkxY2IwYjRlYzdhZGY2ZTk0ZjdiM2QxMDYzYmM0NjU2 YzE1N2UuLmQ3YTdiYmUyNDg0OWQ1YTc5ZjgwYjUyYTk4ZmI1ODkyNWNhNzljN2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTEwNiw2ICsx MDYsNyBAQAogI2luY2x1ZGUgIldlYlVzZXJDb250ZW50Q29udHJvbGxlci5oIgogI2luY2x1ZGUg IldlYlVzZXJNZWRpYUNsaWVudC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0FQSUNhc3Qu aD4KKyNpbmNsdWRlIDxXZWJDb3JlL0FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9BcmNoaXZlUmVzb3VyY2UuaD4KICNpbmNsdWRlIDxXZWJDb3JlL0Nocm9tZS5o PgogI2luY2x1ZGUgPFdlYkNvcmUvQ29udGV4dE1lbnVDb250cm9sbGVyLmg+CkBAIC00MDIsNiAr NDAzLDcgQEAgV2ViUGFnZTo6V2ViUGFnZSh1aW50NjRfdCBwYWdlSUQsIGNvbnN0IFdlYlBhZ2VD cmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24ucHJv Z3Jlc3NUcmFja2VyQ2xpZW50ID0gbmV3IFdlYlByb2dyZXNzVHJhY2tlckNsaWVudCgqdGhpcyk7 CiAgICAgcGFnZUNvbmZpZ3VyYXRpb24uZGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQgPSBuZXcgV2Vi RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoKnRoaXMpOwogCisgICAgcGFnZUNvbmZpZ3VyYXRpb24u YXBwbGljYXRpb25DYWNoZVN0b3JhZ2UgPSAmV2ViUHJvY2Vzczo6c2luZ2xldG9uKCkuYXBwbGlj YXRpb25DYWNoZVN0b3JhZ2UoKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi5kYXRhYmFzZVByb3Zp ZGVyID0gV2ViRGF0YWJhc2VQcm92aWRlcjo6Z2V0T3JDcmVhdGUobV9wYWdlR3JvdXAtPnBhZ2VH cm91cElEKCkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnN0b3JhZ2VOYW1lc3BhY2VQcm92aWRl ciA9IFdlYlN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlcjo6Z2V0T3JDcmVhdGUobV9wYWdlR3JvdXAt PnBhZ2VHcm91cElEKCkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLnVzZXJDb250ZW50UHJvdmlk ZXIgPSBtX3VzZXJDb250ZW50Q29udHJvbGxlci5wdHIoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IDlmZTkxMGFiZDhjOWY4ZTM4ZDAzNzFjYjIxZTUyNGQ2 ZWExMmYyZmUuLmUzNjJlNmE3ZDg5ZmQxZThkZjBlYmQ0YjBlNjNiNmJlZTY0MWRmYTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMjkxLDggKzI5MSwxMSBA QCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKFdlYlByb2Nlc3NDcmVhdGlv blBhcmFtZXRlcnMmJiBwYXJhbWV0ZXJzKQogICAgIG1faWNvbkRhdGFiYXNlUHJveHkuc2V0RW5h YmxlZChwYXJhbWV0ZXJzLmljb25EYXRhYmFzZUVuYWJsZWQpOwogI2VuZGlmCiAKLSAgICBpZiAo IXBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCi0gICAgICAg IEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpzaW5nbGV0b24oKS5zZXRDYWNoZURpcmVjdG9yeShw YXJhbWV0ZXJzLmFwcGxpY2F0aW9uQ2FjaGVEaXJlY3RvcnkpOworICAgIC8vIEZJWE1FOiBUaGlz IHNob3VsZCBiZSBjb25zdHJ1Y3RlZCBwZXIgZGF0YSBzdG9yZSwgbm90IHBlciBwcm9jZXNzLgor ICAgIG1fYXBwbGljYXRpb25DYWNoZVN0b3JhZ2UgPSBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTo6 Y3JlYXRlKHBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeSwgcGFyYW1ldGVycy5h cHBsaWNhdGlvbkNhY2hlRmxhdEZpbGVTdWJkaXJlY3RvcnlOYW1lKTsKKyNpZiBQTEFURk9STShJ T1MpCisgICAgbV9hcHBsaWNhdGlvbkNhY2hlU3RvcmFnZS0+c2V0RGVmYXVsdE9yaWdpblF1b3Rh KDI1VUxMICogMTAyNCAqIDEwMjQpOworI2VuZGlmCiAKICAgICBpZiAoIXBhcmFtZXRlcnMubWVk aWFDYWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCiAgICAgICAgIFdlYkNvcmU6OkhUTUxNZWRpYUVs ZW1lbnQ6OnNldE1lZGlhQ2FjaGVEaXJlY3RvcnkocGFyYW1ldGVycy5tZWRpYUNhY2hlRGlyZWN0 b3J5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5o IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgKaW5kZXggYWU2ZTQzNWM5 NTc0NWRiNzk5NGFmOTlhOWE1OGE0YWNhMGE4MDY4ZS4uNGM3NjAwYzY0MTNmNzQ2NTcyYjA3MmU5 YjRkNzE0Y2U1NmQ0MWQxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmgK QEAgLTYxLDYgKzYxLDcgQEAgY2xhc3MgT2JqZWN0OwogfQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CitjbGFzcyBBcHBsaWNhdGlvbkNhY2hlU3RvcmFnZTsKIGNsYXNzIENlcnRpZmljYXRlSW5mbzsK IGNsYXNzIFBhZ2VHcm91cDsKIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKQEAgLTIwNyw2ICsyMDgs OCBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNSaWNoQ29udGVudFNlcnZpY2VzKCkgY29uc3QgeyBy ZXR1cm4gbV9oYXNSaWNoQ29udGVudFNlcnZpY2VzOyB9CiAjZW5kaWYKIAorICAgIFdlYkNvcmU6 OkFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlJiBhcHBsaWNhdGlvbkNhY2hlU3RvcmFnZSgpIHsgcmV0 dXJuICptX2FwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOyB9CisKICAgICB2b2lkIHByZWZldGNoRE5T KGNvbnN0IFN0cmluZyYpOwogCiAgICAgV2ViQXV0b21hdGlvblNlc3Npb25Qcm94eSogYXV0b21h dGlvblNlc3Npb25Qcm94eSgpIHsgcmV0dXJuIG1fYXV0b21hdGlvblNlc3Npb25Qcm94eS5nZXQo KTsgfQpAQCAtMzg1LDYgKzM4OCw4IEBAIHByaXZhdGU6CiAgICAgV2ViQ29yZTo6VGltZXIgbV9u b25WaXNpYmxlUHJvY2Vzc0NsZWFudXBUaW1lcjsKICAgICBXZWJDb3JlOjpUaW1lciBtX3N0YXRp c3RpY3NDaGFuZ2VkVGltZXI7CiAKKyAgICBSZWZQdHI8V2ViQ29yZTo6QXBwbGljYXRpb25DYWNo ZVN0b3JhZ2U+IG1fYXBwbGljYXRpb25DYWNoZVN0b3JhZ2U7CisKICNpZiBQTEFURk9STShJT1Mp CiAgICAgV2ViU1FMaXRlRGF0YWJhc2VUcmFja2VyIG1fd2ViU1FMaXRlRGF0YWJhc2VUcmFja2Vy OwogI2VuZGlmCg==