139875 2014-12-22 13:27:02 -0800 Add a SecurityOriginPolicy class 2014-12-22 15:42:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1057440 0 andersca 2014-12-22 13:27:02 -0800 Add a SecurityOriginPolicy class 1057443 1 243638 andersca 2014-12-22 13:39:28 -0800 Created attachment 243638 Patch 1057470 2 andersca 2014-12-22 15:42:32 -0800 Committed r177661: <http://trac.webkit.org/changeset/177661> 243638 2014-12-22 13:39:28 -0800 2014-12-22 14:13:41 -0800 Patch bug-139875-20141222133928.patch text/plain 31178 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzlkYmY3MDA4MzlkZGI2 ZTc0MWE4N2ZjZjcwMjQ1OGY1Y2NlNWEyYS4uZWFhOTQ4MzU5YjVmZDg1OWRiNTNjMzljYmM0NTBj ZjdhNjcyNzAxYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUzIEBACisyMDE0LTEyLTIyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgU2VjdXJp dHlPcmlnaW5Qb2xpY3kgY2xhc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzOTg3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgaXMgdGhlIGZpcnN0IHN0ZXAgdG93YXJkcyBtYWtpbmcgU2VjdXJp dHlPcmlnaW4gaW1tdXRhYmxlLiBTZWN1cml0eU9yaWdpblBvbGljeSB3aWxsIGhvbGQgYQorICAg ICAgICBTZWN1cml0eU9yaWdpbiBhbmQgd2lsbCBoYW5kbGUgdGhpbmdzIHRoYXQgd291bGQgb3Ro ZXJ3aXNlIG11dGF0ZSBTZWN1cml0eU9yaWdpbi4KKworICAgICAgICAqIENNYWtlTGlzdHMudHh0 OgorICAgICAgICAqIFdlYkNvcmUuZXhwLmluOgorICAgICAgICAqIFdlYkNvcmUudmN4cHJvai9X ZWJDb3JlLnZjeHByb2o6CisgICAgICAgICogV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJv ai5maWx0ZXJzOgorICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoK KyAgICAgICAgKiBkb20vRE9NSW1wbGVtZW50YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RE9NSW1wbGVtZW50YXRpb246OmNyZWF0ZURvY3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkRP TUltcGxlbWVudGF0aW9uOjpjcmVhdGVIVE1MRG9jdW1lbnQpOgorICAgICAgICAqIGRvbS9Eb2N1 bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6Y3JlYXRlKToKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50OjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojpj bG9uZURhdGFGcm9tRG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmluaXRT ZWN1cml0eUNvbnRleHQpOgorICAgICAgICAqIGRvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0Lmg6 CisgICAgICAgICogZG9tL1NlY3VyaXR5Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpT ZWN1cml0eUNvbnRleHQ6OnNldFNlY3VyaXR5T3JpZ2luUG9saWN5KToKKyAgICAgICAgKFdlYkNv cmU6OlNlY3VyaXR5Q29udGV4dDo6c2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6 U2VjdXJpdHlDb250ZXh0Ojppc1NlY3VyZVRyYW5zaXRpb25Ubyk6CisgICAgICAgIChXZWJDb3Jl OjpTZWN1cml0eUNvbnRleHQ6OmVuZm9yY2VTYW5kYm94RmxhZ3MpOgorICAgICAgICAoV2ViQ29y ZTo6U2VjdXJpdHlDb250ZXh0OjpzZXRTZWN1cml0eU9yaWdpbik6IERlbGV0ZWQuCisgICAgICAg ICogZG9tL1NlY3VyaXR5Q29udGV4dC5oOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlDb250 ZXh0OjpzZWN1cml0eU9yaWdpblBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eUNv bnRleHQ6OnNlY3VyaXR5T3JpZ2luKTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vU2VjdXJpdHlP cmlnaW5Qb2xpY3kuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu UG9saWN5OjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW5Qb2xpY3k6 OlNlY3VyaXR5T3JpZ2luUG9saWN5KToKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2lu UG9saWN5Ojp+U2VjdXJpdHlPcmlnaW5Qb2xpY3kpOgorICAgICAgICAqIGRvbS9TZWN1cml0eU9y aWdpblBvbGljeS5oOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luUG9s aWN5OjpvcmlnaW4pOgorICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFdyaXRlci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudFdyaXRlcjo6YmVnaW4pOgorICAgICAgICAqIHdvcmtlcnMv V29ya2VyR2xvYmFsU2NvcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyR2xvYmFsU2Nv cGU6Oldvcmtlckdsb2JhbFNjb3BlKToKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OnJlc3BvbnNlWE1MKToKKyAgICAg ICAgKiB4bWwvWE1MVHJlZVZpZXdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpYTUxUcmVlVmll d2VyOjp0cmFuc2Zvcm1Eb2N1bWVudFRvVHJlZVZpZXcpOgorICAgICAgICAqIHhtbC9YU0xUUHJv Y2Vzc29yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhTTFRQcm9jZXNzb3I6OmNyZWF0ZURvY3Vt ZW50RnJvbVNvdXJjZSk6CisKIDIwMTQtMTItMjIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KIAogICAgICAgICBNb3ZlICJBdXRvIiBDU1MgcHJvcGVydGllcyB0byB0aGUgbmV3IFN0 eWxlQnVpbGRlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ01ha2VMaXN0cy50eHQgYi9T b3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAppbmRleCAzYzU1YTU3NzJkZGQyYzc4ZTFmYTU0 OThmYTI0MjM1ZTdhZmMxN2EzLi4wODI0ZTBhYzc5NjEwNzMyMDI5MzIzODM4N2RkNDhlZDNmOTc4 MmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DTWFrZUxpc3RzLnR4dApAQCAtMTQxMCw2ICsxNDEwLDcgQEAgc2V0KFdlYkNv cmVfU09VUkNFUwogICAgIGRvbS9TY3JpcHRhYmxlRG9jdW1lbnRQYXJzZXIuY3BwCiAgICAgZG9t L1NjcmlwdGVkQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKICAgICBkb20vU2VjdXJpdHlDb250ZXh0 LmNwcAorICAgIGRvbS9TZWN1cml0eU9yaWdpblBvbGljeS5jcHAKICAgICBkb20vU2VsZWN0b3JR dWVyeS5jcHAKICAgICBkb20vU2hhZG93Um9vdC5jcHAKICAgICBkb20vU3BhY2VTcGxpdFN0cmlu Zy5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggYWE5OWQ0NzY1NTg4MzRjY2U1NWIyYWExZTM5 MzJhZDFkZjkzZWFjNy4uZjYyZjY2ZWYzOGEyOTYwMDJjMDVjMTk5YTZjYTY1MDg0YmQzZDZhNSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTE4MDEsNiArMTgwMSw3IEBAIF9fWk5LN1dlYkNvcmUx NVByb3RlY3Rpb25TcGFjZTI2cmVjZWl2ZXNDcmVkZW50aWFsU2VjdXJlbHlFdgogX19aTks3V2Vi Q29yZTE1UHJvdGVjdGlvblNwYWNlN25zU3BhY2VFdgogX19aTks3V2ViQ29yZTE1UmVzb3VyY2VS ZXF1ZXN0MTJjZlVSTFJlcXVlc3RFTlNfMjBIVFRQQm9keVVwZGF0ZVBvbGljeUUKIF9fWk5LN1dl YkNvcmUxNVJlc291cmNlUmVxdWVzdDEybnNVUkxSZXF1ZXN0RU5TXzIwSFRUUEJvZHlVcGRhdGVQ b2xpY3lFCitfX1pOSzdXZWJDb3JlMTVTZWN1cml0eUNvbnRleHQxNHNlY3VyaXR5T3JpZ2luRXYK IF9fWk5LN1dlYkNvcmUxNVN0eWxlUHJvcGVydGllczExbXV0YWJsZUNvcHlFdgogX19aTks3V2Vi Q29yZTE1U3R5bGVQcm9wZXJ0aWVzMTZnZXRQcm9wZXJ0eVZhbHVlRU5TXzEzQ1NTUHJvcGVydHlJ REUKIF9fWk5LN1dlYkNvcmUxNVZpc2libGVQb3NpdGlvbjE0Y2hhcmFjdGVyQWZ0ZXJFdgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvaiBi L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3JlLnZjeHByb2oKaW5kZXggMWI3 Y2VlODVjOWZiN2Y5YzExOWI2NTNjOTg0YzQ5OWE4NTA1YTZiZS4uOTE2NDM3NWI4M2U0NWE0OWJj NjNlOGM5YWI3ZjliODMyYmU5OWNjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS52Y3hwcm9qL1dlYkNvcmUudmN4cHJvagorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZj eHByb2ovV2ViQ29yZS52Y3hwcm9qCkBAIC0xMzgxNCw2ICsxMzgxNCwyMCBAQAogICAgICAgPEV4 Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSkn PT0nUHJvZHVjdGlvbnxXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgogICAgICAgPEV4 Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0Zm9ybSkn PT0nUHJvZHVjdGlvbnx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KICAgICA8L0NsQ29t cGlsZT4KKyAgICA8Q2xDb21waWxlIEluY2x1ZGU9Ii4uXGRvbVxTZWN1cml0eU9yaWdpblBvbGlj eS5jcHAiPgorICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJh dGlvbil8JChQbGF0Zm9ybSknPT0nRGVidWd8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWls ZD4KKyAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24p fCQoUGxhdGZvcm0pJz09J0RlYnVnfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgorICAg ICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQbGF0 Zm9ybSknPT0nRGVidWdfV2luQ2Fpcm98V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4K KyAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J0RlYnVnX1dpbkNhaXJvfHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxk PgorICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8 JChQbGF0Zm9ybSknPT0nRGVidWdTdWZmaXh8V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWls ZD4KKyAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24p fCQoUGxhdGZvcm0pJz09J0RlYnVnU3VmZml4fHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxk PgorICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8 JChQbGF0Zm9ybSknPT0nUmVsZWFzZXxXaW4zMiciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxkPgor ICAgICAgPEV4Y2x1ZGVkRnJvbUJ1aWxkIENvbmRpdGlvbj0iJyQoQ29uZmlndXJhdGlvbil8JChQ bGF0Zm9ybSknPT0nUmVsZWFzZXx4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4KKyAgICAg IDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQoUGxhdGZv cm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98V2luMzInIj50cnVlPC9FeGNsdWRlZEZyb21CdWlsZD4K KyAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENvbmZpZ3VyYXRpb24pfCQo UGxhdGZvcm0pJz09J1JlbGVhc2VfV2luQ2Fpcm98eDY0JyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+CisgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9u KXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRGcm9tQnVp bGQ+CisgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1cmF0aW9u KXwkKFBsYXRmb3JtKSc9PSdQcm9kdWN0aW9ufHg2NCciPnRydWU8L0V4Y2x1ZGVkRnJvbUJ1aWxk PgorICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cZG9tXFNlbGVj dG9yUXVlcnkuY3BwIj4KICAgICAgIDxFeGNsdWRlZEZyb21CdWlsZCBDb25kaXRpb249IickKENv bmZpZ3VyYXRpb24pfCQoUGxhdGZvcm0pJz09J0RlYnVnfFdpbjMyJyI+dHJ1ZTwvRXhjbHVkZWRG cm9tQnVpbGQ+CiAgICAgICA8RXhjbHVkZWRGcm9tQnVpbGQgQ29uZGl0aW9uPSInJChDb25maWd1 cmF0aW9uKXwkKFBsYXRmb3JtKSc9PSdEZWJ1Z3x4NjQnIj50cnVlPC9FeGNsdWRlZEZyb21CdWls ZD4KQEAgLTIwNjMwLDYgKzIwNjQ0LDcgQEAKICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGRv bVxTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIu Llxkb21cU2NyaXB0UnVubmVyLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxkb21c U2VjdXJpdHlDb250ZXh0LmgiIC8+CisgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxkb21cU2Vj dXJpdHlPcmlnaW5Qb2xpY3kuaCIgLz4KICAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGRvbVxT ZWxlY3RvclF1ZXJ5LmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxkb21cU2ltdWxh dGVkQ2xpY2tPcHRpb25zLmgiIC8+CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxkb21cU3Bh Y2VTcGxpdFN0cmluZy5oIiAvPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52 Y3hwcm9qL1dlYkNvcmUudmN4cHJvai5maWx0ZXJzCmluZGV4IDkxNWNmMTU5Zjg5NDhiYjVhZjYz MjE2MWRkNDYxYTNlMWQ3MzZlMGQuLjNhOTQ0MjU1YzY3ZmFlYTI1NTNkMzQ2MjcyMjc2NzNmMDAx YTZhYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmN4cHJvai9XZWJDb3Jl LnZjeHByb2ouZmlsdGVycworKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnZjeHByb2ovV2Vi Q29yZS52Y3hwcm9qLmZpbHRlcnMKQEAgLTMzNjMsNiArMzM2Myw5IEBACiAgICAgPENsQ29tcGls ZSBJbmNsdWRlPSIuLlxkb21cU2VjdXJpdHlDb250ZXh0LmNwcCI+CiAgICAgICA8RmlsdGVyPmRv bTwvRmlsdGVyPgogICAgIDwvQ2xDb21waWxlPgorICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5c ZG9tXFNlY3VyaXR5T3JpZ2luUG9saWN5LmNwcCI+CisgICAgICA8RmlsdGVyPmRvbTwvRmlsdGVy PgorICAgIDwvQ2xDb21waWxlPgogICAgIDxDbENvbXBpbGUgSW5jbHVkZT0iLi5cZG9tXFNlbGVj dG9yUXVlcnkuY3BwIj4KICAgICAgIDxGaWx0ZXI+ZG9tPC9GaWx0ZXI+CiAgICAgPC9DbENvbXBp bGU+CkBAIC0xMDQ5MSw2ICsxMDQ5NCw5IEBACiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxk b21cU2VjdXJpdHlDb250ZXh0LmgiPgogICAgICAgPEZpbHRlcj5kb208L0ZpbHRlcj4KICAgICA8 L0NsSW5jbHVkZT4KKyAgICA8Q2xJbmNsdWRlIEluY2x1ZGU9Ii4uXGRvbVxTZWN1cml0eU9yaWdp blBvbGljeS5oIj4KKyAgICAgIDxGaWx0ZXI+ZG9tPC9GaWx0ZXI+CisgICAgPC9DbEluY2x1ZGU+ CiAgICAgPENsSW5jbHVkZSBJbmNsdWRlPSIuLlxkb21cU2VsZWN0b3JRdWVyeS5oIj4KICAgICAg IDxGaWx0ZXI+ZG9tPC9GaWx0ZXI+CiAgICAgPC9DbEluY2x1ZGU+CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi Q29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggMmM3ODRjY2IzMWYz YzFiOTZlNGIzNjllYWI2ZTk3MjU1YWIwOTQyYi4uZDczZDVlZDg2YWZkYTRmMThhM2M3N2Q0YTJl NTc4M2FlZTdiZDU2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtOTIwLDYgKzkyMCw4IEBACiAJCTFBRjYyRjI0MTREQUZFOTEw MDQxNTU2QyAvKiBTY3JvbGxpbmdUaHJlYWRNYWMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQ QlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUY2MkYyMzE0REFGRTkxMDA0MTU1NkMgLyogU2Nyb2xs aW5nVGhyZWFkTWFjLm1tICovOyB9OwogCQkxQUY2MkYyNTE0REFGRTlFMDA0MTU1NkMgLyogU2Ny b2xsaW5nVGhyZWFkLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDFBRjYyRjIwMTREQUZFNzkwMDQxNTU2QyAvKiBTY3JvbGxpbmdUaHJlYWQuY3BwICov OyB9OwogCQkxQUY2MkYyNjE0REFGRUExMDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkLmggaW4g SGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQUY2MkYyMTE0REFG RTc5MDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVU RVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKKwkJMUFGN0FGQzcxQTQ4QThCQzAwQzhFNEU3IC8qIFNl Y3VyaXR5T3JpZ2luUG9saWN5LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmls ZTsgZmlsZVJlZiA9IDFBRjdBRkM1MUE0OEE4QkMwMEM4RTRFNyAvKiBTZWN1cml0eU9yaWdpblBv bGljeS5jcHAgKi87IH07CisJCTFBRjdBRkM4MUE0OEE4QkMwMEM4RTRFNyAvKiBTZWN1cml0eU9y aWdpblBvbGljeS5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMUFGN0FGQzYxQTQ4QThCQzAwQzhFNEU3IC8qIFNlY3VyaXR5T3JpZ2luUG9saWN5LmggKi87 IH07CiAJCTFBRjg5QTQyMTUxOEZERUEwMEU1NDdCNSAvKiBUaWxlZEJhY2tpbmcuaCBpbiBIZWFk ZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRjg5QTQxMTUxOEZERUEw MEU1NDdCNSAvKiBUaWxlZEJhY2tpbmcuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQ cml2YXRlLCApOyB9OyB9OwogCQkxQUY4RTExQTEyNTY1OTI2MDAyMzBGRjcgLyogUHJveHlTZXJ2 ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBRjhF MTE5MTI1NjU5MjYwMDIzMEZGNyAvKiBQcm94eVNlcnZlci5oICovOyBzZXR0aW5ncyA9IHtBVFRS SUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCTFBRjhFMTMzMTI1NjVBNDQwMDIzMEZGNyAv KiBQcm94eVNlcnZlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQUY4RTEzMjEyNTY1QTQ0MDAyMzBGRjcgLyogUHJveHlTZXJ2ZXIuY3BwICovOyB9 OwpAQCAtNzk1MSw2ICs3OTUzLDggQEAKIAkJMUFGNjJGMjAxNERBRkU3OTAwNDE1NTZDIC8qIFNj cm9sbGluZ1RocmVhZC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29k aW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBT Y3JvbGxpbmdUaHJlYWQuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUY2MkYy MTE0REFGRTc5MDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkLmggKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmMuaDsgcGF0aCA9IFNjcm9sbGluZ1RocmVhZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4i OyB9OwogCQkxQUY2MkYyMzE0REFGRTkxMDA0MTU1NkMgLyogU2Nyb2xsaW5nVGhyZWFkTWFjLm1t ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU2Nyb2xsaW5nVGhyZWFk TWFjLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQUY3QUZDNTFBNDhBOEJDMDBD OEU0RTcgLyogU2VjdXJpdHlPcmlnaW5Qb2xpY3kuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gU2VjdXJpdHlPcmlnaW5Qb2xpY3kuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQkxQUY3QUZDNjFBNDhBOEJDMDBDOEU0RTcgLyogU2VjdXJpdHlPcmlnaW5Q b2xpY3kuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBs YXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gU2VjdXJpdHlPcmlnaW5Q b2xpY3kuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFGODlBNDExNTE4RkRFQTAw RTU0N0I1IC8qIFRpbGVkQmFja2luZy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGgg PSBUaWxlZEJhY2tpbmcuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFGOEUxMTkx MjU2NTkyNjAwMjMwRkY3IC8qIFByb3h5U2VydmVyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVy ZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMu aDsgcGF0aCA9IFByb3h5U2VydmVyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFB RjhFMTMyMTI1NjVBNDQwMDIzMEZGNyAvKiBQcm94eVNlcnZlci5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBQcm94eVNlcnZlci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdy b3VwPiI7IH07CkBAIC0yMjY0MiwxMCArMjI2NDYsMTAgQEAKIAkJRjUyM0QzMjQwMkRFNDQ3ODAx ODYzNUNBIC8qIGRvbSAqLyA9IHsKIAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAo CisJCQkJQ0UyNjE2QTQxODdFNjVDMTAwNzk1NUYzIC8qIGlvcyAqLywKIAkJCQkzMTk4NDdGRTFB MUQ4MTY3MDBBMTMzMTggLyogQW5pbWF0aW9uRXZlbnQuY3BwICovLAogCQkJCTMxOTg0N0ZGMUEx RDgxNjcwMEExMzMxOCAvKiBBbmltYXRpb25FdmVudC5oICovLAogCQkJCTMxOTg0ODAwMUExRDgx NjcwMEExMzMxOCAvKiBBbmltYXRpb25FdmVudC5pZGwgKi8sCi0JCQkJQ0UyNjE2QTQxODdFNjVD MTAwNzk1NUYzIC8qIGlvcyAqLywKIAkJCQlFMUM0REU2RDBFQTc1QzY1MDAyM0NDRDYgLyogQWN0 aXZlRE9NT2JqZWN0LmNwcCAqLywKIAkJCQlFMUM0REU2ODBFQTc1QzFFMDAyM0NDRDYgLyogQWN0 aXZlRE9NT2JqZWN0LmggKi8sCiAJCQkJQThDNEE3RkMwOUQ1NjMyNzAwMDNBQzhEIC8qIEF0dHIu Y3BwICovLApAQCAtMjI5NTcsNiArMjI5NjEsOCBAQAogCQkJCThBNDEzQURFMTIwN0JCQTUwMDgy MDE2RSAvKiBTY3JpcHRSdW5uZXIuaCAqLywKIAkJCQk5NzZGMzZFODE0Njg2MjI1MDA1RTkzQjQg LyogU2VjdXJpdHlDb250ZXh0LmNwcCAqLywKIAkJCQk5NzZGMzZFOTE0Njg2MjI1MDA1RTkzQjQg LyogU2VjdXJpdHlDb250ZXh0LmggKi8sCisJCQkJMUFGN0FGQzUxQTQ4QThCQzAwQzhFNEU3IC8q IFNlY3VyaXR5T3JpZ2luUG9saWN5LmNwcCAqLywKKwkJCQkxQUY3QUZDNjFBNDhBOEJDMDBDOEU0 RTcgLyogU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCAqLywKIAkJCQkyRDVCQzQyNTE2Rjg4MkJFMDA3 MDQ4RDAgLyogU2VjdXJpdHlQb2xpY3lWaW9sYXRpb25FdmVudC5oICovLAogCQkJCTJENUJDNDI2 MTZGODgyQkUwMDcwNDhEMCAvKiBTZWN1cml0eVBvbGljeVZpb2xhdGlvbkV2ZW50LmlkbCAqLywK IAkJCQlFNDUzMjJBOTE0MENFMjY3MDA1QTBGOTIgLyogU2VsZWN0b3JRdWVyeS5jcHAgKi8sCkBA IC0yNjQ3OCw2ICsyNjQ4NCw3IEBACiAJCQkJNDM2NzA4RjIxMkQ5Q0E0QjAwMDQ0MjM0IC8qIFNW R1JlbmRlclN1cHBvcnQuaCBpbiBIZWFkZXJzICovLAogCQkJCTQzNjcwOEY0MTJEOUNBNEIwMDA0 NDIzNCAvKiBTVkdSZW5kZXJUcmVlQXNUZXh0LmggaW4gSGVhZGVycyAqLywKIAkJCQk0MzY3MDhG NjEyRDlDQTRCMDAwNDQyMzQgLyogU1ZHUmVzb3VyY2VzLmggaW4gSGVhZGVycyAqLywKKwkJCQkx QUY3QUZDODFBNDhBOEJDMDBDOEU0RTcgLyogU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCBpbiBIZWFk ZXJzICovLAogCQkJCTQzNjcwOEY4MTJEOUNBNEIwMDA0NDIzNCAvKiBTVkdSZXNvdXJjZXNDYWNo ZS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNDM2NzA4RkExMkQ5Q0E0QjAwMDQ0MjM0IC8qIFNWR1Jl c291cmNlc0N5Y2xlU29sdmVyLmggaW4gSGVhZGVycyAqLywKIAkJCQkwODU0QjAyMzEyNTVFNEU2 MDBCOUNERDAgLyogU1ZHUm9vdElubGluZUJveC5oIGluIEhlYWRlcnMgKi8sCkBAIC0yOTg4NCw2 ICsyOTg5MSw3IEBACiAJCQkJQjJDM0RBNDEwRDAwNkMxRDAwRUY2RjI2IC8qIFRleHRDb2RlY1VU RjE2LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTkzNDNDQjgxMTJGMjVFNTEwMDMzQzVFRSAvKiBU ZXh0Q29kZWNVVEY4LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTE0MkI5N0M5MTMxMzg5NDMwMDhC RUY0QiAvKiBUZXh0Q29udHJvbElubmVyRWxlbWVudHMuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJ MUFGN0FGQzcxQTQ4QThCQzAwQzhFNEU3IC8qIFNlY3VyaXR5T3JpZ2luUG9saWN5LmNwcCBpbiBT b3VyY2VzICovLAogCQkJCTk3QkM4NEIzMTIzNzExODAwMDBDNjE2MSAvKiBUZXh0RG9jdW1lbnQu Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJOTdCQzg0ODMxMjM2RkQ5MzAwMEM2MTYxIC8qIFRleHRE b2N1bWVudFBhcnNlci5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlCMkMzREE0NjBEMDA2QzFEMDBF RjZGMjYgLyogVGV4dEVuY29kaW5nLmNwcCBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKaW5kZXggN2I3ZDdmZmM5ODA5ZTY1YjE5MjYyNjk3Zjdi YmQ0ZmQ4MjZkOGI0OC4uNDBjMTUxYmMxMzAyMDVlYzA2MjA0NzFiY2I3NjllZjQ1ZDM2MzEzZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCkBAIC00Nyw2ICs0Nyw3 IEBACiAjaW5jbHVkZSAiU1ZHRG9jdW1lbnQuaCIKICNpbmNsdWRlICJTVkdOYW1lcy5oIgogI2lu Y2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCisjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3ku aCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlN0eWxlU2hlZXRDb250ZW50cy5o IgogI2luY2x1ZGUgIlN1YmZyYW1lTG9hZGVyLmgiCkBAIC0yMjAsNyArMjIxLDcgQEAgUmVmUHRy PERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQoY29uc3QgU3RyaW5n JiBuYW1lc3BhY2VVUkksCiAgICAgZWxzZQogICAgICAgICBkb2MgPSBEb2N1bWVudDo6Y3JlYXRl KDAsIFVSTCgpKTsKIAotICAgIGRvYy0+c2V0U2VjdXJpdHlPcmlnaW4obV9kb2N1bWVudC5zZWN1 cml0eU9yaWdpbigpKTsKKyAgICBkb2MtPnNldFNlY3VyaXR5T3JpZ2luUG9saWN5KG1fZG9jdW1l bnQuc2VjdXJpdHlPcmlnaW5Qb2xpY3koKSk7CiAKICAgICBSZWZQdHI8Tm9kZT4gZG9jdW1lbnRF bGVtZW50OwogICAgIGlmICghcXVhbGlmaWVkTmFtZS5pc0VtcHR5KCkpIHsKQEAgLTI5NSw3ICsy OTYsNyBAQCBSZWZQdHI8SFRNTERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlSFRN TERvY3VtZW50KGNvbnN0IFN0cmluZyYgdGl0bGUpCiAgICAgZC0+d3JpdGUoIjwhZG9jdHlwZSBo dG1sPjxodG1sPjxib2R5PjwvYm9keT48L2h0bWw+Iik7CiAgICAgaWYgKCF0aXRsZS5pc051bGwo KSkKICAgICAgICAgZC0+c2V0VGl0bGUodGl0bGUpOwotICAgIGQtPnNldFNlY3VyaXR5T3JpZ2lu KG1fZG9jdW1lbnQuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgZC0+c2V0U2VjdXJpdHlPcmlnaW5Q b2xpY3kobV9kb2N1bWVudC5zZWN1cml0eU9yaWdpblBvbGljeSgpKTsKICAgICByZXR1cm4gZDsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMGUxYTVmZDk2MDFjNTE0MTZhYWQ5NGE3 Y2Y2ZjlhYzU5YzBmNjFjYi4uZTZlZTYyMzk5NjI0NmI3OTNiZGI1Y2U0M2Y4ZTU0NWNhYzE4NTBm NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC0xMzQsNiArMTM0LDcgQEAKICNpbmNsdWRl ICJTY3JpcHRTb3VyY2VDb2RlLmgiCiAjaW5jbHVkZSAiU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaCIK ICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5oIgorI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luUG9s aWN5LmgiCiAjaW5jbHVkZSAiU2VjdXJpdHlQb2xpY3kuaCIKICNpbmNsdWRlICJTZWdtZW50ZWRT dHJpbmcuaCIKICNpbmNsdWRlICJTZWxlY3RvclF1ZXJ5LmgiCkBAIC01NjcsNyArNTY4LDggQEAg c3RhdGljIGJvb2wgaXNBdHRyaWJ1dGVPbkFsbE93bmVycyhjb25zdCBXZWJDb3JlOjpRdWFsaWZp ZWROYW1lJiBhdHRyaWJ1dGUsIGNvbnMKIFJlZjxEb2N1bWVudD4gRG9jdW1lbnQ6OmNyZWF0ZShT Y3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KQogewogICAgIFJlZjxEb2N1bWVudD4gZG9j dW1lbnQgPSBhZG9wdFJlZigqbmV3IERvY3VtZW50KG51bGxwdHIsIFVSTCgpKSk7Ci0gICAgZG9j dW1lbnQtPnNldFNlY3VyaXR5T3JpZ2luKGNvbnRleHQuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAg ZG9jdW1lbnQtPnNldFNlY3VyaXR5T3JpZ2luUG9saWN5KGNvbnRleHQuc2VjdXJpdHlPcmlnaW5Q b2xpY3koKSk7CisKICAgICByZXR1cm4gZG9jdW1lbnQ7CiB9CiAKQEAgLTIyMzQsNyArMjIzNiw3 IEBAIHZvaWQgRG9jdW1lbnQ6Om9wZW4oRG9jdW1lbnQqIG93bmVyRG9jdW1lbnQpCiAgICAgaWYg KG93bmVyRG9jdW1lbnQpIHsKICAgICAgICAgc2V0VVJMKG93bmVyRG9jdW1lbnQtPnVybCgpKTsK ICAgICAgICAgc2V0Q29va2llVVJMKG93bmVyRG9jdW1lbnQtPmNvb2tpZVVSTCgpKTsKLSAgICAg ICAgc2V0U2VjdXJpdHlPcmlnaW4ob3duZXJEb2N1bWVudC0+c2VjdXJpdHlPcmlnaW4oKSk7Cisg ICAgICAgIHNldFNlY3VyaXR5T3JpZ2luUG9saWN5KG93bmVyRG9jdW1lbnQtPnNlY3VyaXR5T3Jp Z2luUG9saWN5KCkpOwogICAgIH0KIAogICAgIGlmIChtX2ZyYW1lKSB7CkBAIC0zMTg5LDcgKzMx OTEsNyBAQCB2b2lkIERvY3VtZW50OjpjbG9uZURhdGFGcm9tRG9jdW1lbnQoY29uc3QgRG9jdW1l bnQmIG90aGVyKQogICAgIG1fZG9jdW1lbnRVUkkgPSBvdGhlci5kb2N1bWVudFVSSSgpOwogCiAg ICAgc2V0Q29tcGF0aWJpbGl0eU1vZGUob3RoZXIubV9jb21wYXRpYmlsaXR5TW9kZSk7Ci0gICAg c2V0U2VjdXJpdHlPcmlnaW4ob3RoZXIuc2VjdXJpdHlPcmlnaW4oKSk7CisgICAgc2V0U2VjdXJp dHlPcmlnaW5Qb2xpY3kob3RoZXIuc2VjdXJpdHlPcmlnaW5Qb2xpY3koKSk7CiAgICAgb3ZlcnJp ZGVNSU1FVHlwZShvdGhlci5jb250ZW50VHlwZSgpKTsKICAgICBzZXREZWNvZGVyKG90aGVyLmRl Y29kZXIoKSk7CiB9CkBAIC00NzE3LDcgKzQ3MTksNyBAQCB2b2lkIERvY3VtZW50Ojppbml0U2Vj dXJpdHlDb250ZXh0KCkKICAgICAgICAgLy8gTm8gc291cmNlIGZvciBhIHNlY3VyaXR5IGNvbnRl eHQuCiAgICAgICAgIC8vIFRoaXMgY2FuIG9jY3VyIHZpYSBkb2N1bWVudC5pbXBsZW1lbnRhdGlv bi5jcmVhdGVEb2N1bWVudCgpLgogICAgICAgICBzZXRDb29raWVVUkwoVVJMKFBhcnNlZFVSTFN0 cmluZywgZW1wdHlTdHJpbmcoKSkpOwotICAgICAgICBzZXRTZWN1cml0eU9yaWdpbihTZWN1cml0 eU9yaWdpbjo6Y3JlYXRlVW5pcXVlKCkpOworICAgICAgICBzZXRTZWN1cml0eU9yaWdpblBvbGlj eShTZWN1cml0eU9yaWdpblBvbGljeTo6Y3JlYXRlKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVVbmlx dWUoKSkpOwogICAgICAgICBzZXRDb250ZW50U2VjdXJpdHlQb2xpY3koc3RkOjptYWtlX3VuaXF1 ZTxDb250ZW50U2VjdXJpdHlQb2xpY3k+KHRoaXMpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K QEAgLTQ3MzcsNyArNDczOSw3IEBAIHZvaWQgRG9jdW1lbnQ6OmluaXRTZWN1cml0eUNvbnRleHQo KQogICAgICAgICBlbmZvcmNlU2FuZGJveEZsYWdzKFNhbmRib3hPcmlnaW4pOwogI2VuZGlmCiAK LSAgICBzZXRTZWN1cml0eU9yaWdpbihpc1NhbmRib3hlZChTYW5kYm94T3JpZ2luKSA/IFNlY3Vy aXR5T3JpZ2luOjpjcmVhdGVVbmlxdWUoKSA6IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUobV91cmwp KTsKKyAgICBzZXRTZWN1cml0eU9yaWdpblBvbGljeShTZWN1cml0eU9yaWdpblBvbGljeTo6Y3Jl YXRlKGlzU2FuZGJveGVkKFNhbmRib3hPcmlnaW4pID8gU2VjdXJpdHlPcmlnaW46OmNyZWF0ZVVu aXF1ZSgpIDogU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShtX3VybCkpKTsKICAgICBzZXRDb250ZW50 U2VjdXJpdHlQb2xpY3koc3RkOjptYWtlX3VuaXF1ZTxDb250ZW50U2VjdXJpdHlQb2xpY3k+KHRo aXMpKTsKIAogICAgIGlmIChTZXR0aW5ncyogc2V0dGluZ3MgPSB0aGlzLT5zZXR0aW5ncygpKSB7 CkBAIC00NzkzLDcgKzQ3OTUsNyBAQCB2b2lkIERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0 KCkKICAgICBzZXRDb29raWVVUkwob3duZXJGcmFtZS0+ZG9jdW1lbnQoKS0+Y29va2llVVJMKCkp OwogICAgIC8vIFdlIGFsaWFzIHRoZSBTZWN1cml0eU9yaWdpbnMgdG8gbWF0Y2ggRmlyZWZveCwg c2VlIEJ1ZyAxNTMxMwogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNTMxMwotICAgIHNldFNlY3VyaXR5T3JpZ2luKG93bmVyRnJhbWUtPmRvY3VtZW50KCkt PnNlY3VyaXR5T3JpZ2luKCkpOworICAgIHNldFNlY3VyaXR5T3JpZ2luUG9saWN5KG93bmVyRnJh bWUtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luUG9saWN5KCkpOwogfQogCiB2b2lkIERvY3Vt ZW50Ojppbml0Q29udGVudFNlY3VyaXR5UG9saWN5KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vU2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5oCmluZGV4IGI3YmFiZjI5ZGQxYjYxOGNiNzVkOGY2ZjJjNTMx MzEyOTAwNDA0YzMuLjJiNDNjYTc4OGQ2YWI1MjM2MzE5ZDE1ZWEzNTg2NTc0Y2RjMTViZWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TY3JpcHRFeGVjdXRpb25Db250ZXh0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL1NjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaApAQCAtNTQsNiAr NTQsNyBAQCBjbGFzcyBFdmVudFF1ZXVlOwogY2xhc3MgRXZlbnRUYXJnZXQ7CiBjbGFzcyBNZXNz YWdlUG9ydDsKIGNsYXNzIFB1YmxpY1VSTE1hbmFnZXI7CitjbGFzcyBTZWN1cml0eU9yaWdpbjsK IGNsYXNzIFVSTDsKIAogY2xhc3MgU2NyaXB0RXhlY3V0aW9uQ29udGV4dCA6IHB1YmxpYyBTZWN1 cml0eUNvbnRleHQsIHB1YmxpYyBTdXBwbGVtZW50YWJsZTxTY3JpcHRFeGVjdXRpb25Db250ZXh0 PiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VjdXJpdHlDb250ZXh0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuY3BwCmluZGV4IDlmMzk0ZTY5ZTc4 NmM4YWY5ZmYyYjU5NzMzMTYxN2UwMmIzNzc1MzUuLjQzM2E2ZWJkNjM4NjI3YWI2OGRkMDkxNmJk YTg0YThjNjg2ZDU2MWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuY3BwCkBA IC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5LmgiCiAjaW5j bHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCisj aW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJp bmdCdWlsZGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTQ0LDEyICs0NSwyMCBAQCBT ZWN1cml0eUNvbnRleHQ6On5TZWN1cml0eUNvbnRleHQoKQogewogfQogCi12b2lkIFNlY3VyaXR5 Q29udGV4dDo6c2V0U2VjdXJpdHlPcmlnaW4oUGFzc1JlZlB0cjxTZWN1cml0eU9yaWdpbj4gc2Vj dXJpdHlPcmlnaW4pCit2b2lkIFNlY3VyaXR5Q29udGV4dDo6c2V0U2VjdXJpdHlPcmlnaW5Qb2xp Y3koUmVmUHRyPFNlY3VyaXR5T3JpZ2luUG9saWN5PiYmIHNlY3VyaXR5T3JpZ2luUG9saWN5KQog ewotICAgIG1fc2VjdXJpdHlPcmlnaW4gPSBzZWN1cml0eU9yaWdpbjsKKyAgICBtX3NlY3VyaXR5 T3JpZ2luUG9saWN5ID0gV1RGOjptb3ZlKHNlY3VyaXR5T3JpZ2luUG9saWN5KTsKICAgICBtX2hh dmVJbml0aWFsaXplZFNlY3VyaXR5T3JpZ2luID0gdHJ1ZTsKIH0KIAorU2VjdXJpdHlPcmlnaW4q IFNlY3VyaXR5Q29udGV4dDo6c2VjdXJpdHlPcmlnaW4oKSBjb25zdAoreworICAgIGlmICghbV9z ZWN1cml0eU9yaWdpblBvbGljeSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICByZXR1 cm4gJm1fc2VjdXJpdHlPcmlnaW5Qb2xpY3ktPm9yaWdpbigpOworfQorCiB2b2lkIFNlY3VyaXR5 Q29udGV4dDo6c2V0Q29udGVudFNlY3VyaXR5UG9saWN5KHN0ZDo6dW5pcXVlX3B0cjxDb250ZW50 U2VjdXJpdHlQb2xpY3k+IGNvbnRlbnRTZWN1cml0eVBvbGljeSkKIHsKICAgICBtX2NvbnRlbnRT ZWN1cml0eVBvbGljeSA9IFdURjo6bW92ZShjb250ZW50U2VjdXJpdHlQb2xpY3kpOwpAQCAtNjMs OCArNzIsNyBAQCBib29sIFNlY3VyaXR5Q29udGV4dDo6aXNTZWN1cmVUcmFuc2l0aW9uVG8oY29u c3QgVVJMJiB1cmwpIGNvbnN0CiAgICAgaWYgKCFoYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdp bigpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4g b3RoZXIgPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCk7Ci0gICAgcmV0dXJuIHNlY3VyaXR5 T3JpZ2luKCktPmNhbkFjY2VzcyhvdGhlci5nZXQoKSk7CisgICAgcmV0dXJuIHNlY3VyaXR5T3Jp Z2luUG9saWN5KCktPm9yaWdpbigpLmNhbkFjY2VzcyhTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVy bCkucHRyKCkpOwogfQogCiB2b2lkIFNlY3VyaXR5Q29udGV4dDo6ZW5mb3JjZVNhbmRib3hGbGFn cyhTYW5kYm94RmxhZ3MgbWFzaykKQEAgLTcyLDggKzgwLDggQEAgdm9pZCBTZWN1cml0eUNvbnRl eHQ6OmVuZm9yY2VTYW5kYm94RmxhZ3MoU2FuZGJveEZsYWdzIG1hc2spCiAgICAgbV9zYW5kYm94 RmxhZ3MgfD0gbWFzazsKIAogICAgIC8vIFRoZSBTYW5kYm94T3JpZ2luIGlzIHN0b3JlZCByZWR1 bmRhbnRseSBpbiB0aGUgc2VjdXJpdHkgb3JpZ2luLgotICAgIGlmIChpc1NhbmRib3hlZChTYW5k Ym94T3JpZ2luKSAmJiBzZWN1cml0eU9yaWdpbigpICYmICFzZWN1cml0eU9yaWdpbigpLT5pc1Vu aXF1ZSgpKQotICAgICAgICBzZXRTZWN1cml0eU9yaWdpbihTZWN1cml0eU9yaWdpbjo6Y3JlYXRl VW5pcXVlKCkpOworICAgIGlmIChpc1NhbmRib3hlZChTYW5kYm94T3JpZ2luKSAmJiBzZWN1cml0 eU9yaWdpblBvbGljeSgpICYmICFzZWN1cml0eU9yaWdpblBvbGljeSgpLT5vcmlnaW4oKS5pc1Vu aXF1ZSgpKQorICAgICAgICBzZXRTZWN1cml0eU9yaWdpblBvbGljeShTZWN1cml0eU9yaWdpblBv bGljeTo6Y3JlYXRlKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVVbmlxdWUoKSkpOwogfQogCiBTYW5k Ym94RmxhZ3MgU2VjdXJpdHlDb250ZXh0OjpwYXJzZVNhbmRib3hQb2xpY3koY29uc3QgU3RyaW5n JiBwb2xpY3ksIFN0cmluZyYgaW52YWxpZFRva2Vuc0Vycm9yTWVzc2FnZSkKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9TZWN1cml0eUNvbnRleHQuaAppbmRleCA3Y2NhYjE3ZTdiNWQ4Mzg1OTg3OGYyNTQ1NjJlOTRh NWEwODE1Y2NmLi42MGRkOTY4YmIwZTI0MDBjY2MxZmVkNzgzNWVhZGI3ODg5YTEzZWZlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VjdXJpdHlDb250ZXh0LmgKKysrIGIvU291cmNl L1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5oCkBAIC0zNSw2ICszNSw3IEBACiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKIGNsYXNzIFNlY3VyaXR5T3JpZ2luOworY2xhc3MgU2VjdXJpdHlPcmln aW5Qb2xpY3k7CiBjbGFzcyBDb250ZW50U2VjdXJpdHlQb2xpY3k7CiBjbGFzcyBVUkw7CiAKQEAg LTU3LDcgKzU4LDYgQEAgdHlwZWRlZiBpbnQgU2FuZGJveEZsYWdzOwogCiBjbGFzcyBTZWN1cml0 eUNvbnRleHQgewogcHVibGljOgotICAgIFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdpbigp IGNvbnN0IHsgcmV0dXJuIG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCk7IH0KICAgICBTYW5kYm94Rmxh Z3Mgc2FuZGJveEZsYWdzKCkgY29uc3QgeyByZXR1cm4gbV9zYW5kYm94RmxhZ3M7IH0KICAgICBD b250ZW50U2VjdXJpdHlQb2xpY3kqIGNvbnRlbnRTZWN1cml0eVBvbGljeSgpIHsgcmV0dXJuIG1f Y29udGVudFNlY3VyaXR5UG9saWN5LmdldCgpOyB9CiAKQEAgLTY2LDEwICs2NiwxNCBAQCBwdWJs aWM6CiAgICAgdm9pZCBlbmZvcmNlU2FuZGJveEZsYWdzKFNhbmRib3hGbGFncyBtYXNrKTsKICAg ICBib29sIGlzU2FuZGJveGVkKFNhbmRib3hGbGFncyBtYXNrKSBjb25zdCB7IHJldHVybiBtX3Nh bmRib3hGbGFncyAmIG1hc2s7IH0KIAorICAgIFNlY3VyaXR5T3JpZ2luUG9saWN5KiBzZWN1cml0 eU9yaWdpblBvbGljeSgpIGNvbnN0IHsgcmV0dXJuIG1fc2VjdXJpdHlPcmlnaW5Qb2xpY3kuZ2V0 KCk7IH0KKwogICAgIC8vIEV4cGxpY2l0bHkgb3ZlcnJpZGUgdGhlIHNlY3VyaXR5IG9yaWdpbiBm b3IgdGhpcyBzZWN1cml0eSBjb250ZXh0LgogICAgIC8vIE5vdGU6IEl0IGlzIGRhbmdlcm91cyB0 byBjaGFuZ2UgdGhlIHNlY3VyaXR5IG9yaWdpbiBvZiBhIHNjcmlwdCBjb250ZXh0CiAgICAgLy8g ICAgICAgdGhhdCBhbHJlYWR5IGNvbnRhaW5zIGNvbnRlbnQuCi0gICAgdm9pZCBzZXRTZWN1cml0 eU9yaWdpbihQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPik7CisgICAgdm9pZCBzZXRTZWN1cml0 eU9yaWdpblBvbGljeShSZWZQdHI8U2VjdXJpdHlPcmlnaW5Qb2xpY3k+JiYpOworCisgICAgU2Vj dXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKCkgY29uc3Q7CiAKICAgICBzdGF0aWMgU2FuZGJv eEZsYWdzIHBhcnNlU2FuZGJveFBvbGljeShjb25zdCBTdHJpbmcmIHBvbGljeSwgU3RyaW5nJiBp bnZhbGlkVG9rZW5zRXJyb3JNZXNzYWdlKTsKIApAQCAtODUsNyArODksNyBAQCBwcm90ZWN0ZWQ6 CiBwcml2YXRlOgogICAgIGJvb2wgbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbjsKICAg ICBTYW5kYm94RmxhZ3MgbV9zYW5kYm94RmxhZ3M7Ci0gICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiBtX3NlY3VyaXR5T3JpZ2luOworICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpblBvbGljeT4gbV9z ZWN1cml0eU9yaWdpblBvbGljeTsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8Q29udGVudFNlY3VyaXR5 UG9saWN5PiBtX2NvbnRlbnRTZWN1cml0eVBvbGljeTsKIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9TZWN1cml0eU9yaWdpblBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vU2VjdXJpdHlPcmlnaW5Qb2xpY3kuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmM1Y2Y4NDk4M2Y1NTkwODBj OThjN2IzYjIwYjhlMzBkNGU4Njk3ODkKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vU2VjdXJpdHlPcmlnaW5Qb2xpY3kuY3BwCkBAIC0wLDAgKzEsNDcgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgor ICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkK KyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAq LworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3ku aCIKKworI2luY2x1ZGUgPFdlYkNvcmUvU2VjdXJpdHlPcmlnaW4uaD4KKworbmFtZXNwYWNlIFdl YkNvcmUgeworCitSZWY8U2VjdXJpdHlPcmlnaW5Qb2xpY3k+IFNlY3VyaXR5T3JpZ2luUG9saWN5 OjpjcmVhdGUoUmVmPFNlY3VyaXR5T3JpZ2luPiYmIHNlY3VyaXR5T3JpZ2luKQoreworICAgIHJl dHVybiBhZG9wdFJlZigqbmV3IFNlY3VyaXR5T3JpZ2luUG9saWN5KFdURjo6bW92ZShzZWN1cml0 eU9yaWdpbikpKTsKK30KKworU2VjdXJpdHlPcmlnaW5Qb2xpY3k6OlNlY3VyaXR5T3JpZ2luUG9s aWN5KFJlZjxTZWN1cml0eU9yaWdpbj4mJiBzZWN1cml0eU9yaWdpbikKKyAgICA6IG1fc2VjdXJp dHlPcmlnaW4oV1RGOjptb3ZlKHNlY3VyaXR5T3JpZ2luKSkKK3sKK30KKworU2VjdXJpdHlPcmln aW5Qb2xpY3k6On5TZWN1cml0eU9yaWdpblBvbGljeSgpCit7Cit9CisKK30KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eU9yaWdpblBvbGljeS5oIGIvU291cmNlL1dlYkNv cmUvZG9tL1NlY3VyaXR5T3JpZ2luUG9saWN5LmgKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZmNiODQ1YThjNDJiYTlh ZjdkNDM2YzAyYzE0NzhmMGU0NGNjZDE3YgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9TZWN1cml0eU9yaWdpblBvbGljeS5oCkBAIC0wLDAgKzEsNTIgQEAKKy8qCisgKiBD b3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgor ICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkK KyAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAq LworCisjaWZuZGVmIFNlY3VyaXR5T3JpZ2luUG9saWN5X2gKKyNkZWZpbmUgU2VjdXJpdHlPcmln aW5Qb2xpY3lfaAorCisjaW5jbHVkZSA8d3RmL1JlZi5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3Vu dGVkLmg+CisKK25hbWVzcGFjZSBXZWJDb3JlIHsKKworY2xhc3MgU2VjdXJpdHlPcmlnaW47CisK K2NsYXNzIFNlY3VyaXR5T3JpZ2luUG9saWN5IDogcHVibGljIFJlZkNvdW50ZWQ8U2VjdXJpdHlP cmlnaW5Qb2xpY3k+IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgUmVmPFNlY3VyaXR5T3JpZ2luUG9s aWN5PiBjcmVhdGUoUmVmPFNlY3VyaXR5T3JpZ2luPiYmKTsKKyAgICB+U2VjdXJpdHlPcmlnaW5Q b2xpY3koKTsKKworICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCByZXR1cm4gYSBjb25zdCByZWZl cmVuY2UuCisgICAgU2VjdXJpdHlPcmlnaW4mIG9yaWdpbigpIHsgcmV0dXJuIG1fc2VjdXJpdHlP cmlnaW47IH0KKworcHJpdmF0ZToKKyAgICBleHBsaWNpdCBTZWN1cml0eU9yaWdpblBvbGljeShS ZWY8U2VjdXJpdHlPcmlnaW4+JiYpOworCisgICAgUmVmPFNlY3VyaXR5T3JpZ2luPiBtX3NlY3Vy aXR5T3JpZ2luOworfTsKKworfQorCisjZW5kaWYgLy8gU2VjdXJpdHlPcmlnaW5Qb2xpY3lfaApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50V3JpdGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFdyaXRlci5jcHAKaW5kZXggMTViMmU2OGEzNGY3 OGViMmJiM2NkNzg3Mjg3OTIyNmI5YTNkYzA1NC4uY2M1MTM5M2MxMGY2MzZiZDc2ZWQxMDk4YjNl YmNjMzZjNDIyYzExMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 V3JpdGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRXcml0ZXIuY3Bw CkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiU2NyaXB0Q29udHJvbGxlci5oIgogI2luY2x1 ZGUgIlNjcmlwdGFibGVEb2N1bWVudFBhcnNlci5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2lu LmgiCisjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCIKICNpbmNsdWRlICJTZWdtZW50 ZWRTdHJpbmcuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlNpbmtEb2N1bWVu dC5oIgpAQCAtMTUwLDcgKzE1MSw3IEBAIHZvaWQgRG9jdW1lbnRXcml0ZXI6OmJlZ2luKGNvbnN0 IFVSTCYgdXJsUmVmZXJlbmNlLCBib29sIGRpc3BhdGNoLCBEb2N1bWVudCogb3duCiAgICAgICAg IGRvY3VtZW50LT5zZXREZWNvZGVyKG1fZGVjb2Rlci5nZXQoKSk7CiAgICAgaWYgKG93bmVyRG9j dW1lbnQpIHsKICAgICAgICAgZG9jdW1lbnQtPnNldENvb2tpZVVSTChvd25lckRvY3VtZW50LT5j b29raWVVUkwoKSk7Ci0gICAgICAgIGRvY3VtZW50LT5zZXRTZWN1cml0eU9yaWdpbihvd25lckRv Y3VtZW50LT5zZWN1cml0eU9yaWdpbigpKTsKKyAgICAgICAgZG9jdW1lbnQtPnNldFNlY3VyaXR5 T3JpZ2luUG9saWN5KG93bmVyRG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luUG9saWN5KCkpOwogICAg IH0KIAogICAgIG1fZnJhbWUtPmxvYWRlcigpLmRpZEJlZ2luRG9jdW1lbnQoZGlzcGF0Y2gpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJHbG9iYWxTY29wZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckdsb2JhbFNjb3BlLmNwcAppbmRleCBhNTk5 ZTZmZjgzYjAwNzQ4MTQ3NWU5ZDA5OTI2ZjE3MGE1MTEzMTAyLi4wYmQxOWZjMDkwM2UzOWZkYzQx ODQwNWViZmQyOWVmOTNhMDkwM2JlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJz L1dvcmtlckdsb2JhbFNjb3BlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtl ckdsb2JhbFNjb3BlLmNwcApAQCAtNDIsNiArNDIsNyBAQAogI2luY2x1ZGUgIlNjaGVkdWxlZEFj dGlvbi5oIgogI2luY2x1ZGUgIlNjcmlwdFNvdXJjZUNvZGUuaCIKICNpbmNsdWRlICJTZWN1cml0 eU9yaWdpbi5oIgorI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luUG9saWN5LmgiCiAjaW5jbHVkZSAi VVJMLmgiCiAjaW5jbHVkZSAiV29ya2VySW5zcGVjdG9yQ29udHJvbGxlci5oIgogI2luY2x1ZGUg IldvcmtlckxvY2F0aW9uLmgiCkBAIC03Niw3ICs3Nyw3IEBAIFdvcmtlckdsb2JhbFNjb3BlOjpX b3JrZXJHbG9iYWxTY29wZShjb25zdCBVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQs IHN0CiAgICAgLCBtX2V2ZW50UXVldWUoKnRoaXMpCiAgICAgLCBtX3RvcE9yaWdpbih0b3BPcmln aW4pCiB7Ci0gICAgc2V0U2VjdXJpdHlPcmlnaW4oU2VjdXJpdHlPcmlnaW46OmNyZWF0ZSh1cmwp KTsKKyAgICBzZXRTZWN1cml0eU9yaWdpblBvbGljeShTZWN1cml0eU9yaWdpblBvbGljeTo6Y3Jl YXRlKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUodXJsKSkpOwogfQogCiBXb3JrZXJHbG9iYWxTY29w ZTo6fldvcmtlckdsb2JhbFNjb3BlKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9Y TUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3Bw CmluZGV4IDUzOTQ3YzIzMGQ0YTRhN2UyNzFmZTU5NzRkZDZiNmZhMzVjNWY5NGMuLjY1ZjNjNzI2 NmYxMWQyYmQ2MDE2NjJkNDc1MzUxNzlhMmEwZmRlZGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0 dHBSZXF1ZXN0LmNwcApAQCAtNDMsNiArNDMsNyBAQAogI2luY2x1ZGUgIlJlc291cmNlRXJyb3Iu aCIKICNpbmNsdWRlICJSZXNvdXJjZVJlcXVlc3QuaCIKICNpbmNsdWRlICJTY3JpcHRDb250cm9s bGVyLmgiCisjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCIKICNpbmNsdWRlICJTZXR0 aW5ncy5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogI2luY2x1ZGUgIlRleHRSZXNvdXJj ZURlY29kZXIuaCIKQEAgLTIyMiw3ICsyMjMsNyBAQCBEb2N1bWVudCogWE1MSHR0cFJlcXVlc3Q6 OnJlc3BvbnNlWE1MKEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgICAgICAgICAgICAgIG1fcmVzcG9u c2VEb2N1bWVudCA9IERvY3VtZW50OjpjcmVhdGUoMCwgbV91cmwpOwogICAgICAgICAgICAgLy8g RklYTUU6IFNldCBMYXN0LU1vZGlmaWVkLgogICAgICAgICAgICAgbV9yZXNwb25zZURvY3VtZW50 LT5zZXRDb250ZW50KG1fcmVzcG9uc2VCdWlsZGVyLnRvU3RyaW5nUHJlc2VydmVDYXBhY2l0eSgp KTsKLSAgICAgICAgICAgIG1fcmVzcG9uc2VEb2N1bWVudC0+c2V0U2VjdXJpdHlPcmlnaW4oc2Vj dXJpdHlPcmlnaW4oKSk7CisgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQtPnNldFNlY3Vy aXR5T3JpZ2luUG9saWN5KHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+c2VjdXJpdHlPcmlnaW5Q b2xpY3koKSk7CiAgICAgICAgICAgICBtX3Jlc3BvbnNlRG9jdW1lbnQtPm92ZXJyaWRlTUlNRVR5 cGUobWltZVR5cGUpOwogCiAgICAgICAgICAgICBpZiAoIW1fcmVzcG9uc2VEb2N1bWVudC0+d2Vs bEZvcm1lZCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUveG1sL1hNTFRyZWVWaWV3ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTFRyZWVWaWV3ZXIuY3BwCmluZGV4IGUyMzMzOTJl NGIxZjE4YjI1ZmYwZDA1MDU3ODk3OTg2MjMxZGIwODQuLjQwOTZlNDM1ZDYzZjU3MDg0NDgwMmMy MTc3MDhhZGQ5ZWI2MDUxNzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxUcmVl Vmlld2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MVHJlZVZpZXdlci5jcHAKQEAg LTM5LDYgKzM5LDcgQEAKICNpbmNsdWRlICJTY3JpcHRDb250cm9sbGVyLmgiCiAjaW5jbHVkZSAi U2NyaXB0U291cmNlQ29kZS5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCisjaW5jbHVk ZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCIKICNpbmNsdWRlICJUZXh0LmgiCiAjaW5jbHVkZSAi WE1MVmlld2VyQ1NTLmgiCiAjaW5jbHVkZSAiWE1MVmlld2VySlMuaCIKQEAgLTUzLDcgKzU0LDcg QEAgWE1MVHJlZVZpZXdlcjo6WE1MVHJlZVZpZXdlcihEb2N1bWVudCYgZG9jdW1lbnQpCiAKIHZv aWQgWE1MVHJlZVZpZXdlcjo6dHJhbnNmb3JtRG9jdW1lbnRUb1RyZWVWaWV3KCkKIHsKLSAgICBt X2RvY3VtZW50LnNldFNlY3VyaXR5T3JpZ2luKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVVbmlxdWUo KSk7CisgICAgbV9kb2N1bWVudC5zZXRTZWN1cml0eU9yaWdpblBvbGljeShTZWN1cml0eU9yaWdp blBvbGljeTo6Y3JlYXRlKFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVVbmlxdWUoKSkpOwogCiAgICAg U3RyaW5nIHNjcmlwdFN0cmluZyA9IFN0cmluZ0ltcGw6OmNyZWF0ZVdpdGhvdXRDb3B5aW5nKFhN TFZpZXdlcl9qcywgc2l6ZW9mKFhNTFZpZXdlcl9qcykpOwogICAgIG1fZG9jdW1lbnQuZnJhbWUo KS0+c2NyaXB0KCkuZXZhbHVhdGUoU2NyaXB0U291cmNlQ29kZShzY3JpcHRTdHJpbmcpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YU0xUUHJvY2Vzc29yLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3htbC9YU0xUUHJvY2Vzc29yLmNwcAppbmRleCA0NmEyOWIyMDI3NzQ0NWY0MTMyODY4 MmNhYTFjMWNkODU4MjFhZjE4Li4wNjljY2VjYjdiZjJjOTQwMDZkZTk0ODVkMTYzMjg0ZTg0MDc5 MWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFNMVFByb2Nlc3Nvci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUveG1sL1hTTFRQcm9jZXNzb3IuY3BwCkBAIC0zNyw2ICszNyw3IEBA CiAjaW5jbHVkZSAiSFRNTERvY3VtZW50LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUg IlNlY3VyaXR5T3JpZ2luLmgiCisjaW5jbHVkZSAiU2VjdXJpdHlPcmlnaW5Qb2xpY3kuaCIKICNp bmNsdWRlICJUZXh0LmgiCiAjaW5jbHVkZSAiVGV4dFJlc291cmNlRGVjb2Rlci5oIgogI2luY2x1 ZGUgIm1hcmt1cC5oIgpAQCAtOTAsNyArOTEsNyBAQCBQYXNzUmVmUHRyPERvY3VtZW50PiBYU0xU UHJvY2Vzc29yOjpjcmVhdGVEb2N1bWVudEZyb21Tb3VyY2UoY29uc3QgU3RyaW5nJiBzb3VyYwog ICAgICAgICBpZiAoRG9jdW1lbnQqIG9sZERvY3VtZW50ID0gZnJhbWUtPmRvY3VtZW50KCkpIHsK ICAgICAgICAgICAgIHJlc3VsdC0+c2V0VHJhbnNmb3JtU291cmNlRG9jdW1lbnQob2xkRG9jdW1l bnQpOwogICAgICAgICAgICAgcmVzdWx0LT50YWtlRE9NV2luZG93RnJvbShvbGREb2N1bWVudCk7 Ci0gICAgICAgICAgICByZXN1bHQtPnNldFNlY3VyaXR5T3JpZ2luKG9sZERvY3VtZW50LT5zZWN1 cml0eU9yaWdpbigpKTsKKyAgICAgICAgICAgIHJlc3VsdC0+c2V0U2VjdXJpdHlPcmlnaW5Qb2xp Y3kob2xkRG9jdW1lbnQtPnNlY3VyaXR5T3JpZ2luUG9saWN5KCkpOwogICAgICAgICAgICAgcmVz dWx0LT5zZXRDb29raWVVUkwob2xkRG9jdW1lbnQtPmNvb2tpZVVSTCgpKTsKICAgICAgICAgICAg IHJlc3VsdC0+c2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMob2xkRG9jdW1lbnQtPmZpcnN0UGFydHlG b3JDb29raWVzKCkpOwogICAgICAgICAgICAgcmVzdWx0LT5jb250ZW50U2VjdXJpdHlQb2xpY3ko KS0+Y29weVN0YXRlRnJvbShvbGREb2N1bWVudC0+Y29udGVudFNlY3VyaXR5UG9saWN5KCkpOwo=