141984 2015-02-24 14:09:57 -0800 Pass _WKWebsiteDataRecord objects to the fetchData completion handler 2015-02-24 17:45:28 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 141994 1 andersca andersca gyuyoung.kim oldest_to_newest 1071785 0 andersca 2015-02-24 14:09:57 -0800 Pass _WKWebsiteDataRecord objects to the fetchData completion handler 1071788 1 247267 andersca 2015-02-24 14:24:21 -0800 Created attachment 247267 Patch 1071793 2 247267 kling 2015-02-24 14:36:16 -0800 Comment on attachment 247267 Patch rs=me 1071794 3 andersca 2015-02-24 14:40:57 -0800 Committed r180585: <http://trac.webkit.org/changeset/180585> 1071864 4 gyuyoung.kim 2015-02-24 17:45:28 -0800 EFL and GTK ports have been broken since r180585. I upload a fix to Bug 141994. - https://build.webkit.org/builders/GTK%20Linux%2032-bit%20Release/builds/50596 - https://build.webkit.org/builders/EFL%20Linux%2064-bit%20Release%20WK2/builds/20007 247267 2015-02-24 14:24:21 -0800 2015-02-24 14:36:16 -0800 Patch bug-141984-20150224142409.patch text/plain 20693 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwNTc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzBjNGRiYmRlYTE3YmU0 ZTc2ZWU5OWUwNDgyNjhmNTkwNmMyMTBjYS4uNTYwZmQwMzJiYzlhZGYxZDdjNGJhZjhkNjY4Y2M3 ZTljNWE2OTZjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYyIEBACisyMDE1LTAyLTI0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgUGFzcyBfV0tXZWJz aXRlRGF0YVJlY29yZCBvYmplY3RzIHRvIHRoZSBmZXRjaERhdGEgY29tcGxldGlvbiBoYW5kbGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDE5ODQK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNoYXJl ZC9Db2NvYS9BUElPYmplY3QubW06CisgICAgICAgIChBUEk6Ok9iamVjdDo6bmV3T2JqZWN0KToK KyAgICAgICAgQ3JlYXRlIF9XS1dlYnNpdGVEYXRhUmVjb3JkIG9iamVjdHMgZm9yIFdlYnNpdGVE YXRhUmVjb3JkIEFQSSBvYmplY3RzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9BUElXZWJz aXRlRGF0YVJlY29yZC5oOgorICAgICAgICBBZGQgV2Vic2l0ZURhdGFSZWNvcmQgZ2V0dGVyLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29yZC5oOgor ICAgICAgICBBZGQgZGlzcGxheU5hbWUgYW5kIGRhdGFUeXBlcyBwcm9wZXJ0aWVzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29yZC5tbToKKyAgICAg ICAgKGRhdGFUeXBlc1RvU3RyaW5nKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIHRvIGNvbnZl cnQgZGF0YVR5cGVzIGJpdC1maWVsZHMgdG8gc3RyaW5ncy4KKworICAgICAgICAoLVtfV0tXZWJz aXRlRGF0YVJlY29yZCBkZXNjcmlwdGlvbl0pOgorICAgICAgICBJbmNsdWRlIHRoZSBkaXNwbGF5 IG5hbWUgYW5kIGRhdGEgdHlwZXMgaW4gdGhlIGRlc2NyaXB0aW9uLgorCisgICAgICAgICgtW19X S1dlYnNpdGVEYXRhUmVjb3JkIGRpc3BsYXlOYW1lXSk6CisgICAgICAgIFJldHVybiB0aGUgZGlz cGxheSBuYW1lLgorCisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhUmVjb3JkIGRhdGFUeXBlc10p OgorICAgICAgICBSZXR1cm4gdGhlIGRhdGEgdHlwZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaDoKKyAgICAgICAgKFdlYktp dDo6dG9XZWJzaXRlRGF0YVR5cGVzKToKKyAgICAgICAgTW92ZSB0aGlzIGhlcmUgZnJvbSBfV0tX ZWJzaXRlRGF0YVN0b3JlLm1tLgorCisgICAgICAgIChXZWJLaXQ6OnRvV0tXZWJzaXRlRGF0YVR5 cGVzKToKKyAgICAgICAgQWRkIG5ldyBmdW5jdGlvbiB0byBjb252ZXJ0IFdlYnNpdGVEYXRhVHlw ZXMgdG8gV0tXZWJzaXRlRGF0YVR5cGVzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tOgorICAgICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0b3Jl IGZldGNoRGF0YVJlY29yZHNPZlR5cGVzOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAo LVtfV0tXZWJzaXRlRGF0YVN0b3JlIHJlbW92ZURhdGFPZlR5cGVzOm1vZGlmaWVkU2luY2U6Y29t cGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgIFF1YWxpZnkgdG9XZWJzaXRlRGF0YVR5cGVzIGNh bGxzLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3Jk LmNwcDogQWRkZWQuCisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3JkOjpkaXNwbGF5 TmFtZUZvck9yaWdpbik6CisgICAgICAgIE5ldyBoZWxwZXIgdGhhdCByZXR1cm5zIGEgZGlzcGxh eSBuYW1lIGdpdmVuIGFuIG9yaWdpbi4KKworICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVJl Y29yZDo6YWRkKToKKyAgICAgICAgQWRkIHRoZSBvcmlnaW4gYXMgd2VsbCBhcyB0aGUgdHlwZS4K KworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVJlY29yZC5oOgor ICAgICAgICBBZGQgbmV3IG1lbWJlcnMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3Rv cmU6OmZldGNoRGF0YSk6CisgICAgICAgIExvb3AgdGhyb3VnaCB0aGUgZW50cmllcyBhbmQgYWRk IHRoZW0gdG8gdGhlIG1fd2Vic2l0ZURhdGFSZWNvcmRzIGhhc2ggbWFwLCB3aGljaAorICAgICAg ICBpcyBrZXllZCBvZmYgb2YgdGhlIGRpc3BsYXkgbmFtZS4gUGFzcyB0aGUgbV93ZWJzaXRlRGF0 YVJlY29yZHMgdmFsdWVzIHRvIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIuCisKKyAgICAgICAgKiBX ZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisKIDIwMTUtMDItMjQgIENzYWJhIE9z enRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBPbmUgbW9yZSBidWlsZGZp eCBhZnRlciByMTgwNTc1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NvY29h L0FQSU9iamVjdC5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Db2NvYS9BUElPYmplY3QubW0K aW5kZXggOGJmMWEzNDFmNGNkODc1N2Q5MzAyZWJhNTczN2NjZmU5MjBlNDJmZC4uNWVkMDRmNGZl OThlYzkzZDE1Njk5YjQ5MTQ3ZGFjNzg4NzZiNTJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvU2hhcmVkL0NvY29hL0FQSU9iamVjdC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv Q29jb2EvQVBJT2JqZWN0Lm1tCkBAIC02MSw2ICs2MSw3IEBACiAjaW1wb3J0ICJfV0tGcmFtZUhh bmRsZUludGVybmFsLmgiCiAjaW1wb3J0ICJfV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb25JbnRl cm5hbC5oIgogI2ltcG9ydCAiX1dLVmlzaXRlZExpbmtQcm92aWRlckludGVybmFsLmgiCisjaW1w b3J0ICJfV0tXZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgiCiAjaW1wb3J0ICJfV0tXZWJzaXRl RGF0YVN0b3JlSW50ZXJuYWwuaCIKICNpbXBvcnQgPG9iamMvb2JqYy1hdXRvLmg+CiAKQEAgLTE5 Myw2ICsxOTQsMTAgQEAgdm9pZCogT2JqZWN0OjpuZXdPYmplY3Qoc2l6ZV90IHNpemUsIFR5cGUg dHlwZSkKICAgICAgICAgd3JhcHBlciA9IFtfV0tWaXNpdGVkTGlua1Byb3ZpZGVyIGFsbG9jXTsK ICAgICAgICAgYnJlYWs7CiAKKyAgICBjYXNlIFR5cGU6OldlYnNpdGVEYXRhUmVjb3JkOgorICAg ICAgICB3cmFwcGVyID0gW19XS1dlYnNpdGVEYXRhUmVjb3JkIGFsbG9jXTsKKyAgICAgICAgYnJl YWs7CisKICAgICBjYXNlIFR5cGU6OldlYnNpdGVEYXRhU3RvcmU6CiAgICAgICAgIHdyYXBwZXIg PSBbX1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxvY107CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVJlY29yZC5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElXZWJzaXRlRGF0YVJlY29yZC5oCmluZGV4 IGE5NDE3OWVlYzlkYjgwNTEwZTUzOTZkZTQ1MTE3YzZjMTBjYTRkODMuLjBjY2RiMjE5MDc4YzAz OGExYTc0YmE0Njg3NzUzODQ1ZjRkZTYxZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQVBJV2Vic2l0ZURhdGFSZWNvcmQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0FQSVdlYnNpdGVEYXRhUmVjb3JkLmgKQEAgLTM2LDYgKzM2LDggQEAgcHVi bGljOgogICAgIHN0YXRpYyBSZWY8V2Vic2l0ZURhdGFSZWNvcmQ+IGNyZWF0ZShXZWJLaXQ6Oldl YnNpdGVEYXRhUmVjb3JkJiYpOwogICAgIHZpcnR1YWwgfldlYnNpdGVEYXRhUmVjb3JkKCk7CiAK KyAgICBjb25zdCBXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3JkJiB3ZWJzaXRlRGF0YVJlY29yZCgp IGNvbnN0IHsgcmV0dXJuIG1fd2Vic2l0ZURhdGFSZWNvcmQ7IH0KKwogcHJpdmF0ZToKICAgICBl eHBsaWNpdCBXZWJzaXRlRGF0YVJlY29yZChXZWJLaXQ6OldlYnNpdGVEYXRhUmVjb3JkJiYpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNp dGVEYXRhUmVjb3JkLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dl YnNpdGVEYXRhUmVjb3JkLmgKaW5kZXggNmE4NGEzMDZkZDc3MjJlMGRkZjkzM2ZlYjBhYTAyNGEx OTQzNzFiZS4uZDY3NzY3ZGRjNWUyMzI1NDllYzM2N2E0OTA2MGYzOGY0ZDMxNGU1ZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJl Y29yZC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0 ZURhdGFSZWNvcmQuaApAQCAtNDAsNiArNDAsMTAgQEAgdHlwZWRlZiBOU19PUFRJT05TKE5TVUlu dGVnZXIsIFdLV2Vic2l0ZURhdGFUeXBlcykgewogCiBXS19DTEFTU19BVkFJTEFCTEUoV0tfTUFD X1RCQSwgV0tfSU9TX1RCQSkKIEBpbnRlcmZhY2UgX1dLV2Vic2l0ZURhdGFSZWNvcmQgOiBOU09i amVjdAorCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGNvcHkpIE5TU3RyaW5nICpk aXNwbGF5TmFtZTsKKworQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBXS1dlYnNpdGVE YXRhVHlwZXMgZGF0YVR5cGVzOwogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmQubW0gYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhUmVjb3JkLm1tCmlu ZGV4IDMyOTQ2YzQwYjA2NTRhZjI4Nzk3NDAwOWMyNzM0NTY1OGFmNDNmZWQuLmNjZmQxZDFiMTJl MTc4MDljZmJiMDU2NWZhODBkMjIzM2VlOWU1NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmQubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29yZC5tbQpAQCAt MzcsNiArMzcsMzcgQEAKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CiAKK3N0YXRpYyBOU1N0cmlu ZyAqZGF0YVR5cGVzVG9TdHJpbmcoV0tXZWJzaXRlRGF0YVR5cGVzIGRhdGFUeXBlcykKK3sKKyAg ICBhdXRvIGFycmF5ID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7CisK KyAgICBpZiAoZGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzKQorICAgICAgICBb YXJyYXkgYWRkT2JqZWN0OkAiQ29va2llcyJdOworICAgIGlmIChkYXRhVHlwZXMgJiBXS1dlYnNp dGVEYXRhVHlwZURpc2tDYWNoZSkKKyAgICAgICAgW2FycmF5IGFkZE9iamVjdDpAIkRpc2sgQ2Fj aGUiXTsKKyAgICBpZiAoZGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZSkK KyAgICAgICAgW2FycmF5IGFkZE9iamVjdDpAIk1lbW9yeSBDYWNoZSJdOworICAgIGlmIChkYXRh VHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZSkKKyAgICAgICAgW2FycmF5IGFk ZE9iamVjdDpAIkxvY2FsIFN0b3JhZ2UiXTsKKworICAgIHJldHVybiBbYXJyYXkgY29tcG9uZW50 c0pvaW5lZEJ5U3RyaW5nOkAiLCAiXTsKK30KKworLSAoTlNTdHJpbmcgKilkZXNjcmlwdGlvbgor eworICAgIHJldHVybiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIjwlQDogJXA7IGRpc3Bs YXlOYW1lID0gJUA7IGRhdGFUeXBlcyA9IHsgJUAgfT4iLCBOU1N0cmluZ0Zyb21DbGFzcyhzZWxm LmNsYXNzKSwgc2VsZiwgc2VsZi5kaXNwbGF5TmFtZSwgZGF0YVR5cGVzVG9TdHJpbmcoc2VsZi5k YXRhVHlwZXMpXTsKK30KKworLSAoTlNTdHJpbmcgKilkaXNwbGF5TmFtZQoreworICAgIHJldHVy biBfd2Vic2l0ZURhdGFSZWNvcmQtPndlYnNpdGVEYXRhUmVjb3JkKCkuZGlzcGxheU5hbWU7Cit9 CisKKy0gKFdLV2Vic2l0ZURhdGFUeXBlcylkYXRhVHlwZXMKK3sKKyAgICByZXR1cm4gV2ViS2l0 Ojp0b1dLV2Vic2l0ZURhdGFUeXBlcyhfd2Vic2l0ZURhdGFSZWNvcmQtPndlYnNpdGVEYXRhUmVj b3JkKCkudHlwZXMpOworfQorCiAjcHJhZ21hIG1hcmsgV0tPYmplY3QgcHJvdG9jb2wgaW1wbGVt ZW50YXRpb24KIAogLSAoQVBJOjpPYmplY3QmKV9hcGlPYmplY3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFSZWNvcmRJbnRlcm5h bC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJl Y29yZEludGVybmFsLmgKaW5kZXggNmExZjQ5YzIzNzAzZTgzN2NmODM3ZjlkMDFkMjNjNTUxNTRk MjhkYy4uMjJiNjM4MDQxOTdhN2M0NGYwYTc5ODcwNTAyZTk4NzQ3ODZkOTFjZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVJlY29y ZEludGVybmFsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tX ZWJzaXRlRGF0YVJlY29yZEludGVybmFsLmgKQEAgLTM4LDYgKzM4LDQyIEBAIGlubGluZSBfV0tX ZWJzaXRlRGF0YVJlY29yZCAqd3JhcHBlcihBUEk6OldlYnNpdGVEYXRhUmVjb3JkJiB3ZWJzaXRl RGF0YVJlY29yZCkKICAgICByZXR1cm4gKF9XS1dlYnNpdGVEYXRhUmVjb3JkICopd2Vic2l0ZURh dGFSZWNvcmQud3JhcHBlcigpOwogfQogCitzdGF0aWMgaW5saW5lIFdlYktpdDo6V2Vic2l0ZURh dGFUeXBlcyB0b1dlYnNpdGVEYXRhVHlwZXMoV0tXZWJzaXRlRGF0YVR5cGVzIHdrV2Vic2l0ZURh dGFUeXBlcykKK3sKKyAgICB1c2luZyBXZWJzaXRlRGF0YVR5cGVzID0gV2ViS2l0OjpXZWJzaXRl RGF0YVR5cGVzOworCisgICAgaW50IHdlYnNpdGVEYXRhVHlwZXMgPSAwOworCisgICAgaWYgKHdr V2Vic2l0ZURhdGFUeXBlcyAmIFdLV2Vic2l0ZURhdGFUeXBlQ29va2llcykKKyAgICAgICAgd2Vi c2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVDb29raWVz OworICAgIGlmICh3a1dlYnNpdGVEYXRhVHlwZXMgJiBXS1dlYnNpdGVEYXRhVHlwZURpc2tDYWNo ZSkKKyAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRl RGF0YVR5cGVEaXNrQ2FjaGU7CisgICAgaWYgKHdrV2Vic2l0ZURhdGFUeXBlcyAmIFdLV2Vic2l0 ZURhdGFUeXBlTWVtb3J5Q2FjaGUpCisgICAgICAgIHdlYnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0 ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlTWVtb3J5Q2FjaGU7CisgICAgaWYgKHdrV2Vic2l0 ZURhdGFUeXBlcyAmIFdLV2Vic2l0ZURhdGFUeXBlTG9jYWxTdG9yYWdlKQorICAgICAgICB3ZWJz aXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZUxvY2FsU3Rv cmFnZTsKKworICAgIHJldHVybiBzdGF0aWNfY2FzdDxXZWJzaXRlRGF0YVR5cGVzPih3ZWJzaXRl RGF0YVR5cGVzKTsKK30KKworc3RhdGljIGlubGluZSBXS1dlYnNpdGVEYXRhVHlwZXMgdG9XS1dl YnNpdGVEYXRhVHlwZXMoaW50IHdlYnNpdGVEYXRhVHlwZXMpCit7CisgICAgdXNpbmcgV2Vic2l0 ZURhdGFUeXBlcyA9IFdlYktpdDo6V2Vic2l0ZURhdGFUeXBlczsKKworICAgIFdLV2Vic2l0ZURh dGFUeXBlcyB3a1dlYnNpdGVEYXRhVHlwZXMgPSAwOworCisgICAgaWYgKHdlYnNpdGVEYXRhVHlw ZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVDb29raWVzKQorICAgICAgICB3 a1dlYnNpdGVEYXRhVHlwZXMgfD0gV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzOworICAgIGlmICh3 ZWJzaXRlRGF0YVR5cGVzICYgV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlRGlza0Nh Y2hlKQorICAgICAgICB3a1dlYnNpdGVEYXRhVHlwZXMgfD0gV0tXZWJzaXRlRGF0YVR5cGVEaXNr Q2FjaGU7CisgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBXZWJzaXRlRGF0YVR5cGVzOjpXZWJz aXRlRGF0YVR5cGVNZW1vcnlDYWNoZSkKKyAgICAgICAgd2tXZWJzaXRlRGF0YVR5cGVzIHw9IFdL V2Vic2l0ZURhdGFUeXBlTWVtb3J5Q2FjaGU7CisgICAgaWYgKHdlYnNpdGVEYXRhVHlwZXMgJiBX ZWJzaXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UpCisgICAgICAgIHdr V2Vic2l0ZURhdGFUeXBlcyB8PSBXS1dlYnNpdGVEYXRhVHlwZUxvY2FsU3RvcmFnZTsKKworICAg IHJldHVybiB3a1dlYnNpdGVEYXRhVHlwZXM7Cit9CisKIH0KIAogQGludGVyZmFjZSBfV0tXZWJz aXRlRGF0YVJlY29yZCAoKSA8V0tPYmplY3Q+IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5tbSBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCBlODA4 Y2Q5YTEzNjYzMjVkNTlmMjQxYjYyNTAzYWU2NjlhYTIxOTBiLi43YmRiOWQ2NWEzOTE3MGI1ODYz NmYyZGJlYzIzNTk4YTIyYmQ3ZWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlLm1tCkBAIC0yOSw4ICsyOSw4 IEBACiAjaWYgV0tfQVBJX0VOQUJMRUQKIAogI2ltcG9ydCAiQVBJQXJyYXkuaCIKLSNpbXBvcnQg IkFQSVdlYnNpdGVEYXRhUmVjb3JkLmgiCiAjaW1wb3J0ICJXS05TQXJyYXkuaCIKKyNpbXBvcnQg Il9XS1dlYnNpdGVEYXRhUmVjb3JkSW50ZXJuYWwuaCIKIAogQGltcGxlbWVudGF0aW9uIF9XS1dl YnNpdGVEYXRhU3RvcmUKIApAQCAtNTYsMjQgKzU2LDYgQEAKICAgICByZXR1cm4gX3dlYnNpdGVE YXRhU3RvcmUtPmlzTm9uUGVyc2lzdGVudCgpOwogfQogCi1zdGF0aWMgV2ViS2l0OjpXZWJzaXRl RGF0YVR5cGVzIHRvV2Vic2l0ZURhdGFUeXBlcyhXS1dlYnNpdGVEYXRhVHlwZXMgd2tXZWJzaXRl RGF0YVR5cGVzKQotewotICAgIHVzaW5nIFdlYnNpdGVEYXRhVHlwZXMgPSBXZWJLaXQ6OldlYnNp dGVEYXRhVHlwZXM7Ci0KLSAgICBpbnQgd2Vic2l0ZURhdGFUeXBlcyA9IDA7Ci0KLSAgICBpZiAo d2tXZWJzaXRlRGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5cGVDb29raWVzKQotICAgICAgICB3 ZWJzaXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNpdGVEYXRhVHlwZUNvb2tp ZXM7Ci0gICAgaWYgKHdrV2Vic2l0ZURhdGFUeXBlcyAmIFdLV2Vic2l0ZURhdGFUeXBlRGlza0Nh Y2hlKQotICAgICAgICB3ZWJzaXRlRGF0YVR5cGVzIHw9IFdlYnNpdGVEYXRhVHlwZXM6OldlYnNp dGVEYXRhVHlwZURpc2tDYWNoZTsKLSAgICBpZiAod2tXZWJzaXRlRGF0YVR5cGVzICYgV0tXZWJz aXRlRGF0YVR5cGVNZW1vcnlDYWNoZSkKLSAgICAgICAgd2Vic2l0ZURhdGFUeXBlcyB8PSBXZWJz aXRlRGF0YVR5cGVzOjpXZWJzaXRlRGF0YVR5cGVNZW1vcnlDYWNoZTsKLSAgICBpZiAod2tXZWJz aXRlRGF0YVR5cGVzICYgV0tXZWJzaXRlRGF0YVR5cGVMb2NhbFN0b3JhZ2UpCi0gICAgICAgIHdl YnNpdGVEYXRhVHlwZXMgfD0gV2Vic2l0ZURhdGFUeXBlczo6V2Vic2l0ZURhdGFUeXBlTG9jYWxT dG9yYWdlOwotCi0gICAgcmV0dXJuIHN0YXRpY19jYXN0PFdlYnNpdGVEYXRhVHlwZXM+KHdlYnNp dGVEYXRhVHlwZXMpOwotfQotCiBzdGF0aWMgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6dGlt ZV9wb2ludCB0b1N5c3RlbUNsb2NrVGltZShOU0RhdGUgKmRhdGUpCiB7CiAgICAgQVNTRVJUKGRh dGUpOwpAQCAtODYsNyArNjgsNyBAQCBzdGF0aWMgc3RkOjpjaHJvbm86OnN5c3RlbV9jbG9jazo6 dGltZV9wb2ludCB0b1N5c3RlbUNsb2NrVGltZShOU0RhdGUgKmRhdGUpCiB7CiAgICAgYXV0byBj b21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25IYW5kbGVyKTsKIAot ICAgIF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuZmV0Y2hEYXRhKHRvV2Vi c2l0ZURhdGFUeXBlcyh3ZWJzaXRlRGF0YVR5cGVzKSwgW2NvbXBsZXRpb25IYW5kbGVyQ29weV0o VmVjdG9yPFdlYktpdDo6V2Vic2l0ZURhdGFSZWNvcmQ+IHdlYnNpdGVEYXRhUmVjb3Jkcykgewor ICAgIF93ZWJzaXRlRGF0YVN0b3JlLT53ZWJzaXRlRGF0YVN0b3JlKCkuZmV0Y2hEYXRhKFdlYktp dDo6dG9XZWJzaXRlRGF0YVR5cGVzKHdlYnNpdGVEYXRhVHlwZXMpLCBbY29tcGxldGlvbkhhbmRs ZXJDb3B5XShWZWN0b3I8V2ViS2l0OjpXZWJzaXRlRGF0YVJlY29yZD4gd2Vic2l0ZURhdGFSZWNv cmRzKSB7CiAgICAgICAgIFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiBlbGVtZW50czsKICAg ICAgICAgZWxlbWVudHMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eSh3ZWJzaXRlRGF0YVJlY29yZHMu c2l6ZSgpKTsKIApAQCAtMTAyLDcgKzg0LDcgQEAgc3RhdGljIHN0ZDo6Y2hyb25vOjpzeXN0ZW1f Y2xvY2s6OnRpbWVfcG9pbnQgdG9TeXN0ZW1DbG9ja1RpbWUoTlNEYXRlICpkYXRlKQogLSAodm9p ZClyZW1vdmVEYXRhT2ZUeXBlczooV0tXZWJzaXRlRGF0YVR5cGVzKXdlYnNpdGVEYXRhVHlwZXMg bW9kaWZpZWRTaW5jZTooTlNEYXRlICopZGF0ZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXiko KSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXJDb3B5ID0g QmxvY2tfY29weShjb21wbGV0aW9uSGFuZGxlcik7Ci0gICAgX3dlYnNpdGVEYXRhU3RvcmUtPndl YnNpdGVEYXRhU3RvcmUoKS5yZW1vdmVEYXRhKHRvV2Vic2l0ZURhdGFUeXBlcyh3ZWJzaXRlRGF0 YVR5cGVzKSwgdG9TeXN0ZW1DbG9ja1RpbWUoZGF0ZSA/IGRhdGUgOiBbTlNEYXRlIGRpc3RhbnRQ YXN0XSksIFtjb21wbGV0aW9uSGFuZGxlckNvcHldIHsKKyAgICBfd2Vic2l0ZURhdGFTdG9yZS0+ d2Vic2l0ZURhdGFTdG9yZSgpLnJlbW92ZURhdGEoV2ViS2l0Ojp0b1dlYnNpdGVEYXRhVHlwZXMo d2Vic2l0ZURhdGFUeXBlcyksIHRvU3lzdGVtQ2xvY2tUaW1lKGRhdGUgPyBkYXRlIDogW05TRGF0 ZSBkaXN0YW50UGFzdF0pLCBbY29tcGxldGlvbkhhbmRsZXJDb3B5XSB7CiAgICAgICAgIGNvbXBs ZXRpb25IYW5kbGVyQ29weSgpOwogICAgICAgICBCbG9ja19yZWxlYXNlKGNvbXBsZXRpb25IYW5k bGVyQ29weSk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFSZWNvcmQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmNwcApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jOGE0MjMx YTY2MDFjYTRlMGI2NTU0MTEzNGE0OTIxYmUyN2U4NTA3Ci0tLSAvZGV2L251bGwKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhUmVjb3JkLmNwcApA QCAtMCwwICsxLDU2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE1IEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJj ZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJl IHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJl IG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4g YmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90 aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVy IGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJ REVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCisgKiBBTkQg QU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywKKyAqIFRIRSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFO RCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElO IE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUworICogQkUgTElB QkxFIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBM QVJZLCBPUgorICogQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YKKyAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7 IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUworICogSU5URVJSVVBU SU9OKSBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRI RVIgSU4KKyAqIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcg TkVHTElHRU5DRSBPUiBPVEhFUldJU0UpCisgKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCisgKiBUSEUgUE9TU0lC SUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworI2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1 ZGUgIldlYnNpdGVEYXRhUmVjb3JkLmgiCisKKyNpbmNsdWRlIDxXZWJDb3JlL1B1YmxpY1N1ZmZp eC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KKworbmFtZXNwYWNlIFdl YktpdCB7CisKK1N0cmluZyBXZWJzaXRlRGF0YVJlY29yZDo6ZGlzcGxheU5hbWVGb3JPcmlnaW4o Y29uc3QgV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4mIHNlY3VyaXR5T3JpZ2luKQoreworICAgIGNv bnN0IGF1dG8mIHByb3RvY29sID0gc2VjdXJpdHlPcmlnaW4ucHJvdG9jb2woKTsKKworICAgIGlm IChwcm90b2NvbCA9PSAiZmlsZSIpIHsKKyAgICAgICAgLy8gRklYTUU6IEhhbmRsZSB0aGlzLiBS ZXR1cm4gYSBsb2NhbGl6ZWQgZGlzcGxheSBuYW1lLgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNI RUQoKTsKKyAgICB9CisKKyAgICBpZiAocHJvdG9jb2wgPT0gImh0dHAiIHx8IHByb3RvY29sID09 ICJodHRwcyIpCisgICAgICAgIHJldHVybiBXZWJDb3JlOjp0b3BQcml2YXRlbHlDb250cm9sbGVk RG9tYWluKHNlY3VyaXR5T3JpZ2luLmhvc3QoKSk7CisKKyAgICByZXR1cm4gU3RyaW5nKCk7Cit9 CisKK3ZvaWQgV2Vic2l0ZURhdGFSZWNvcmQ6OmFkZChXZWJzaXRlRGF0YVR5cGVzIHR5cGUsIFJl ZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4mJiBvcmlnaW4pCit7CisgICAgdHlwZXMgfD0g dHlwZTsKKworICAgIG9yaWdpbnMuYWRkKFdURjo6bW92ZShvcmlnaW4pKTsKK30KKworfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRh UmVjb3JkLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURh dGFSZWNvcmQuaAppbmRleCBhODM4NWRhNmY5NTFlN2Q2YWQ0ZTAxN2M1MDI3YjRmZmYyMDBjZTU3 Li45ZjFkY2YzYzQxM2JkY2M3ODAyMzIzODY1MjE3NDJkNzgzNTVhODliIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFSZWNvcmQuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFSZWNv cmQuaApAQCAtMjYsMTAgKzI2LDI1IEBACiAjaWZuZGVmIFdlYnNpdGVEYXRhUmVjb3JkX2gKICNk ZWZpbmUgV2Vic2l0ZURhdGFSZWNvcmRfaAogCisjaW5jbHVkZSAiV2Vic2l0ZURhdGFUeXBlcy5o IgorI2luY2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW5IYXNoLmg+CisjaW5jbHVkZSA8d3Rm L0hhc2hTZXQuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KKworbmFtZXNwYWNl IFdlYkNvcmUgeworY2xhc3MgU2VjdXJpdHlPcmlnaW47Cit9CisKIG5hbWVzcGFjZSBXZWJLaXQg ewogCiBzdHJ1Y3QgV2Vic2l0ZURhdGFSZWNvcmQgewotICAgIC8vIEZJWE1FOiBGaWxsIHRoaXMg aW4uCisgICAgc3RhdGljIFN0cmluZyBkaXNwbGF5TmFtZUZvck9yaWdpbihjb25zdCBXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbiYpOworCisgICAgdm9pZCBhZGQoV2Vic2l0ZURhdGFUeXBlcywgUmVm UHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPiYmKTsKKworICAgIFN0cmluZyBkaXNwbGF5TmFt ZTsKKyAgICB1bnNpZ25lZCB0eXBlczsKKyAgICBIYXNoU2V0PFJlZlB0cjxXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbj4+IG9yaWdpbnM7CiB9OwogCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggZGVl YjAwY2FiZTNlYWExOWE5OWEyMDdlMzAxZGRjZDZmOTIwYjZhYi4uOWVjZmJiNmYyN2ExNjNlZGIz NjYzNDY2NWZhYjlmNmM5MmVkOTBjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMTMzLDcgKzEz MywxOCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YShXZWJzaXRlRGF0YVR5cGVz IGRhdGFUeXBlcywgc3RkOjpmdW5jdGlvbjx2b2lkCiAgICAgICAgICAgICBBU1NFUlQocGVuZGlu Z0NhbGxiYWNrcyk7CiAgICAgICAgICAgICAtLXBlbmRpbmdDYWxsYmFja3M7CiAKLSAgICAgICAg ICAgIC8vIEZJWE1FOiBEbyBzb21ldGhpbmcgd2l0aCB0aGUgd2Vic2l0ZSBkYXRhLgorICAgICAg ICAgICAgZm9yIChhdXRvJiBlbnRyeSA6IHdlYnNpdGVEYXRhLmVudHJpZXMpIHsKKyAgICAgICAg ICAgICAgICBhdXRvIGRpc3BsYXlOYW1lID0gV2Vic2l0ZURhdGFSZWNvcmQ6OmRpc3BsYXlOYW1l Rm9yT3JpZ2luKCplbnRyeS5vcmlnaW4pOworICAgICAgICAgICAgICAgIGlmICghZGlzcGxheU5h bWUpCisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAgICAgYXV0 byYgcmVjb3JkID0gbV93ZWJzaXRlRGF0YVJlY29yZHMuYWRkKGRpc3BsYXlOYW1lLCBXZWJzaXRl RGF0YVJlY29yZCB7IH0pLml0ZXJhdG9yLT52YWx1ZTsKKyAgICAgICAgICAgICAgICBpZiAoIXJl Y29yZC5kaXNwbGF5TmFtZSkKKyAgICAgICAgICAgICAgICAgICAgcmVjb3JkLmRpc3BsYXlOYW1l ID0gV1RGOjptb3ZlKGRpc3BsYXlOYW1lKTsKKworICAgICAgICAgICAgICAgIHJlY29yZC5hZGQo ZW50cnkudHlwZSwgV1RGOjptb3ZlKGVudHJ5Lm9yaWdpbikpOworICAgICAgICAgICAgfQorCiAg ICAgICAgICAgICBjYWxsSWZOZWVkZWQoKTsKICAgICAgICAgfQogCkBAIC0xNDQsMTMgKzE1NSwy MSBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmZldGNoRGF0YShXZWJzaXRlRGF0YVR5cGVzIGRh dGFUeXBlcywgc3RkOjpmdW5jdGlvbjx2b2lkCiAKICAgICAgICAgICAgIFJlZlB0cjxDYWxsYmFj a0FnZ3JlZ2F0b3I+IGNhbGxiYWNrQWdncmVnYXRvcih0aGlzKTsKICAgICAgICAgICAgIFJ1bkxv b3A6Om1haW4oKS5kaXNwYXRjaChbY2FsbGJhY2tBZ2dyZWdhdG9yXSB7Ci0gICAgICAgICAgICAg ICAgLy8gRklYTUU6IFBhc3MgZGF0YSByZWNvcmRzIHRvIHRoZSBjb21wbGV0aW9uIGhhbmRsZXIu Ci0gICAgICAgICAgICAgICAgY2FsbGJhY2tBZ2dyZWdhdG9yLT5jb21wbGV0aW9uSGFuZGxlcih7 IH0pOworCisgICAgICAgICAgICAgICAgV1RGOjpWZWN0b3I8V2Vic2l0ZURhdGFSZWNvcmQ+IHJl Y29yZHM7CisgICAgICAgICAgICAgICAgcmVjb3Jkcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KGNh bGxiYWNrQWdncmVnYXRvci0+bV93ZWJzaXRlRGF0YVJlY29yZHMuc2l6ZSgpKTsKKworICAgICAg ICAgICAgICAgIGZvciAoYXV0byYgcmVjb3JkIDogY2FsbGJhY2tBZ2dyZWdhdG9yLT5tX3dlYnNp dGVEYXRhUmVjb3Jkcy52YWx1ZXMoKSkKKyAgICAgICAgICAgICAgICAgICAgcmVjb3Jkcy51bmNo ZWNrZWRBcHBlbmQoV1RGOjptb3ZlKHJlY29yZCkpOworCisgICAgICAgICAgICAgICAgY2FsbGJh Y2tBZ2dyZWdhdG9yLT5jb21wbGV0aW9uSGFuZGxlcihXVEY6Om1vdmUocmVjb3JkcykpOwogICAg ICAgICAgICAgfSk7CiAgICAgICAgIH0KIAogICAgICAgICB1bnNpZ25lZCBwZW5kaW5nQ2FsbGJh Y2tzID0gMDsKICAgICAgICAgc3RkOjpmdW5jdGlvbjx2b2lkIChWZWN0b3I8V2Vic2l0ZURhdGFS ZWNvcmQ+KT4gY29tcGxldGlvbkhhbmRsZXI7CisKKyAgICAgICAgSGFzaE1hcDxTdHJpbmcsIFdl YnNpdGVEYXRhUmVjb3JkPiBtX3dlYnNpdGVEYXRhUmVjb3JkczsKICAgICB9OwogCiAgICAgUmVm UHRyPENhbGxiYWNrQWdncmVnYXRvcj4gY2FsbGJhY2tBZ2dyZWdhdG9yID0gYWRvcHRSZWYobmV3 IENhbGxiYWNrQWdncmVnYXRvcihXVEY6Om1vdmUoY29tcGxldGlvbkhhbmRsZXIpKSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2og Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXgg NTI4YzE1MGFlMTNjMzM0NzZhY2QyOGJjODMxZWIzMTBjMDUxZTgzOS4uZTEwYzYxZjNiNGNjZWZj YzhjNDAyZThkYjc5ZDQ2Nzg4NGEyMTE3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2Vi S2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktp dDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjU2LDYgKzI1Niw3IEBACiAJCTFBNDgz MkQxMUE5QkRDMkYwMDhCNERGRSAvKiBXZWJzaXRlRGF0YVJlY29yZC5oIGluIEhlYWRlcnMgKi8g PSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE0ODMyQ0YxQTlCRDgyMTAwOEI0REZF IC8qIFdlYnNpdGVEYXRhUmVjb3JkLmggKi87IH07CiAJCTFBNDgzMkQ2MUE5Q0RGOTYwMDhCNERG RSAvKiBXZWJzaXRlRGF0YS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7 IGZpbGVSZWYgPSAxQTQ4MzJENDFBOUNERjk2MDA4QjRERkUgLyogV2Vic2l0ZURhdGEuY3BwICov OyB9OwogCQkxQTQ4MzJENzFBOUNERjk2MDA4QjRERkUgLyogV2Vic2l0ZURhdGEuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNDgzMkQ1MUE5Q0RGOTYw MDhCNERGRSAvKiBXZWJzaXRlRGF0YS5oICovOyB9OworCQkxQTQ4MzJEOTFBOUQxRkQyMDA4QjRE RkUgLyogV2Vic2l0ZURhdGFSZWNvcmQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE0ODMyRDgxQTlEMUZEMjAwOEI0REZFIC8qIFdlYnNpdGVEYXRh UmVjb3JkLmNwcCAqLzsgfTsKIAkJMUE0QTlDNTUxMkI4MTZDRjAwOEZFOTg0IC8qIE5ldHNjYXBl UGx1Z2luTW9kdWxlLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDFBNEE5QzUzMTJCODE2Q0YwMDhGRTk4NCAvKiBOZXRzY2FwZVBsdWdpbk1vZHVsZS5j cHAgKi87IH07CiAJCTFBNEE5QzU2MTJCODE2Q0YwMDhGRTk4NCAvKiBOZXRzY2FwZVBsdWdpbk1v ZHVsZS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUE0 QTlDNTQxMkI4MTZDRjAwOEZFOTg0IC8qIE5ldHNjYXBlUGx1Z2luTW9kdWxlLmggKi87IH07CiAJ CTFBNEE5QzlBMTJCODIxQ0QwMDhGRTk4NCAvKiBOZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNEE5Qzk5MTJC ODIxQ0QwMDhGRTk4NCAvKiBOZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbSAqLzsgfTsKQEAgLTIz MzYsNiArMjMzNyw3IEBACiAJCTFBNDgzMkNGMUE5QkQ4MjEwMDhCNERGRSAvKiBXZWJzaXRlRGF0 YVJlY29yZC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXZWJzaXRlRGF0YVJl Y29yZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTQ4MzJENDFBOUNERjk2MDA4 QjRERkUgLyogV2Vic2l0ZURhdGEuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gV2Vic2l0ZURhdGEuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQTQ4 MzJENTFBOUNERjk2MDA4QjRERkUgLyogV2Vic2l0ZURhdGEuaCAqLyA9IHtpc2EgPSBQQlhGaWxl UmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNv ZGUuYy5oOyBwYXRoID0gV2Vic2l0ZURhdGEuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsK KwkJMUE0ODMyRDgxQTlEMUZEMjAwOEI0REZFIC8qIFdlYnNpdGVEYXRhUmVjb3JkLmNwcCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdlYnNpdGVEYXRhUmVjb3JkLmNwcDsg c291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUE0QTlDNTMxMkI4MTZDRjAwOEZFOTg0IC8q IE5ldHNjYXBlUGx1Z2luTW9kdWxlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsg cGF0aCA9IE5ldHNjYXBlUGx1Z2luTW9kdWxlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJMUE0QTlDNTQxMkI4MTZDRjAwOEZFOTg0IC8qIE5ldHNjYXBlUGx1Z2luTW9kdWxlLmgg Ki8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3du RmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IE5ldHNjYXBlUGx1Z2luTW9kdWxlLmg7 IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBNEE5Qzk5MTJCODIxQ0QwMDhGRTk4NCAv KiBOZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNl OyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9i amNwcDsgcGF0aCA9IE5ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwpAQCAtNDQ4MSw2ICs0NDgzLDcgQEAKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJ Y2hpbGRyZW4gPSAoCiAJCQkJMUE0ODMyQzAxQTk2NUEzMzAwOEI0REZFIC8qIENvY29hICovLAor CQkJCTFBNDgzMkQ4MUE5RDFGRDIwMDhCNERGRSAvKiBXZWJzaXRlRGF0YVJlY29yZC5jcHAgKi8s CiAJCQkJMUE0ODMyQ0YxQTlCRDgyMTAwOEI0REZFIC8qIFdlYnNpdGVEYXRhUmVjb3JkLmggKi8s CiAJCQkJMUE1M0MyQTQxQTMyNTY5RjAwNEU4QzcwIC8qIFdlYnNpdGVEYXRhU3RvcmUuY3BwICov LAogCQkJCTFBNTNDMkE1MUEzMjU2OUYwMDRFOEM3MCAvKiBXZWJzaXRlRGF0YVN0b3JlLmggKi8s CkBAIC05ODU4LDYgKzk4NjEsNyBAQAogCQkJCUJDNEJFRkUyMTIwQTFBNEMwMEZCQTBDNyAvKiBX S0J1bmRsZU5vZGVIYW5kbGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQkMyMDUyODIxMUM5NDI4 NDAwOEYzMzc1IC8qIFdLQnVuZGxlUGFnZS5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3Q0Y0N0ZG NjE3Mjc1QjcxMDA4QUNCOTEgLyogV0tCdW5kbGVQYWdlQmFubmVyLmNwcCBpbiBTb3VyY2VzICov LAorCQkJCTFBNDgzMkQ5MUE5RDFGRDIwMDhCNERGRSAvKiBXZWJzaXRlRGF0YVJlY29yZC5jcHAg aW4gU291cmNlcyAqLywKIAkJCQk3Q0Y0N0ZGRTE3Mjc2QUUzMDA4QUNCOTEgLyogV0tCdW5kbGVQ YWdlQmFubmVyTWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQkM3QjYzM0UxMkE0NUQxMjAwRDE3 NEE0IC8qIFdLQnVuZGxlUGFnZUdyb3VwLmNwcCBpbiBTb3VyY2VzICovLAogCQkJCUVEQ0E3MUI3 MTI4RERBOEMwMDIwMUIyNiAvKiBXS0J1bmRsZVBhZ2VPdmVybGF5LmNwcCBpbiBTb3VyY2VzICov LAo=