148566 2015-08-28 00:56:15 -0700 [Mac] Right-clicking on GIFs spins the UI process for a while 2015-08-28 10:35:43 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca bdakin beidson oldest_to_newest 1121626 0 thorton 2015-08-28 00:56:15 -0700 [Mac] Right-clicking on GIFs spins the UI process for a while 1121627 1 260134 thorton 2015-08-28 00:56:39 -0700 Created attachment 260134 Patch 1121639 2 260140 thorton 2015-08-28 01:52:12 -0700 Created attachment 260140 Patch 1121642 3 260142 thorton 2015-08-28 01:55:45 -0700 Created attachment 260142 Patch 1121649 4 260143 thorton 2015-08-28 02:07:03 -0700 Created attachment 260143 Patch 1121651 5 260144 thorton 2015-08-28 02:11:45 -0700 Created attachment 260144 Patch 1121735 6 thorton 2015-08-28 10:35:43 -0700 http://trac.webkit.org/changeset/189102 260134 2015-08-28 00:56:39 -0700 2015-08-28 01:52:09 -0700 Patch bug-148566-20150828005626.patch text/plain 11817 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZhZWJkNzQwYzc1NmFk ZWM4YzJhM2MxYjFjNjE4ZGFhMzgzNDI0NS4uNTQ5YzIxMDc1NjUyM2VkMGM4OGE2MmYwMjJiNmE1 OTQzMWRiNTJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBS aWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBwcm9jZXNzIGZvciBhIHdoaWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmg6Cisg ICAgICAgIFByb3Blcmx5IG1hcmsgdGhpcyBhcyBNYWMtb25seS4gSXQncyBvbmx5IGltcGxlbWVu dGVkIGluIENvbnRleHRNZW51SXRlbU1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9Db250 ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0pOgorICAgICAgICBUYWtlIGEgTlNJbWFnZSBkaXJlY3RseSwgc28gd2UgZG9u J3QgaGF2ZSB0byByb3VuZC10cmlwIHRocm91Z2ggQml0bWFwSW1hZ2UsCisgICAgICAgIHdoaWNo IGNhbiBiZSBsb3NzeSBhbmQgZXhwZW5zaXZlLgorCiAyMDE1LTA4LTI3ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTg5MDc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQ2NWEyYTk5MGNlZTRjOWI1NjY4Yzc0 MzY1YjA0MmVmY2E4NTRkMTUuLjFjYmE0ZTlhYmRiMTA3M2I1MzMyNTg0OTlkMTYxOWQ2YjUyNTk0 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wOC0yOCAgVGltb3Ro eSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmln aHQtY2xpY2tpbmcgb24gR0lGcyBzcGlucyB0aGUgVUkgcHJvY2VzcyBmb3IgYSB3aGlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yMjQ2MDg1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50Lm1tOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0pOgor ICAgICAgICBNYWtlIGFuIE5TSW1hZ2UgZGlyZWN0bHkgZnJvbSB0aGUgaGl0IGltYWdlIGlmIHBv c3NpYmxlLgorCiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IExvb2t1cCBpbnZvY2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGQxZDZjZWQwNjM4ZjQ1MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uNTE1MzE4MGYx NWJhMDVjY2U1MTgzNzFkYmIwYWI3NGMzYjczMWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbTWFjXSBSaWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBw cm9jZXNzIGZvciBhIHdoaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDg1NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKToKKyAgICAgICAgTW92ZSBhbGwgb2YgdGhlIGNvZGUgdG8gbWFrZSBhIFNoYXJlIG1lbnVp dGVtIGludG8gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbS4KKyAgICAgICAgTWFrZSBh biBOU0ltYWdlIGRpcmVjdGx5IGZyb20gdGhlIGltYWdlIGRhdGEgaWYgcG9zc2libGUuCisKIDIw MTUtMDgtMjcgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZGVvIGZ1bGwtc2NyZWVuIHNob3VsZG4ndCB1c2UgdGhlIER5bmFtaWNTaXplV2l0 aE1pbmltdW1WaWV3U2l6ZSBsYXlvdXQgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaAppbmRleCAyMWZlMjdhOWU5YWNiY2M2NjQxODAwNmUyYTMyM2NjZGE2Mjg0 Zjk3Li4wZjRjNjVmZTExN2MwMDgyNjgzNTFjMWMyMGQ5MTY3YzA2ZTZmNDA5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApAQCAtMzQsNiArMzQsNyBAQAogCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorT0JKQ19DTEFT UyBOU0ltYWdlOwogT0JKQ19DTEFTUyBOU01lbnVJdGVtOwogI2VsaWYgUExBVEZPUk0oR1RLKQog dHlwZWRlZiBzdHJ1Y3QgX0d0a01lbnVJdGVtIEd0a01lbnVJdGVtOwpAQCAtMjA3LDcgKzIwOCw5 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHNldFN1Yk1lbnUoQ29udGV4 dE1lbnUqKTsKIAotICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgQ29udGV4dE1lbnVJdGVt IHNoYXJlTWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93 bmxvYWRhYmxlTWVkaWFVUkwsIEltYWdlKiwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpOwor I2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIENvbnRleHRN ZW51SXRlbSBzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1dGVMaW5rVVJMLCBjb25zdCBV UkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBOU0ltYWdlICosIGNvbnN0IFN0cmluZyYgc2VsZWN0 ZWRUZXh0KTsKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQogICAgICAgICBHdGtBY3Rpb24q IGd0a0FjdGlvbigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0NvbnRleHRNZW51SXRlbU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9D b250ZXh0TWVudUl0ZW1NYWMubW0KaW5kZXggYTJiOGRhNjY3NTRjNjQxOGVmMTllZTkxMWZkNzZj NTU0Y2M4NGE5Mi4uY2Y2MWI2MjNmODJjMTRlNzllNzI2N2Y3YzE5ZGQ0ZTliNDFhMzNmMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRlbU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1t CkBAIC0xOTYsNyArMTk2LDcgQEAgYm9vbCBDb250ZXh0TWVudUl0ZW06OmNoZWNrZWQoKSBjb25z dAogICAgIHJldHVybiBbbV9wbGF0Zm9ybURlc2NyaXB0aW9uLmdldCgpIHN0YXRlXSA9PSBOU09u U3RhdGU7CiB9CiAKLUNvbnRleHRNZW51SXRlbSBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0 ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93bmxvYWRhYmxlTWVk aWFVUkwsIEltYWdlKiBpbWFnZSwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpCitDb250ZXh0 TWVudUl0ZW0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1 dGVMaW5rVVJMLCBjb25zdCBVUkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBOU0ltYWdlICppbWFn ZSwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpCiB7CiAgICAgaWYgKCFbW05TTWVudUl0ZW0g Y2xhc3NdIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc3RhbmRhcmRTaGFyZU1lbnVJdGVt V2l0aEl0ZW1zOildKQogICAgICAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKCk7CkBAIC0yMDks MTEgKzIwOSw4IEBAIENvbnRleHRNZW51SXRlbSBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0 ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0CiAgICAgaWYgKCFkb3dubG9hZGFi bGVNZWRpYVVSTC5pc0VtcHR5KCkpCiAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6KE5TVVJMICop ZG93bmxvYWRhYmxlTWVkaWFVUkxdOwogCi0gICAgaWYgKGltYWdlKSB7Ci0gICAgICAgIE5TSW1h Z2UgKm5zSW1hZ2UgPSBpbWFnZS0+Z2V0TlNJbWFnZSgpOwotICAgICAgICBpZiAobnNJbWFnZSkK LSAgICAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6bnNJbWFnZV07Ci0gICAgfQorICAgIGlmIChp bWFnZSkKKyAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDppbWFnZV07CiAKICAgICBpZiAoIXNlbGVj dGVkVGV4dC5pc0VtcHR5KCkpCiAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6KE5TU3RyaW5nICop c2VsZWN0ZWRUZXh0XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW0KaW5kZXggYmIxZTZkZDcxZTUyOTczZTc4YzQx Yjg1NTI3ZmNlMTU5NjNhZGFhNC4uMTI3ODAyMGI4NWM1OGIyZWIzYTg3OGMzYjAzYjMxZDNmZTlm ZDNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViQ29udGV4dE1lbnVDbGllbnQubW0KQEAgLTM4Nyw3ICszODcsMTMgQEAgQ29udGV4dE1lbnVJ dGVtIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzaGFyZU1lbnVJdGVtKGNvbnN0IEhpdFRlc3RSZXN1 bHQmIGhpdFRlc3QKICAgICBpZiAoIWhpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVSTCgpLmlz RW1wdHkoKSAmJiBoaXRUZXN0UmVzdWx0LmlzRG93bmxvYWRhYmxlTWVkaWEoKSkKICAgICAgICAg ZG93bmxvYWRhYmxlTWVkaWFVUkwgPSBoaXRUZXN0UmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKTsK IAotICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZUxpbmtVUkwoKSwgZG93bmxvYWRhYmxlTWVkaWFVUkwsIGhpdFRlc3RSZXN1bHQu aW1hZ2UoKSwgaGl0VGVzdFJlc3VsdC5zZWxlY3RlZFRleHQoKSk7CisgICAgUmV0YWluUHRyPE5T SW1hZ2U+IG5zSW1hZ2U7CisgICAgaWYgKEltYWdlKiBpbWFnZSA9IGhpdFRlc3RSZXN1bHQuaW1h Z2UoKSkgeworICAgICAgICBpZiAoUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gaW1hZ2Ut PmRhdGEoKSkKKyAgICAgICAgICAgIG5zSW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10g aW5pdFdpdGhEYXRhOltOU0RhdGEgZGF0YVdpdGhCeXRlczpidWZmZXItPmRhdGEoKSBsZW5ndGg6 YnVmZmVyLT5zaXplKCldXSk7CisgICAgfQorCisgICAgcmV0dXJuIENvbnRleHRNZW51SXRlbTo6 c2hhcmVNZW51SXRlbShoaXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBkb3dubG9hZGFi bGVNZWRpYVVSTCwgbnNJbWFnZS5nZXQoKSwgaGl0VGVzdFJlc3VsdC5zZWxlY3RlZFRleHQoKSk7 CiB9CiAKIGJvb2wgV2ViQ29udGV4dE1lbnVDbGllbnQ6OmNsaWVudEZsb2F0UmVjdEZvck5vZGUo Tm9kZSYgbm9kZSwgRmxvYXRSZWN0JiByZWN0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA0Y2VlYTBjYWNiZTFhNjFiOTc4YzUzMTYzOGQyMDEw YjM5YmMxNzAwLi4xNjExOWY3MzYyYmI0NDVjMDgyMjQ4MGQ4ODRmMGU2MTg1YmFlODA5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDI1OSwyNyArNDI1 OSw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJ bnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBDCiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQogCi0gICAgICAgIC8vIENyZWF0ZSB0aGUgcmVhbCBTaGFyZSBtZW51IGl0ZW0KLSAg ICAgICAgVVJMIGFic29sdXRlTGlua1VSTDsKLSAgICAgICAgaWYgKCFjb250ZXh0TWVudUNvbnRl eHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuYWJzb2x1dGVMaW5rVVJMLmlzRW1wdHkoKSkK LSAgICAgICAgICAgIGFic29sdXRlTGlua1VSTCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGNvbnRl eHRNZW51Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZUxpbmtVUkwp OwotCi0gICAgICAgIFVSTCBkb3dubG9hZGFibGVNZWRpYVVSTDsKLSAgICAgICAgaWYgKCFjb250 ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuYWJzb2x1dGVNZWRpYVVS TC5pc0VtcHR5KCkgJiYgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0 YSgpLmlzRG93bmxvYWRhYmxlTWVkaWEpCi0gICAgICAgICAgICBkb3dubG9hZGFibGVNZWRpYVVS TCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGNvbnRleHRNZW51Q29udGV4dERhdGEud2ViSGl0VGVz dFJlc3VsdERhdGEoKS5hYnNvbHV0ZU1lZGlhVVJMKTsKLQotICAgICAgICBSZWZQdHI8SW1hZ2U+ IGltYWdlOwotICAgICAgICBpZiAoY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVz dWx0RGF0YSgpLmltYWdlU2hhcmVkTWVtb3J5ICYmIGNvbnRleHRNZW51Q29udGV4dERhdGEud2Vi SGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNpemUpIHsKLSAgICAgICAgICAgIGltYWdlID0gQml0 bWFwSW1hZ2U6OmNyZWF0ZSgpOwotICAgICAgICAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gaW1h Z2VEYXRhID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoKHVuc2lnbmVkIGNoYXIqKWNvbnRleHRNZW51 Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNoYXJlZE1lbW9yeS0+ZGF0 YSgpLCBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1hZ2VT aXplKTsKLSAgICAgICAgICAgIGltYWdlLT5zZXREYXRhKGltYWdlRGF0YS5yZWxlYXNlKCksIHRy dWUpOwotICAgICAgICB9Ci0KLSAgICAgICAgQ29udGV4dE1lbnVJdGVtIGNvcmVJdGVtID0gQ29u dGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVtKGFic29sdXRlTGlua1VSTCwgZG93bmxvYWRhYmxl TWVkaWFVUkwsIGltYWdlLmdldCgpLCBjb250ZXh0TWVudUNvbnRleHREYXRhLnNlbGVjdGVkVGV4 dCgpKTsKLSAgICAgICAgaWYgKCFjb3JlSXRlbS5pc051bGwoKSkgewotICAgICAgICAgICAgcGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb3JlSXRlbSk7CisgICAgICAgIENvbnRleHRN ZW51SXRlbSBjb3JlSXRlbSA9IHBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oY29udGV4 dE1lbnVDb250ZXh0RGF0YSk7CisgICAgICAgIGlmICghY29yZUl0ZW0uaXNOdWxsKCkpCiAgICAg ICAgICAgICBwcm9wb3NlZEFQSUl0ZW1zLmFwcGVuZChXZWJDb250ZXh0TWVudUl0ZW06OmNyZWF0 ZShjb3JlSXRlbSkpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJD b250ZXh0TWVudUl0ZW0+PiBjbGllbnRJdGVtczsKQEAgLTQyOTYsNyArNDI3OCw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVu dUxvY2F0aW9uLCBjb25zdCBDCiB9CiAKICNpZiAhUExBVEZPUk0oTUFDKQotdm9pZCBXZWJQYWdl UHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oQ29udGV4dE1lbnVJdGVtJikK K1dlYkNvcmU6OkNvbnRleHRNZW51SXRlbSBXZWJQYWdlUHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6 ZVNoYXJlTWVudUl0ZW0oY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYpCiB7CiB9CiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAxODkyZDc5ZTkz MzExMTZlN2YwM2E0NDc1ZTBkMjIzZmVlMGYyODgyLi5lZjg0ODFjYjkwNzEzMTJlMTFkOTY5YmIy MzdiZDg2ZTYwMWZjZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o CkBAIC0xMjY1LDggKzEyNjUsMTAgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIHZvaWQgc2hvd0Nv bnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENv bnRleHRNZW51Q29udGV4dERhdGEmLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0 YT4mLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUo Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgQ29udGV4dE1lbnVD b250ZXh0RGF0YSYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYsIENvbnRl eHRNZW51Q2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJEYXRhJik7CisjZW5kaWYKIAotICAg IHZvaWQgcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShXZWJDb3JlOjpDb250ZXh0TWVu dUl0ZW0mKTsKKyNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKKyAgICBXZWJDb3JlOjpDb250 ZXh0TWVudUl0ZW0gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0 TWVudUNvbnRleHREYXRhJik7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVS X0RFVEVDVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2Vi UGFnZVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv eHlNYWMubW0KaW5kZXggYjZmYmNiZmY3MThhYTAzNzM4OTlhMzgwOWE1ODM2YjlkZGFhNTIzMS4u Y2Q0MzRkMmRhYmNmMzY4NTlhNjc0Njk2NTI5ZjkzZDM4ZTQ0NmQwOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTc0OCw5ICs3NDgs MjUgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmVkaXRvclN0YXRlQ2hhbmdlZChjb25zdCBFZGl0b3JT dGF0ZSYgZWRpdG9yU3RhdGUpCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oQ29udGV4dE1lbnVJdGVtJiBpdGVtKQotewogI2lm IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQorQ29udGV4dE1lbnVJdGVtIFdlYlBhZ2VQcm94eTo6 cGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiBjb250ZXh0TWVudUNvbnRleHREYXRhKQoreworICAgIGNvbnN0IFdlYkhpdFRlc3RSZXN1 bHQ6OkRhdGEmIGhpdFRlc3REYXRhID0gY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0 UmVzdWx0RGF0YSgpOworCisgICAgVVJMIGFic29sdXRlTGlua1VSTDsKKyAgICBpZiAoIWhpdFRl c3REYXRhLmFic29sdXRlTGlua1VSTC5pc0VtcHR5KCkpCisgICAgICAgIGFic29sdXRlTGlua1VS TCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGhpdFRlc3REYXRhLmFic29sdXRlTGlua1VSTCk7CisK KyAgICBVUkwgZG93bmxvYWRhYmxlTWVkaWFVUkw7CisgICAgaWYgKCFoaXRUZXN0RGF0YS5hYnNv bHV0ZU1lZGlhVVJMLmlzRW1wdHkoKSAmJiBoaXRUZXN0RGF0YS5pc0Rvd25sb2FkYWJsZU1lZGlh KQorICAgICAgICBkb3dubG9hZGFibGVNZWRpYVVSTCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGhp dFRlc3REYXRhLmFic29sdXRlTWVkaWFVUkwpOworCisgICAgUmV0YWluUHRyPE5TSW1hZ2U+IGlt YWdlOworICAgIGlmIChoaXRUZXN0RGF0YS5pbWFnZVNoYXJlZE1lbW9yeSAmJiBoaXRUZXN0RGF0 YS5pbWFnZVNpemUpCisgICAgICAgIGltYWdlID0gYWRvcHROUyhbW05TSW1hZ2UgYWxsb2NdIGlu aXRXaXRoRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6KHVuc2lnbmVkIGNoYXIqKWhpdFRlc3RE YXRhLmltYWdlU2hhcmVkTWVtb3J5LT5kYXRhKCkgbGVuZ3RoOmhpdFRlc3REYXRhLmltYWdlU2l6 ZV1dKTsKKworICAgIENvbnRleHRNZW51SXRlbSBpdGVtID0gQ29udGV4dE1lbnVJdGVtOjpzaGFy ZU1lbnVJdGVtKGFic29sdXRlTGlua1VSTCwgZG93bmxvYWRhYmxlTWVkaWFVUkwsIGltYWdlLmdl dCgpLCBjb250ZXh0TWVudUNvbnRleHREYXRhLnNlbGVjdGVkVGV4dCgpKTsKKwogICAgIE5TTWVu dUl0ZW0gKm5zSXRlbSA9IGl0ZW0ucGxhdGZvcm1EZXNjcmlwdGlvbigpOwogCiAgICAgTlNTaGFy aW5nU2VydmljZVBpY2tlciAqc2hhcmluZ1NlcnZpY2VQaWNrZXIgPSBbbnNJdGVtIHJlcHJlc2Vu dGVkT2JqZWN0XTsKQEAgLTc2Miw5ICs3NzgsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oQ29udGV4dE1lbnVJdGVtJiBpdGVtKQogCiAgICAg Ly8gU2V0dGluZyB0aGUgcGlja2VyIGxldHMgdGhlIGRlbGVnYXRlIHJldGFpbiBpdCB0byBrZWVw IGl0IGFsaXZlLCBidXQgdGhpcyBwaWNrZXIgaXMga2VwdCBhbGl2ZSBieSB0aGUgbWVudSBpdGVt LgogICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2 aWNlUGlja2VyRGVsZWdhdGVdIHNldFBpY2tlcjpuaWxdOwotI2VuZGlmCisKKyAgICByZXR1cm4g aXRlbTsKIH0KLSAgICAKKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlm IC8vIFBMQVRGT1JNKE1BQykK 260140 2015-08-28 01:52:12 -0700 2015-08-28 01:55:41 -0700 Patch bug-148566-20150828015159.patch text/plain 11928 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZhZWJkNzQwYzc1NmFk ZWM4YzJhM2MxYjFjNjE4ZGFhMzgzNDI0NS4uNTQ5YzIxMDc1NjUyM2VkMGM4OGE2MmYwMjJiNmE1 OTQzMWRiNTJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBS aWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBwcm9jZXNzIGZvciBhIHdoaWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmg6Cisg ICAgICAgIFByb3Blcmx5IG1hcmsgdGhpcyBhcyBNYWMtb25seS4gSXQncyBvbmx5IGltcGxlbWVu dGVkIGluIENvbnRleHRNZW51SXRlbU1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9Db250 ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0pOgorICAgICAgICBUYWtlIGEgTlNJbWFnZSBkaXJlY3RseSwgc28gd2UgZG9u J3QgaGF2ZSB0byByb3VuZC10cmlwIHRocm91Z2ggQml0bWFwSW1hZ2UsCisgICAgICAgIHdoaWNo IGNhbiBiZSBsb3NzeSBhbmQgZXhwZW5zaXZlLgorCiAyMDE1LTA4LTI3ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTg5MDc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQ2NWEyYTk5MGNlZTRjOWI1NjY4Yzc0 MzY1YjA0MmVmY2E4NTRkMTUuLjFjYmE0ZTlhYmRiMTA3M2I1MzMyNTg0OTlkMTYxOWQ2YjUyNTk0 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wOC0yOCAgVGltb3Ro eSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmln aHQtY2xpY2tpbmcgb24gR0lGcyBzcGlucyB0aGUgVUkgcHJvY2VzcyBmb3IgYSB3aGlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yMjQ2MDg1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50Lm1tOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0pOgor ICAgICAgICBNYWtlIGFuIE5TSW1hZ2UgZGlyZWN0bHkgZnJvbSB0aGUgaGl0IGltYWdlIGlmIHBv c3NpYmxlLgorCiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IExvb2t1cCBpbnZvY2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGQxZDZjZWQwNjM4ZjQ1MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uNTE1MzE4MGYx NWJhMDVjY2U1MTgzNzFkYmIwYWI3NGMzYjczMWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbTWFjXSBSaWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBw cm9jZXNzIGZvciBhIHdoaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDg1NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKToKKyAgICAgICAgTW92ZSBhbGwgb2YgdGhlIGNvZGUgdG8gbWFrZSBhIFNoYXJlIG1lbnVp dGVtIGludG8gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbS4KKyAgICAgICAgTWFrZSBh biBOU0ltYWdlIGRpcmVjdGx5IGZyb20gdGhlIGltYWdlIGRhdGEgaWYgcG9zc2libGUuCisKIDIw MTUtMDgtMjcgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZGVvIGZ1bGwtc2NyZWVuIHNob3VsZG4ndCB1c2UgdGhlIER5bmFtaWNTaXplV2l0 aE1pbmltdW1WaWV3U2l6ZSBsYXlvdXQgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaAppbmRleCAyMWZlMjdhOWU5YWNiY2M2NjQxODAwNmUyYTMyM2NjZGE2Mjg0 Zjk3Li4wZjRjNjVmZTExN2MwMDgyNjgzNTFjMWMyMGQ5MTY3YzA2ZTZmNDA5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uaApAQCAtMzQsNiArMzQsNyBAQAogCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAjaW5jbHVkZSA8d3RmL1JldGFpblB0ci5oPgorT0JKQ19DTEFT UyBOU0ltYWdlOwogT0JKQ19DTEFTUyBOU01lbnVJdGVtOwogI2VsaWYgUExBVEZPUk0oR1RLKQog dHlwZWRlZiBzdHJ1Y3QgX0d0a01lbnVJdGVtIEd0a01lbnVJdGVtOwpAQCAtMjA3LDcgKzIwOCw5 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHNldFN1Yk1lbnUoQ29udGV4 dE1lbnUqKTsKIAotICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgQ29udGV4dE1lbnVJdGVt IHNoYXJlTWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93 bmxvYWRhYmxlTWVkaWFVUkwsIEltYWdlKiwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpOwor I2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIENvbnRleHRN ZW51SXRlbSBzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1dGVMaW5rVVJMLCBjb25zdCBV UkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBOU0ltYWdlICosIGNvbnN0IFN0cmluZyYgc2VsZWN0 ZWRUZXh0KTsKKyNlbmRpZgogCiAjaWYgUExBVEZPUk0oR1RLKQogICAgICAgICBHdGtBY3Rpb24q IGd0a0FjdGlvbigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWFjL0NvbnRleHRNZW51SXRlbU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9D b250ZXh0TWVudUl0ZW1NYWMubW0KaW5kZXggYTJiOGRhNjY3NTRjNjQxOGVmMTllZTkxMWZkNzZj NTU0Y2M4NGE5Mi4uY2Y2MWI2MjNmODJjMTRlNzllNzI2N2Y3YzE5ZGQ0ZTliNDFhMzNmMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRlbU1hYy5t bQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1t CkBAIC0xOTYsNyArMTk2LDcgQEAgYm9vbCBDb250ZXh0TWVudUl0ZW06OmNoZWNrZWQoKSBjb25z dAogICAgIHJldHVybiBbbV9wbGF0Zm9ybURlc2NyaXB0aW9uLmdldCgpIHN0YXRlXSA9PSBOU09u U3RhdGU7CiB9CiAKLUNvbnRleHRNZW51SXRlbSBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0 ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93bmxvYWRhYmxlTWVk aWFVUkwsIEltYWdlKiBpbWFnZSwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpCitDb250ZXh0 TWVudUl0ZW0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1 dGVMaW5rVVJMLCBjb25zdCBVUkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBOU0ltYWdlICppbWFn ZSwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpCiB7CiAgICAgaWYgKCFbW05TTWVudUl0ZW0g Y2xhc3NdIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc3RhbmRhcmRTaGFyZU1lbnVJdGVt V2l0aEl0ZW1zOildKQogICAgICAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKCk7CkBAIC0yMDks MTEgKzIwOSw4IEBAIENvbnRleHRNZW51SXRlbSBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0 ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0CiAgICAgaWYgKCFkb3dubG9hZGFi bGVNZWRpYVVSTC5pc0VtcHR5KCkpCiAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6KE5TVVJMICop ZG93bmxvYWRhYmxlTWVkaWFVUkxdOwogCi0gICAgaWYgKGltYWdlKSB7Ci0gICAgICAgIE5TSW1h Z2UgKm5zSW1hZ2UgPSBpbWFnZS0+Z2V0TlNJbWFnZSgpOwotICAgICAgICBpZiAobnNJbWFnZSkK LSAgICAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6bnNJbWFnZV07Ci0gICAgfQorICAgIGlmIChp bWFnZSkKKyAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDppbWFnZV07CiAKICAgICBpZiAoIXNlbGVj dGVkVGV4dC5pc0VtcHR5KCkpCiAgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6KE5TU3RyaW5nICop c2VsZWN0ZWRUZXh0XTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1 cHBvcnQvV2ViQ29udGV4dE1lbnVDbGllbnQubW0KaW5kZXggYmIxZTZkZDcxZTUyOTczZTc4YzQx Yjg1NTI3ZmNlMTU5NjNhZGFhNC4uMTI3ODAyMGI4NWM1OGIyZWIzYTg3OGMzYjAzYjMxZDNmZTlm ZDNkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29u dGV4dE1lbnVDbGllbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQv V2ViQ29udGV4dE1lbnVDbGllbnQubW0KQEAgLTM4Nyw3ICszODcsMTMgQEAgQ29udGV4dE1lbnVJ dGVtIFdlYkNvbnRleHRNZW51Q2xpZW50OjpzaGFyZU1lbnVJdGVtKGNvbnN0IEhpdFRlc3RSZXN1 bHQmIGhpdFRlc3QKICAgICBpZiAoIWhpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVSTCgpLmlz RW1wdHkoKSAmJiBoaXRUZXN0UmVzdWx0LmlzRG93bmxvYWRhYmxlTWVkaWEoKSkKICAgICAgICAg ZG93bmxvYWRhYmxlTWVkaWFVUkwgPSBoaXRUZXN0UmVzdWx0LmFic29sdXRlTWVkaWFVUkwoKTsK IAotICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oaGl0VGVzdFJlc3Vs dC5hYnNvbHV0ZUxpbmtVUkwoKSwgZG93bmxvYWRhYmxlTWVkaWFVUkwsIGhpdFRlc3RSZXN1bHQu aW1hZ2UoKSwgaGl0VGVzdFJlc3VsdC5zZWxlY3RlZFRleHQoKSk7CisgICAgUmV0YWluUHRyPE5T SW1hZ2U+IG5zSW1hZ2U7CisgICAgaWYgKEltYWdlKiBpbWFnZSA9IGhpdFRlc3RSZXN1bHQuaW1h Z2UoKSkgeworICAgICAgICBpZiAoUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gYnVmZmVyID0gaW1hZ2Ut PmRhdGEoKSkKKyAgICAgICAgICAgIG5zSW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10g aW5pdFdpdGhEYXRhOltOU0RhdGEgZGF0YVdpdGhCeXRlczpidWZmZXItPmRhdGEoKSBsZW5ndGg6 YnVmZmVyLT5zaXplKCldXSk7CisgICAgfQorCisgICAgcmV0dXJuIENvbnRleHRNZW51SXRlbTo6 c2hhcmVNZW51SXRlbShoaXRUZXN0UmVzdWx0LmFic29sdXRlTGlua1VSTCgpLCBkb3dubG9hZGFi bGVNZWRpYVVSTCwgbnNJbWFnZS5nZXQoKSwgaGl0VGVzdFJlc3VsdC5zZWxlY3RlZFRleHQoKSk7 CiB9CiAKIGJvb2wgV2ViQ29udGV4dE1lbnVDbGllbnQ6OmNsaWVudEZsb2F0UmVjdEZvck5vZGUo Tm9kZSYgbm9kZSwgRmxvYXRSZWN0JiByZWN0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA0Y2VlYTBjYWNiZTFhNjFiOTc4YzUzMTYzOGQyMDEw YjM5YmMxNzAwLi44ZDM5ZmFjYzcyZTM1YTZiY2JmZThhMDMzZmM3NDcxMzE1MDE3YTRhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDI1OSwyNyArNDI1 OSw5IEBAIHZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJ bnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBDCiAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQogCi0gICAgICAgIC8vIENyZWF0ZSB0aGUgcmVhbCBTaGFyZSBtZW51IGl0ZW0KLSAg ICAgICAgVVJMIGFic29sdXRlTGlua1VSTDsKLSAgICAgICAgaWYgKCFjb250ZXh0TWVudUNvbnRl eHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuYWJzb2x1dGVMaW5rVVJMLmlzRW1wdHkoKSkK LSAgICAgICAgICAgIGFic29sdXRlTGlua1VSTCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGNvbnRl eHRNZW51Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZUxpbmtVUkwp OwotCi0gICAgICAgIFVSTCBkb3dubG9hZGFibGVNZWRpYVVSTDsKLSAgICAgICAgaWYgKCFjb250 ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuYWJzb2x1dGVNZWRpYVVS TC5pc0VtcHR5KCkgJiYgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0 YSgpLmlzRG93bmxvYWRhYmxlTWVkaWEpCi0gICAgICAgICAgICBkb3dubG9hZGFibGVNZWRpYVVS TCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGNvbnRleHRNZW51Q29udGV4dERhdGEud2ViSGl0VGVz dFJlc3VsdERhdGEoKS5hYnNvbHV0ZU1lZGlhVVJMKTsKLQotICAgICAgICBSZWZQdHI8SW1hZ2U+ IGltYWdlOwotICAgICAgICBpZiAoY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVz dWx0RGF0YSgpLmltYWdlU2hhcmVkTWVtb3J5ICYmIGNvbnRleHRNZW51Q29udGV4dERhdGEud2Vi SGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNpemUpIHsKLSAgICAgICAgICAgIGltYWdlID0gQml0 bWFwSW1hZ2U6OmNyZWF0ZSgpOwotICAgICAgICAgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gaW1h Z2VEYXRhID0gU2hhcmVkQnVmZmVyOjpjcmVhdGUoKHVuc2lnbmVkIGNoYXIqKWNvbnRleHRNZW51 Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNoYXJlZE1lbW9yeS0+ZGF0 YSgpLCBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1hZ2VT aXplKTsKLSAgICAgICAgICAgIGltYWdlLT5zZXREYXRhKGltYWdlRGF0YS5yZWxlYXNlKCksIHRy dWUpOwotICAgICAgICB9Ci0KLSAgICAgICAgQ29udGV4dE1lbnVJdGVtIGNvcmVJdGVtID0gQ29u dGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVtKGFic29sdXRlTGlua1VSTCwgZG93bmxvYWRhYmxl TWVkaWFVUkwsIGltYWdlLmdldCgpLCBjb250ZXh0TWVudUNvbnRleHREYXRhLnNlbGVjdGVkVGV4 dCgpKTsKLSAgICAgICAgaWYgKCFjb3JlSXRlbS5pc051bGwoKSkgewotICAgICAgICAgICAgcGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb3JlSXRlbSk7CisgICAgICAgIENvbnRleHRN ZW51SXRlbSBjb3JlSXRlbSA9IHBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oY29udGV4 dE1lbnVDb250ZXh0RGF0YSk7CisgICAgICAgIGlmICghY29yZUl0ZW0uaXNOdWxsKCkpCiAgICAg ICAgICAgICBwcm9wb3NlZEFQSUl0ZW1zLmFwcGVuZChXZWJDb250ZXh0TWVudUl0ZW06OmNyZWF0 ZShjb3JlSXRlbSkpOwotICAgICAgICB9CiAgICAgfQogCiAgICAgVmVjdG9yPFJlZlB0cjxXZWJD b250ZXh0TWVudUl0ZW0+PiBjbGllbnRJdGVtczsKQEAgLTQyOTUsOSArNDI3NywxMCBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29uc3QgSW50UG9pbnQmIG1l bnVMb2NhdGlvbiwgY29uc3QgQwogICAgIG1fY29udGV4dE1lbnVDbGllbnQtPmNvbnRleHRNZW51 RGlzbWlzc2VkKCp0aGlzKTsKIH0KIAotI2lmICFQTEFURk9STShNQUMpCi12b2lkIFdlYlBhZ2VQ cm94eTo6cGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShDb250ZXh0TWVudUl0ZW0mKQor I2lmICFFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKK0NvbnRleHRNZW51SXRlbSBXZWJQYWdlUHJv eHk6OnBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oY29uc3QgQ29udGV4dE1lbnVDb250 ZXh0RGF0YSYpCiB7CisgICAgcmV0dXJuIENvbnRleHRNZW51SXRlbSgpOwogfQogI2VuZGlmCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCAxODkyZDc5ZTkzMzEx MTZlN2YwM2E0NDc1ZTBkMjIzZmVlMGYyODgyLi5lZjg0ODFjYjkwNzEzMTJlMTFkOTY5YmIyMzdi ZDg2ZTYwMWZjZWMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFn ZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBA IC0xMjY1LDggKzEyNjUsMTAgQEAgcHJpdmF0ZToKICAgICB9OwogICAgIHZvaWQgc2hvd0NvbnRl eHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENvbnRl eHRNZW51Q29udGV4dERhdGEmLCBjb25zdCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4m LCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgaW50ZXJuYWxTaG93Q29udGV4dE1lbnUoY29u c3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgQ29udGV4dE1lbnVDb250 ZXh0RGF0YSYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYsIENvbnRleHRN ZW51Q2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJEYXRhJik7CisjZW5kaWYKIAotICAgIHZv aWQgcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShXZWJDb3JlOjpDb250ZXh0TWVudUl0 ZW0mKTsKKyNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKKyAgICBXZWJDb3JlOjpDb250ZXh0 TWVudUl0ZW0gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVu dUNvbnRleHREYXRhJik7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShURUxFUEhPTkVfTlVNQkVSX0RF VEVDVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFn ZVByb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlN YWMubW0KaW5kZXggYjZmYmNiZmY3MThhYTAzNzM4OTlhMzgwOWE1ODM2YjlkZGFhNTIzMS4uY2Q0 MzRkMmRhYmNmMzY4NTlhNjc0Njk2NTI5ZjkzZDM4ZTQ0NmQwOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0KQEAgLTc0OCw5ICs3NDgsMjUg QEAgdm9pZCBXZWJQYWdlUHJveHk6OmVkaXRvclN0YXRlQ2hhbmdlZChjb25zdCBFZGl0b3JTdGF0 ZSYgZWRpdG9yU3RhdGUpCiAjZW5kaWYKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OnBsYXRmb3Jt SW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oQ29udGV4dE1lbnVJdGVtJiBpdGVtKQotewogI2lmIEVO QUJMRShTRVJWSUNFX0NPTlRST0xTKQorQ29udGV4dE1lbnVJdGVtIFdlYlBhZ2VQcm94eTo6cGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRh JiBjb250ZXh0TWVudUNvbnRleHREYXRhKQoreworICAgIGNvbnN0IFdlYkhpdFRlc3RSZXN1bHQ6 OkRhdGEmIGhpdFRlc3REYXRhID0gY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVz dWx0RGF0YSgpOworCisgICAgVVJMIGFic29sdXRlTGlua1VSTDsKKyAgICBpZiAoIWhpdFRlc3RE YXRhLmFic29sdXRlTGlua1VSTC5pc0VtcHR5KCkpCisgICAgICAgIGFic29sdXRlTGlua1VSTCA9 IFVSTChQYXJzZWRVUkxTdHJpbmcsIGhpdFRlc3REYXRhLmFic29sdXRlTGlua1VSTCk7CisKKyAg ICBVUkwgZG93bmxvYWRhYmxlTWVkaWFVUkw7CisgICAgaWYgKCFoaXRUZXN0RGF0YS5hYnNvbHV0 ZU1lZGlhVVJMLmlzRW1wdHkoKSAmJiBoaXRUZXN0RGF0YS5pc0Rvd25sb2FkYWJsZU1lZGlhKQor ICAgICAgICBkb3dubG9hZGFibGVNZWRpYVVSTCA9IFVSTChQYXJzZWRVUkxTdHJpbmcsIGhpdFRl c3REYXRhLmFic29sdXRlTWVkaWFVUkwpOworCisgICAgUmV0YWluUHRyPE5TSW1hZ2U+IGltYWdl OworICAgIGlmIChoaXRUZXN0RGF0YS5pbWFnZVNoYXJlZE1lbW9yeSAmJiBoaXRUZXN0RGF0YS5p bWFnZVNpemUpCisgICAgICAgIGltYWdlID0gYWRvcHROUyhbW05TSW1hZ2UgYWxsb2NdIGluaXRX aXRoRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6KHVuc2lnbmVkIGNoYXIqKWhpdFRlc3REYXRh LmltYWdlU2hhcmVkTWVtb3J5LT5kYXRhKCkgbGVuZ3RoOmhpdFRlc3REYXRhLmltYWdlU2l6ZV1d KTsKKworICAgIENvbnRleHRNZW51SXRlbSBpdGVtID0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1l bnVJdGVtKGFic29sdXRlTGlua1VSTCwgZG93bmxvYWRhYmxlTWVkaWFVUkwsIGltYWdlLmdldCgp LCBjb250ZXh0TWVudUNvbnRleHREYXRhLnNlbGVjdGVkVGV4dCgpKTsKKwogICAgIE5TTWVudUl0 ZW0gKm5zSXRlbSA9IGl0ZW0ucGxhdGZvcm1EZXNjcmlwdGlvbigpOwogCiAgICAgTlNTaGFyaW5n U2VydmljZVBpY2tlciAqc2hhcmluZ1NlcnZpY2VQaWNrZXIgPSBbbnNJdGVtIHJlcHJlc2VudGVk T2JqZWN0XTsKQEAgLTc2Miw5ICs3NzgsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnBsYXRmb3Jt SW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oQ29udGV4dE1lbnVJdGVtJiBpdGVtKQogCiAgICAgLy8g U2V0dGluZyB0aGUgcGlja2VyIGxldHMgdGhlIGRlbGVnYXRlIHJldGFpbiBpdCB0byBrZWVwIGl0 IGFsaXZlLCBidXQgdGhpcyBwaWNrZXIgaXMga2VwdCBhbGl2ZSBieSB0aGUgbWVudSBpdGVtLgog ICAgIFtbV0tTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlIHNoYXJlZFNoYXJpbmdTZXJ2aWNl UGlja2VyRGVsZWdhdGVdIHNldFBpY2tlcjpuaWxdOwotI2VuZGlmCisKKyAgICByZXR1cm4gaXRl bTsKIH0KLSAgICAKKyNlbmRpZgorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKIAogI2VuZGlmIC8v IFBMQVRGT1JNKE1BQykK 260142 2015-08-28 01:55:45 -0700 2015-08-28 02:06:59 -0700 Patch bug-148566-20150828015532.patch text/plain 12599 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZhZWJkNzQwYzc1NmFk ZWM4YzJhM2MxYjFjNjE4ZGFhMzgzNDI0NS4uNTQ5YzIxMDc1NjUyM2VkMGM4OGE2MmYwMjJiNmE1 OTQzMWRiNTJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBS aWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBwcm9jZXNzIGZvciBhIHdoaWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmg6Cisg ICAgICAgIFByb3Blcmx5IG1hcmsgdGhpcyBhcyBNYWMtb25seS4gSXQncyBvbmx5IGltcGxlbWVu dGVkIGluIENvbnRleHRNZW51SXRlbU1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9Db250 ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0pOgorICAgICAgICBUYWtlIGEgTlNJbWFnZSBkaXJlY3RseSwgc28gd2UgZG9u J3QgaGF2ZSB0byByb3VuZC10cmlwIHRocm91Z2ggQml0bWFwSW1hZ2UsCisgICAgICAgIHdoaWNo IGNhbiBiZSBsb3NzeSBhbmQgZXhwZW5zaXZlLgorCiAyMDE1LTA4LTI3ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTg5MDc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQ2NWEyYTk5MGNlZTRjOWI1NjY4Yzc0 MzY1YjA0MmVmY2E4NTRkMTUuLjFjYmE0ZTlhYmRiMTA3M2I1MzMyNTg0OTlkMTYxOWQ2YjUyNTk0 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wOC0yOCAgVGltb3Ro eSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmln aHQtY2xpY2tpbmcgb24gR0lGcyBzcGlucyB0aGUgVUkgcHJvY2VzcyBmb3IgYSB3aGlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yMjQ2MDg1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50Lm1tOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0pOgor ICAgICAgICBNYWtlIGFuIE5TSW1hZ2UgZGlyZWN0bHkgZnJvbSB0aGUgaGl0IGltYWdlIGlmIHBv c3NpYmxlLgorCiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IExvb2t1cCBpbnZvY2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGQxZDZjZWQwNjM4ZjQ1MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uNTE1MzE4MGYx NWJhMDVjY2U1MTgzNzFkYmIwYWI3NGMzYjczMWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbTWFjXSBSaWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBw cm9jZXNzIGZvciBhIHdoaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDg1NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKToKKyAgICAgICAgTW92ZSBhbGwgb2YgdGhlIGNvZGUgdG8gbWFrZSBhIFNoYXJlIG1lbnVp dGVtIGludG8gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbS4KKyAgICAgICAgTWFrZSBh biBOU0ltYWdlIGRpcmVjdGx5IGZyb20gdGhlIGltYWdlIGRhdGEgaWYgcG9zc2libGUuCisKIDIw MTUtMDgtMjcgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZGVvIGZ1bGwtc2NyZWVuIHNob3VsZG4ndCB1c2UgdGhlIER5bmFtaWNTaXplV2l0 aE1pbmltdW1WaWV3U2l6ZSBsYXlvdXQgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nv bnRleHRNZW51SXRlbS5jcHAKaW5kZXggYzFiOWU1ODMzNzUxNmQwNWRjMDRlNzZiOGJkNGU5Yjcy OWEwNjViMS4uMjEwOGQyOGU1OTUwOTIyZmIyZjBhNzdlZWQzNGVjMGVhMTZiMmVjNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uY3BwCkBAIC0xMzEsMTEgKzEz MSw2IEBAIGJvb2wgQ29udGV4dE1lbnVJdGVtOjplbmFibGVkKCkgY29uc3QKICAgICByZXR1cm4g bV9lbmFibGVkOwogfQogCi1Db250ZXh0TWVudUl0ZW0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1l bnVJdGVtKGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYsIEltYWdlKiwgY29uc3QgU3RyaW5nJikKLXsK LSAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKFN1Ym1lbnVUeXBlLCBDb250ZXh0TWVudUl0ZW1U YWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5nKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9NRU5VUykgJiYgVVNFKENST1NTX1BMQVRGT1JN X0NPTlRFWFRfTUVOVVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5o CmluZGV4IDIxZmUyN2E5ZTlhY2JjYzY2NDE4MDA2ZTJhMzIzY2NkYTYyODRmOTcuLjBmNGM2NWZl MTE3YzAwODI2ODM1MWMxYzIwZDkxNjdjMDZlNmY0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0NvbnRleHRNZW51SXRlbS5oCkBAIC0zNCw2ICszNCw3IEBACiAKICNpZiBQTEFURk9STShD T0NPQSkKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CitPQkpDX0NMQVNTIE5TSW1hZ2U7CiBP QkpDX0NMQVNTIE5TTWVudUl0ZW07CiAjZWxpZiBQTEFURk9STShHVEspCiB0eXBlZGVmIHN0cnVj dCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CkBAIC0yMDcsNyArMjA4LDkgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgc2V0U3ViTWVudShDb250ZXh0TWVudSopOwogCi0g ICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBDb250ZXh0TWVudUl0ZW0gc2hhcmVNZW51SXRl bShjb25zdCBVUkwmIGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRp YVVSTCwgSW1hZ2UqLCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCk7CisjaWYgUExBVEZPUk0o TUFDKQorICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgQ29udGV4dE1lbnVJdGVtIHNoYXJl TWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93bmxvYWRh YmxlTWVkaWFVUkwsIE5TSW1hZ2UgKiwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpOworI2Vu ZGlmCiAKICNpZiBQTEFURk9STShHVEspCiAgICAgICAgIEd0a0FjdGlvbiogZ3RrQWN0aW9uKCkg Y29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1l bnVJdGVtTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRl bU1hYy5tbQppbmRleCBhMmI4ZGE2Njc1NGM2NDE4ZWYxOWVlOTExZmQ3NmM1NTRjYzg0YTkyLi5j ZjYxYjYyM2Y4MmMxNGU3OWU3MjY3ZjdjMTlkZDRlOWI0MWEzM2YzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW0KQEAgLTE5Niw3ICsx OTYsNyBAQCBib29sIENvbnRleHRNZW51SXRlbTo6Y2hlY2tlZCgpIGNvbnN0CiAgICAgcmV0dXJu IFttX3BsYXRmb3JtRGVzY3JpcHRpb24uZ2V0KCkgc3RhdGVdID09IE5TT25TdGF0ZTsKIH0KIAot Q29udGV4dE1lbnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwm IGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRpYVVSTCwgSW1hZ2Uq IGltYWdlLCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCkKK0NvbnRleHRNZW51SXRlbSBDb250 ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNv bnN0IFVSTCYgZG93bmxvYWRhYmxlTWVkaWFVUkwsIE5TSW1hZ2UgKmltYWdlLCBjb25zdCBTdHJp bmcmIHNlbGVjdGVkVGV4dCkKIHsKICAgICBpZiAoIVtbTlNNZW51SXRlbSBjbGFzc10gcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzdGFuZGFyZFNoYXJlTWVudUl0ZW1XaXRoSXRlbXM6KV0p CiAgICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW0oKTsKQEAgLTIwOSwxMSArMjA5LDggQEAg Q29udGV4dE1lbnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwm IGFic29sdXRlTGlua1VSTCwgY29uc3QKICAgICBpZiAoIWRvd25sb2FkYWJsZU1lZGlhVVJMLmlz RW1wdHkoKSkKICAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDooTlNVUkwgKilkb3dubG9hZGFibGVN ZWRpYVVSTF07CiAKLSAgICBpZiAoaW1hZ2UpIHsKLSAgICAgICAgTlNJbWFnZSAqbnNJbWFnZSA9 IGltYWdlLT5nZXROU0ltYWdlKCk7Ci0gICAgICAgIGlmIChuc0ltYWdlKQotICAgICAgICAgICAg W2l0ZW1zIGFkZE9iamVjdDpuc0ltYWdlXTsKLSAgICB9CisgICAgaWYgKGltYWdlKQorICAgICAg ICBbaXRlbXMgYWRkT2JqZWN0OmltYWdlXTsKIAogICAgIGlmICghc2VsZWN0ZWRUZXh0LmlzRW1w dHkoKSkKICAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDooTlNTdHJpbmcgKilzZWxlY3RlZFRleHRd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4 dE1lbnVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250 ZXh0TWVudUNsaWVudC5tbQppbmRleCBiYjFlNmRkNzFlNTI5NzNlNzhjNDFiODU1MjdmY2UxNTk2 M2FkYWE0Li4xMjc4MDIwYjg1YzU4YjJlYjNhODc4YzNiMDNiMzFkM2ZlOWZkM2RhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVu dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVu dUNsaWVudC5tbQpAQCAtMzg3LDcgKzM4NywxMyBAQCBDb250ZXh0TWVudUl0ZW0gV2ViQ29udGV4 dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0oY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0VGVzdAog ICAgIGlmICghaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZU1lZGlhVVJMKCkuaXNFbXB0eSgpICYmIGhp dFRlc3RSZXN1bHQuaXNEb3dubG9hZGFibGVNZWRpYSgpKQogICAgICAgICBkb3dubG9hZGFibGVN ZWRpYVVSTCA9IGhpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVSTCgpOwogCi0gICAgcmV0dXJu IENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShoaXRUZXN0UmVzdWx0LmFic29sdXRlTGlu a1VSTCgpLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaGl0VGVzdFJlc3VsdC5pbWFnZSgpLCBoaXRU ZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpKTsKKyAgICBSZXRhaW5QdHI8TlNJbWFnZT4gbnNJbWFn ZTsKKyAgICBpZiAoSW1hZ2UqIGltYWdlID0gaGl0VGVzdFJlc3VsdC5pbWFnZSgpKSB7CisgICAg ICAgIGlmIChSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBpbWFnZS0+ZGF0YSgpKQorICAg ICAgICAgICAgbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6 W05TRGF0YSBkYXRhV2l0aEJ5dGVzOmJ1ZmZlci0+ZGF0YSgpIGxlbmd0aDpidWZmZXItPnNpemUo KV1dKTsKKyAgICB9CisKKyAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVt KGhpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBu c0ltYWdlLmdldCgpLCBoaXRUZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpKTsKIH0KIAogYm9vbCBX ZWJDb250ZXh0TWVudUNsaWVudDo6Y2xpZW50RmxvYXRSZWN0Rm9yTm9kZShOb2RlJiBub2RlLCBG bG9hdFJlY3QmIHJlY3QpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDRjZWVhMGNhY2JlMWE2MWI5NzhjNTMxNjM4ZDIwMTBiMzliYzE3MDAuLjhk MzlmYWNjNzJlMzVhNmJjYmZlOGEwMzNmYzc0NzEzMTUwMTdhNGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MjU5LDI3ICs0MjU5LDkgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IEludFBvaW50JiBtZW51 TG9jYXRpb24sIGNvbnN0IEMKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAg ICAgICAgLy8gQ3JlYXRlIHRoZSByZWFsIFNoYXJlIG1lbnUgaXRlbQotICAgICAgICBVUkwgYWJz b2x1dGVMaW5rVVJMOwotICAgICAgICBpZiAoIWNvbnRleHRNZW51Q29udGV4dERhdGEud2ViSGl0 VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZUxpbmtVUkwuaXNFbXB0eSgpKQotICAgICAgICAgICAg YWJzb2x1dGVMaW5rVVJMID0gVVJMKFBhcnNlZFVSTFN0cmluZywgY29udGV4dE1lbnVDb250ZXh0 RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLmFic29sdXRlTGlua1VSTCk7Ci0KLSAgICAgICAg VVJMIGRvd25sb2FkYWJsZU1lZGlhVVJMOwotICAgICAgICBpZiAoIWNvbnRleHRNZW51Q29udGV4 dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZU1lZGlhVVJMLmlzRW1wdHkoKSAm JiBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaXNEb3dubG9h ZGFibGVNZWRpYSkKLSAgICAgICAgICAgIGRvd25sb2FkYWJsZU1lZGlhVVJMID0gVVJMKFBhcnNl ZFVSTFN0cmluZywgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0YSgp LmFic29sdXRlTWVkaWFVUkwpOwotCi0gICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2U7Ci0gICAg ICAgIGlmIChjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1h Z2VTaGFyZWRNZW1vcnkgJiYgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0 RGF0YSgpLmltYWdlU2l6ZSkgewotICAgICAgICAgICAgaW1hZ2UgPSBCaXRtYXBJbWFnZTo6Y3Jl YXRlKCk7Ci0gICAgICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBpbWFnZURhdGEgPSBTaGFy ZWRCdWZmZXI6OmNyZWF0ZSgodW5zaWduZWQgY2hhciopY29udGV4dE1lbnVDb250ZXh0RGF0YS53 ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLmltYWdlU2hhcmVkTWVtb3J5LT5kYXRhKCksIGNvbnRleHRN ZW51Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNpemUpOwotICAgICAg ICAgICAgaW1hZ2UtPnNldERhdGEoaW1hZ2VEYXRhLnJlbGVhc2UoKSwgdHJ1ZSk7Ci0gICAgICAg IH0KLQotICAgICAgICBDb250ZXh0TWVudUl0ZW0gY29yZUl0ZW0gPSBDb250ZXh0TWVudUl0ZW06 OnNoYXJlTWVudUl0ZW0oYWJzb2x1dGVMaW5rVVJMLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaW1h Z2UuZ2V0KCksIGNvbnRleHRNZW51Q29udGV4dERhdGEuc2VsZWN0ZWRUZXh0KCkpOwotICAgICAg ICBpZiAoIWNvcmVJdGVtLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBwbGF0Zm9ybUluaXRpYWxp emVTaGFyZU1lbnVJdGVtKGNvcmVJdGVtKTsKKyAgICAgICAgQ29udGV4dE1lbnVJdGVtIGNvcmVJ dGVtID0gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb250ZXh0TWVudUNvbnRleHRE YXRhKTsKKyAgICAgICAgaWYgKCFjb3JlSXRlbS5pc051bGwoKSkKICAgICAgICAgICAgIHByb3Bv c2VkQVBJSXRlbXMuYXBwZW5kKFdlYkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKGNvcmVJdGVtKSk7 Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRl bT4+IGNsaWVudEl0ZW1zOwpAQCAtNDI5NSw5ICs0Mjc3LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBj b25zdCBDCiAgICAgbV9jb250ZXh0TWVudUNsaWVudC0+Y29udGV4dE1lbnVEaXNtaXNzZWQoKnRo aXMpOwogfQogCi0jaWYgIVBMQVRGT1JNKE1BQykKLXZvaWQgV2ViUGFnZVByb3h5OjpwbGF0Zm9y bUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKENvbnRleHRNZW51SXRlbSYpCisjaWYgIUVOQUJMRShT RVJWSUNFX0NPTlRST0xTKQorQ29udGV4dE1lbnVJdGVtIFdlYlBhZ2VQcm94eTo6cGxhdGZvcm1J bml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJikKIHsK KyAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDE4OTJkNzllOTMzMTExNmU3ZjAzYTQ0NzVl MGQyMjNmZWUwZjI4ODIuLmVmODQ4MWNiOTA3MTMxMmUxMWQ5NjliYjIzN2JkODZlNjAxZmNlYzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTEyNjUsOCArMTI2 NSwxMCBAQCBwcml2YXRlOgogICAgIH07CiAgICAgdm9pZCBzaG93Q29udGV4dE1lbnUoY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgQ29udGV4dE1lbnVDb250ZXh0 RGF0YSYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0ZW1EYXRhPiYsIGNvbnN0IFVzZXJE YXRhJik7CiAgICAgdm9pZCBpbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBXZWJDb3JlOjpJ bnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiwgY29u c3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiwgQ29udGV4dE1lbnVDbGllbnRFbGln aWJpbGl0eSwgY29uc3QgVXNlckRhdGEmKTsKKyNlbmRpZgogCi0gICAgdm9pZCBwbGF0Zm9ybUlu aXRpYWxpemVTaGFyZU1lbnVJdGVtKFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSYpOworI2lmIEVO QUJMRShTRVJWSUNFX0NPTlRST0xTKQorICAgIFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSBwbGF0 Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEm KTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW0g Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQppbmRleCBi NmZiY2JmZjcxOGFhMDM3Mzg5OWEzODA5YTU4MzZiOWRkYWE1MjMxLi5jZDQzNGQyZGFiY2YzNjg1 OWE2NzQ2OTY1MjlmOTNkMzhlNDQ2ZDA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQpAQCAtNzQ4LDkgKzc0OCwyNSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6ZWRpdG9yU3RhdGVDaGFuZ2VkKGNvbnN0IEVkaXRvclN0YXRlJiBlZGl0b3JTdGF0 ZSkKICNlbmRpZgogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6cGxhdGZvcm1Jbml0aWFsaXplU2hh cmVNZW51SXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCi17CiAjaWYgRU5BQkxFKFNFUlZJQ0Vf Q09OVFJPTFMpCitDb250ZXh0TWVudUl0ZW0gV2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxp emVTaGFyZU1lbnVJdGVtKGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmIGNvbnRleHRNZW51 Q29udGV4dERhdGEpCit7CisgICAgY29uc3QgV2ViSGl0VGVzdFJlc3VsdDo6RGF0YSYgaGl0VGVz dERhdGEgPSBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCk7CisK KyAgICBVUkwgYWJzb2x1dGVMaW5rVVJMOworICAgIGlmICghaGl0VGVzdERhdGEuYWJzb2x1dGVM aW5rVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgYWJzb2x1dGVMaW5rVVJMID0gVVJMKFBhcnNlZFVS TFN0cmluZywgaGl0VGVzdERhdGEuYWJzb2x1dGVMaW5rVVJMKTsKKworICAgIFVSTCBkb3dubG9h ZGFibGVNZWRpYVVSTDsKKyAgICBpZiAoIWhpdFRlc3REYXRhLmFic29sdXRlTWVkaWFVUkwuaXNF bXB0eSgpICYmIGhpdFRlc3REYXRhLmlzRG93bmxvYWRhYmxlTWVkaWEpCisgICAgICAgIGRvd25s b2FkYWJsZU1lZGlhVVJMID0gVVJMKFBhcnNlZFVSTFN0cmluZywgaGl0VGVzdERhdGEuYWJzb2x1 dGVNZWRpYVVSTCk7CisKKyAgICBSZXRhaW5QdHI8TlNJbWFnZT4gaW1hZ2U7CisgICAgaWYgKGhp dFRlc3REYXRhLmltYWdlU2hhcmVkTWVtb3J5ICYmIGhpdFRlc3REYXRhLmltYWdlU2l6ZSkKKyAg ICAgICAgaW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10gaW5pdFdpdGhEYXRhOltOU0Rh dGEgZGF0YVdpdGhCeXRlczoodW5zaWduZWQgY2hhciopaGl0VGVzdERhdGEuaW1hZ2VTaGFyZWRN ZW1vcnktPmRhdGEoKSBsZW5ndGg6aGl0VGVzdERhdGEuaW1hZ2VTaXplXV0pOworCisgICAgQ29u dGV4dE1lbnVJdGVtIGl0ZW0gPSBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oYWJzb2x1 dGVMaW5rVVJMLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaW1hZ2UuZ2V0KCksIGNvbnRleHRNZW51 Q29udGV4dERhdGEuc2VsZWN0ZWRUZXh0KCkpOworCiAgICAgTlNNZW51SXRlbSAqbnNJdGVtID0g aXRlbS5wbGF0Zm9ybURlc2NyaXB0aW9uKCk7CiAKICAgICBOU1NoYXJpbmdTZXJ2aWNlUGlja2Vy ICpzaGFyaW5nU2VydmljZVBpY2tlciA9IFtuc0l0ZW0gcmVwcmVzZW50ZWRPYmplY3RdOwpAQCAt NzYyLDkgKzc3OCwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cGxhdGZvcm1Jbml0aWFsaXplU2hh cmVNZW51SXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCiAKICAgICAvLyBTZXR0aW5nIHRoZSBw aWNrZXIgbGV0cyB0aGUgZGVsZWdhdGUgcmV0YWluIGl0IHRvIGtlZXAgaXQgYWxpdmUsIGJ1dCB0 aGlzIHBpY2tlciBpcyBrZXB0IGFsaXZlIGJ5IHRoZSBtZW51IGl0ZW0uCiAgICAgW1tXS1NoYXJp bmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUgc2hhcmVkU2hhcmluZ1NlcnZpY2VQaWNrZXJEZWxlZ2F0 ZV0gc2V0UGlja2VyOm5pbF07Ci0jZW5kaWYKKworICAgIHJldHVybiBpdGVtOwogfQotICAgIAor I2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFD KQo= 260143 2015-08-28 02:07:03 -0700 2015-08-28 02:11:42 -0700 Patch bug-148566-20150828020650.patch text/plain 12560 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZhZWJkNzQwYzc1NmFk ZWM4YzJhM2MxYjFjNjE4ZGFhMzgzNDI0NS4uNTQ5YzIxMDc1NjUyM2VkMGM4OGE2MmYwMjJiNmE1 OTQzMWRiNTJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBS aWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBwcm9jZXNzIGZvciBhIHdoaWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmg6Cisg ICAgICAgIFByb3Blcmx5IG1hcmsgdGhpcyBhcyBNYWMtb25seS4gSXQncyBvbmx5IGltcGxlbWVu dGVkIGluIENvbnRleHRNZW51SXRlbU1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9Db250 ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0pOgorICAgICAgICBUYWtlIGEgTlNJbWFnZSBkaXJlY3RseSwgc28gd2UgZG9u J3QgaGF2ZSB0byByb3VuZC10cmlwIHRocm91Z2ggQml0bWFwSW1hZ2UsCisgICAgICAgIHdoaWNo IGNhbiBiZSBsb3NzeSBhbmQgZXhwZW5zaXZlLgorCiAyMDE1LTA4LTI3ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTg5MDc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQ2NWEyYTk5MGNlZTRjOWI1NjY4Yzc0 MzY1YjA0MmVmY2E4NTRkMTUuLjFjYmE0ZTlhYmRiMTA3M2I1MzMyNTg0OTlkMTYxOWQ2YjUyNTk0 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wOC0yOCAgVGltb3Ro eSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmln aHQtY2xpY2tpbmcgb24gR0lGcyBzcGlucyB0aGUgVUkgcHJvY2VzcyBmb3IgYSB3aGlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yMjQ2MDg1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50Lm1tOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0pOgor ICAgICAgICBNYWtlIGFuIE5TSW1hZ2UgZGlyZWN0bHkgZnJvbSB0aGUgaGl0IGltYWdlIGlmIHBv c3NpYmxlLgorCiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IExvb2t1cCBpbnZvY2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGQxZDZjZWQwNjM4ZjQ1MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uNTE1MzE4MGYx NWJhMDVjY2U1MTgzNzFkYmIwYWI3NGMzYjczMWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbTWFjXSBSaWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBw cm9jZXNzIGZvciBhIHdoaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDg1NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKToKKyAgICAgICAgTW92ZSBhbGwgb2YgdGhlIGNvZGUgdG8gbWFrZSBhIFNoYXJlIG1lbnVp dGVtIGludG8gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbS4KKyAgICAgICAgTWFrZSBh biBOU0ltYWdlIGRpcmVjdGx5IGZyb20gdGhlIGltYWdlIGRhdGEgaWYgcG9zc2libGUuCisKIDIw MTUtMDgtMjcgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZGVvIGZ1bGwtc2NyZWVuIHNob3VsZG4ndCB1c2UgdGhlIER5bmFtaWNTaXplV2l0 aE1pbmltdW1WaWV3U2l6ZSBsYXlvdXQgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nv bnRleHRNZW51SXRlbS5jcHAKaW5kZXggYzFiOWU1ODMzNzUxNmQwNWRjMDRlNzZiOGJkNGU5Yjcy OWEwNjViMS4uMjEwOGQyOGU1OTUwOTIyZmIyZjBhNzdlZWQzNGVjMGVhMTZiMmVjNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uY3BwCkBAIC0xMzEsMTEgKzEz MSw2IEBAIGJvb2wgQ29udGV4dE1lbnVJdGVtOjplbmFibGVkKCkgY29uc3QKICAgICByZXR1cm4g bV9lbmFibGVkOwogfQogCi1Db250ZXh0TWVudUl0ZW0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1l bnVJdGVtKGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYsIEltYWdlKiwgY29uc3QgU3RyaW5nJikKLXsK LSAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKFN1Ym1lbnVUeXBlLCBDb250ZXh0TWVudUl0ZW1U YWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5nKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9NRU5VUykgJiYgVVNFKENST1NTX1BMQVRGT1JN X0NPTlRFWFRfTUVOVVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5o CmluZGV4IDIxZmUyN2E5ZTlhY2JjYzY2NDE4MDA2ZTJhMzIzY2NkYTYyODRmOTcuLjBmNGM2NWZl MTE3YzAwODI2ODM1MWMxYzIwZDkxNjdjMDZlNmY0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0NvbnRleHRNZW51SXRlbS5oCkBAIC0zNCw2ICszNCw3IEBACiAKICNpZiBQTEFURk9STShD T0NPQSkKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CitPQkpDX0NMQVNTIE5TSW1hZ2U7CiBP QkpDX0NMQVNTIE5TTWVudUl0ZW07CiAjZWxpZiBQTEFURk9STShHVEspCiB0eXBlZGVmIHN0cnVj dCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CkBAIC0yMDcsNyArMjA4LDkgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgc2V0U3ViTWVudShDb250ZXh0TWVudSopOwogCi0g ICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBDb250ZXh0TWVudUl0ZW0gc2hhcmVNZW51SXRl bShjb25zdCBVUkwmIGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRp YVVSTCwgSW1hZ2UqLCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCk7CisjaWYgUExBVEZPUk0o TUFDKQorICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgQ29udGV4dE1lbnVJdGVtIHNoYXJl TWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93bmxvYWRh YmxlTWVkaWFVUkwsIE5TSW1hZ2UgKiwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpOworI2Vu ZGlmCiAKICNpZiBQTEFURk9STShHVEspCiAgICAgICAgIEd0a0FjdGlvbiogZ3RrQWN0aW9uKCkg Y29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1l bnVJdGVtTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0NvbnRleHRNZW51SXRl bU1hYy5tbQppbmRleCBhMmI4ZGE2Njc1NGM2NDE4ZWYxOWVlOTExZmQ3NmM1NTRjYzg0YTkyLi5j ZjYxYjYyM2Y4MmMxNGU3OWU3MjY3ZjdjMTlkZDRlOWI0MWEzM2YzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW0KQEAgLTE5Niw3ICsx OTYsNyBAQCBib29sIENvbnRleHRNZW51SXRlbTo6Y2hlY2tlZCgpIGNvbnN0CiAgICAgcmV0dXJu IFttX3BsYXRmb3JtRGVzY3JpcHRpb24uZ2V0KCkgc3RhdGVdID09IE5TT25TdGF0ZTsKIH0KIAot Q29udGV4dE1lbnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwm IGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRpYVVSTCwgSW1hZ2Uq IGltYWdlLCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCkKK0NvbnRleHRNZW51SXRlbSBDb250 ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNv bnN0IFVSTCYgZG93bmxvYWRhYmxlTWVkaWFVUkwsIE5TSW1hZ2UgKmltYWdlLCBjb25zdCBTdHJp bmcmIHNlbGVjdGVkVGV4dCkKIHsKICAgICBpZiAoIVtbTlNNZW51SXRlbSBjbGFzc10gcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihzdGFuZGFyZFNoYXJlTWVudUl0ZW1XaXRoSXRlbXM6KV0p CiAgICAgICAgIHJldHVybiBDb250ZXh0TWVudUl0ZW0oKTsKQEAgLTIwOSwxMSArMjA5LDggQEAg Q29udGV4dE1lbnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwm IGFic29sdXRlTGlua1VSTCwgY29uc3QKICAgICBpZiAoIWRvd25sb2FkYWJsZU1lZGlhVVJMLmlz RW1wdHkoKSkKICAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDooTlNVUkwgKilkb3dubG9hZGFibGVN ZWRpYVVSTF07CiAKLSAgICBpZiAoaW1hZ2UpIHsKLSAgICAgICAgTlNJbWFnZSAqbnNJbWFnZSA9 IGltYWdlLT5nZXROU0ltYWdlKCk7Ci0gICAgICAgIGlmIChuc0ltYWdlKQotICAgICAgICAgICAg W2l0ZW1zIGFkZE9iamVjdDpuc0ltYWdlXTsKLSAgICB9CisgICAgaWYgKGltYWdlKQorICAgICAg ICBbaXRlbXMgYWRkT2JqZWN0OmltYWdlXTsKIAogICAgIGlmICghc2VsZWN0ZWRUZXh0LmlzRW1w dHkoKSkKICAgICAgICAgW2l0ZW1zIGFkZE9iamVjdDooTlNTdHJpbmcgKilzZWxlY3RlZFRleHRd OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4 dE1lbnVDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250 ZXh0TWVudUNsaWVudC5tbQppbmRleCBiYjFlNmRkNzFlNTI5NzNlNzhjNDFiODU1MjdmY2UxNTk2 M2FkYWE0Li4xMjc4MDIwYjg1YzU4YjJlYjNhODc4YzNiMDNiMzFkM2ZlOWZkM2RhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVu dC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVu dUNsaWVudC5tbQpAQCAtMzg3LDcgKzM4NywxMyBAQCBDb250ZXh0TWVudUl0ZW0gV2ViQ29udGV4 dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0oY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0VGVzdAog ICAgIGlmICghaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZU1lZGlhVVJMKCkuaXNFbXB0eSgpICYmIGhp dFRlc3RSZXN1bHQuaXNEb3dubG9hZGFibGVNZWRpYSgpKQogICAgICAgICBkb3dubG9hZGFibGVN ZWRpYVVSTCA9IGhpdFRlc3RSZXN1bHQuYWJzb2x1dGVNZWRpYVVSTCgpOwogCi0gICAgcmV0dXJu IENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShoaXRUZXN0UmVzdWx0LmFic29sdXRlTGlu a1VSTCgpLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaGl0VGVzdFJlc3VsdC5pbWFnZSgpLCBoaXRU ZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpKTsKKyAgICBSZXRhaW5QdHI8TlNJbWFnZT4gbnNJbWFn ZTsKKyAgICBpZiAoSW1hZ2UqIGltYWdlID0gaGl0VGVzdFJlc3VsdC5pbWFnZSgpKSB7CisgICAg ICAgIGlmIChSZWZQdHI8U2hhcmVkQnVmZmVyPiBidWZmZXIgPSBpbWFnZS0+ZGF0YSgpKQorICAg ICAgICAgICAgbnNJbWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6 W05TRGF0YSBkYXRhV2l0aEJ5dGVzOmJ1ZmZlci0+ZGF0YSgpIGxlbmd0aDpidWZmZXItPnNpemUo KV1dKTsKKyAgICB9CisKKyAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1lbnVJdGVt KGhpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBu c0ltYWdlLmdldCgpLCBoaXRUZXN0UmVzdWx0LnNlbGVjdGVkVGV4dCgpKTsKIH0KIAogYm9vbCBX ZWJDb250ZXh0TWVudUNsaWVudDo6Y2xpZW50RmxvYXRSZWN0Rm9yTm9kZShOb2RlJiBub2RlLCBG bG9hdFJlY3QmIHJlY3QpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDRjZWVhMGNhY2JlMWE2MWI5NzhjNTMxNjM4ZDIwMTBiMzliYzE3MDAuLjhk MzlmYWNjNzJlMzVhNmJjYmZlOGEwMzNmYzc0NzEzMTUwMTdhNGEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MjU5LDI3ICs0MjU5LDkgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IEludFBvaW50JiBtZW51 TG9jYXRpb24sIGNvbnN0IEMKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAg ICAgICAgLy8gQ3JlYXRlIHRoZSByZWFsIFNoYXJlIG1lbnUgaXRlbQotICAgICAgICBVUkwgYWJz b2x1dGVMaW5rVVJMOwotICAgICAgICBpZiAoIWNvbnRleHRNZW51Q29udGV4dERhdGEud2ViSGl0 VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZUxpbmtVUkwuaXNFbXB0eSgpKQotICAgICAgICAgICAg YWJzb2x1dGVMaW5rVVJMID0gVVJMKFBhcnNlZFVSTFN0cmluZywgY29udGV4dE1lbnVDb250ZXh0 RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLmFic29sdXRlTGlua1VSTCk7Ci0KLSAgICAgICAg VVJMIGRvd25sb2FkYWJsZU1lZGlhVVJMOwotICAgICAgICBpZiAoIWNvbnRleHRNZW51Q29udGV4 dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5hYnNvbHV0ZU1lZGlhVVJMLmlzRW1wdHkoKSAm JiBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaXNEb3dubG9h ZGFibGVNZWRpYSkKLSAgICAgICAgICAgIGRvd25sb2FkYWJsZU1lZGlhVVJMID0gVVJMKFBhcnNl ZFVSTFN0cmluZywgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0YSgp LmFic29sdXRlTWVkaWFVUkwpOwotCi0gICAgICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2U7Ci0gICAg ICAgIGlmIChjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1h Z2VTaGFyZWRNZW1vcnkgJiYgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0 RGF0YSgpLmltYWdlU2l6ZSkgewotICAgICAgICAgICAgaW1hZ2UgPSBCaXRtYXBJbWFnZTo6Y3Jl YXRlKCk7Ci0gICAgICAgICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBpbWFnZURhdGEgPSBTaGFy ZWRCdWZmZXI6OmNyZWF0ZSgodW5zaWduZWQgY2hhciopY29udGV4dE1lbnVDb250ZXh0RGF0YS53 ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLmltYWdlU2hhcmVkTWVtb3J5LT5kYXRhKCksIGNvbnRleHRN ZW51Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNpemUpOwotICAgICAg ICAgICAgaW1hZ2UtPnNldERhdGEoaW1hZ2VEYXRhLnJlbGVhc2UoKSwgdHJ1ZSk7Ci0gICAgICAg IH0KLQotICAgICAgICBDb250ZXh0TWVudUl0ZW0gY29yZUl0ZW0gPSBDb250ZXh0TWVudUl0ZW06 OnNoYXJlTWVudUl0ZW0oYWJzb2x1dGVMaW5rVVJMLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaW1h Z2UuZ2V0KCksIGNvbnRleHRNZW51Q29udGV4dERhdGEuc2VsZWN0ZWRUZXh0KCkpOwotICAgICAg ICBpZiAoIWNvcmVJdGVtLmlzTnVsbCgpKSB7Ci0gICAgICAgICAgICBwbGF0Zm9ybUluaXRpYWxp emVTaGFyZU1lbnVJdGVtKGNvcmVJdGVtKTsKKyAgICAgICAgQ29udGV4dE1lbnVJdGVtIGNvcmVJ dGVtID0gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShjb250ZXh0TWVudUNvbnRleHRE YXRhKTsKKyAgICAgICAgaWYgKCFjb3JlSXRlbS5pc051bGwoKSkKICAgICAgICAgICAgIHByb3Bv c2VkQVBJSXRlbXMuYXBwZW5kKFdlYkNvbnRleHRNZW51SXRlbTo6Y3JlYXRlKGNvcmVJdGVtKSk7 Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBWZWN0b3I8UmVmUHRyPFdlYkNvbnRleHRNZW51SXRl bT4+IGNsaWVudEl0ZW1zOwpAQCAtNDI5NSw5ICs0Mjc3LDEwIEBAIHZvaWQgV2ViUGFnZVByb3h5 OjppbnRlcm5hbFNob3dDb250ZXh0TWVudShjb25zdCBJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBj b25zdCBDCiAgICAgbV9jb250ZXh0TWVudUNsaWVudC0+Y29udGV4dE1lbnVEaXNtaXNzZWQoKnRo aXMpOwogfQogCi0jaWYgIVBMQVRGT1JNKE1BQykKLXZvaWQgV2ViUGFnZVByb3h5OjpwbGF0Zm9y bUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKENvbnRleHRNZW51SXRlbSYpCisjaWYgIUVOQUJMRShT RVJWSUNFX0NPTlRST0xTKQorQ29udGV4dE1lbnVJdGVtIFdlYlBhZ2VQcm94eTo6cGxhdGZvcm1J bml0aWFsaXplU2hhcmVNZW51SXRlbShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJikKIHsK KyAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKCk7CiB9CiAjZW5kaWYKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDE4OTJkNzllOTMzMTExNmU3ZjAzYTQ0NzVl MGQyMjNmZWUwZjI4ODIuLmZiNjQ0NWM4OWRmMjg3YzAyZjEyYWFiNDlmZjkwM2E5YmY0MTVmZDgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTEyNjUsOCArMTI2 NSw3IEBAIHByaXZhdGU6CiAgICAgfTsKICAgICB2b2lkIHNob3dDb250ZXh0TWVudShjb25zdCBX ZWJDb3JlOjpJbnRQb2ludCYgbWVudUxvY2F0aW9uLCBjb25zdCBDb250ZXh0TWVudUNvbnRleHRE YXRhJiwgY29uc3QgVmVjdG9yPFdlYkNvbnRleHRNZW51SXRlbURhdGE+JiwgY29uc3QgVXNlckRh dGEmKTsKICAgICB2b2lkIGludGVybmFsU2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBjb25z dCBWZWN0b3I8V2ViQ29udGV4dE1lbnVJdGVtRGF0YT4mLCBDb250ZXh0TWVudUNsaWVudEVsaWdp YmlsaXR5LCBjb25zdCBVc2VyRGF0YSYpOwotCi0gICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemVT aGFyZU1lbnVJdGVtKFdlYkNvcmU6OkNvbnRleHRNZW51SXRlbSYpOworICAgIFdlYkNvcmU6OkNv bnRleHRNZW51SXRlbSBwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKGNvbnN0IENvbnRl eHRNZW51Q29udGV4dERhdGEmKTsKICNlbmRpZgogCiAjaWYgRU5BQkxFKFRFTEVQSE9ORV9OVU1C RVJfREVURUNUSU9OKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9X ZWJQYWdlUHJveHlNYWMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQ cm94eU1hYy5tbQppbmRleCBiNmZiY2JmZjcxOGFhMDM3Mzg5OWEzODA5YTU4MzZiOWRkYWE1MjMx Li5jZDQzNGQyZGFiY2YzNjg1OWE2NzQ2OTY1MjlmOTNkMzhlNDQ2ZDA5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbQpAQCAtNzQ4LDkgKzc0 OCwyNSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZWRpdG9yU3RhdGVDaGFuZ2VkKGNvbnN0IEVkaXRv clN0YXRlJiBlZGl0b3JTdGF0ZSkKICNlbmRpZgogfQogCi12b2lkIFdlYlBhZ2VQcm94eTo6cGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCi17CiAj aWYgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCitDb250ZXh0TWVudUl0ZW0gV2ViUGFnZVByb3h5 OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKGNvbnN0IENvbnRleHRNZW51Q29udGV4 dERhdGEmIGNvbnRleHRNZW51Q29udGV4dERhdGEpCit7CisgICAgY29uc3QgV2ViSGl0VGVzdFJl c3VsdDo6RGF0YSYgaGl0VGVzdERhdGEgPSBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRl c3RSZXN1bHREYXRhKCk7CisKKyAgICBVUkwgYWJzb2x1dGVMaW5rVVJMOworICAgIGlmICghaGl0 VGVzdERhdGEuYWJzb2x1dGVMaW5rVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgYWJzb2x1dGVMaW5r VVJMID0gVVJMKFBhcnNlZFVSTFN0cmluZywgaGl0VGVzdERhdGEuYWJzb2x1dGVMaW5rVVJMKTsK KworICAgIFVSTCBkb3dubG9hZGFibGVNZWRpYVVSTDsKKyAgICBpZiAoIWhpdFRlc3REYXRhLmFi c29sdXRlTWVkaWFVUkwuaXNFbXB0eSgpICYmIGhpdFRlc3REYXRhLmlzRG93bmxvYWRhYmxlTWVk aWEpCisgICAgICAgIGRvd25sb2FkYWJsZU1lZGlhVVJMID0gVVJMKFBhcnNlZFVSTFN0cmluZywg aGl0VGVzdERhdGEuYWJzb2x1dGVNZWRpYVVSTCk7CisKKyAgICBSZXRhaW5QdHI8TlNJbWFnZT4g aW1hZ2U7CisgICAgaWYgKGhpdFRlc3REYXRhLmltYWdlU2hhcmVkTWVtb3J5ICYmIGhpdFRlc3RE YXRhLmltYWdlU2l6ZSkKKyAgICAgICAgaW1hZ2UgPSBhZG9wdE5TKFtbTlNJbWFnZSBhbGxvY10g aW5pdFdpdGhEYXRhOltOU0RhdGEgZGF0YVdpdGhCeXRlczoodW5zaWduZWQgY2hhciopaGl0VGVz dERhdGEuaW1hZ2VTaGFyZWRNZW1vcnktPmRhdGEoKSBsZW5ndGg6aGl0VGVzdERhdGEuaW1hZ2VT aXplXV0pOworCisgICAgQ29udGV4dE1lbnVJdGVtIGl0ZW0gPSBDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0oYWJzb2x1dGVMaW5rVVJMLCBkb3dubG9hZGFibGVNZWRpYVVSTCwgaW1hZ2Uu Z2V0KCksIGNvbnRleHRNZW51Q29udGV4dERhdGEuc2VsZWN0ZWRUZXh0KCkpOworCiAgICAgTlNN ZW51SXRlbSAqbnNJdGVtID0gaXRlbS5wbGF0Zm9ybURlc2NyaXB0aW9uKCk7CiAKICAgICBOU1No YXJpbmdTZXJ2aWNlUGlja2VyICpzaGFyaW5nU2VydmljZVBpY2tlciA9IFtuc0l0ZW0gcmVwcmVz ZW50ZWRPYmplY3RdOwpAQCAtNzYyLDkgKzc3OCwxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cGxh dGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbShDb250ZXh0TWVudUl0ZW0mIGl0ZW0pCiAKICAg ICAvLyBTZXR0aW5nIHRoZSBwaWNrZXIgbGV0cyB0aGUgZGVsZWdhdGUgcmV0YWluIGl0IHRvIGtl ZXAgaXQgYWxpdmUsIGJ1dCB0aGlzIHBpY2tlciBpcyBrZXB0IGFsaXZlIGJ5IHRoZSBtZW51IGl0 ZW0uCiAgICAgW1tXS1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUgc2hhcmVkU2hhcmluZ1Nl cnZpY2VQaWNrZXJEZWxlZ2F0ZV0gc2V0UGlja2VyOm5pbF07Ci0jZW5kaWYKKworICAgIHJldHVy biBpdGVtOwogfQotICAgIAorI2VuZGlmCisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5k aWYgLy8gUExBVEZPUk0oTUFDKQo= 260144 2015-08-28 02:11:45 -0700 2015-08-28 08:14:02 -0700 Patch bug-148566-20150828021132.patch text/plain 13219 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5MDgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZhZWJkNzQwYzc1NmFk ZWM4YzJhM2MxYjFjNjE4ZGFhMzgzNDI0NS4uNTQ5YzIxMDc1NjUyM2VkMGM4OGE2MmYwMjJiNmE1 OTQzMWRiNTJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE1LTA4LTI4ICBUaW1v dGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKworICAgICAgICBbTWFjXSBS aWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBwcm9jZXNzIGZvciBhIHdoaWxlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDg1NjYKKyAg ICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmg6Cisg ICAgICAgIFByb3Blcmx5IG1hcmsgdGhpcyBhcyBNYWMtb25seS4gSXQncyBvbmx5IGltcGxlbWVu dGVkIGluIENvbnRleHRNZW51SXRlbU1hYy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9Db250 ZXh0TWVudUl0ZW1NYWMubW06CisgICAgICAgIChXZWJDb3JlOjpDb250ZXh0TWVudUl0ZW06OnNo YXJlTWVudUl0ZW0pOgorICAgICAgICBUYWtlIGEgTlNJbWFnZSBkaXJlY3RseSwgc28gd2UgZG9u J3QgaGF2ZSB0byByb3VuZC10cmlwIHRocm91Z2ggQml0bWFwSW1hZ2UsCisgICAgICAgIHdoaWNo IGNhbiBiZSBsb3NzeSBhbmQgZXhwZW5zaXZlLgorCiAyMDE1LTA4LTI3ICBDb21taXQgUXVldWUg IDxjb21taXQtcXVldWVAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByMTg5MDc5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQ2NWEyYTk5MGNlZTRjOWI1NjY4Yzc0 MzY1YjA0MmVmY2E4NTRkMTUuLjFjYmE0ZTlhYmRiMTA3M2I1MzMyNTg0OTlkMTYxOWQ2YjUyNTk0 N2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxNS0wOC0yOCAgVGltb3Ro eSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01hY10gUmln aHQtY2xpY2tpbmcgb24gR0lGcyBzcGlucyB0aGUgVUkgcHJvY2VzcyBmb3IgYSB3aGlsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NTY2CisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8yMjQ2MDg1ND4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xp ZW50Lm1tOgorICAgICAgICAoV2ViQ29udGV4dE1lbnVDbGllbnQ6OnNoYXJlTWVudUl0ZW0pOgor ICAgICAgICBNYWtlIGFuIE5TSW1hZ2UgZGlyZWN0bHkgZnJvbSB0aGUgaGl0IGltYWdlIGlmIHBv c3NpYmxlLgorCiAyMDE1LTA4LTI3ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFw cGxlLmNvbT4KIAogICAgICAgICBGYWN0b3Igb3V0IExvb2t1cCBpbnZvY2F0aW9uCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cK aW5kZXggZGQxZDZjZWQwNjM4ZjQ1MTg3NDlhZWVhMzdiNzFhOGZlYzVmZTE3Ny4uNTE1MzE4MGYx NWJhMDVjY2U1MTgzNzFkYmIwYWI3NGMzYjczMWYzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIw IEBACisyMDE1LTA4LTI4ICBUaW1vdGh5IEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNv bT4KKworICAgICAgICBbTWFjXSBSaWdodC1jbGlja2luZyBvbiBHSUZzIHNwaW5zIHRoZSBVSSBw cm9jZXNzIGZvciBhIHdoaWxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNDg1NjYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzIyNDYwODU0PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJu YWxTaG93Q29udGV4dE1lbnUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBsYXRm b3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKToKKyAgICAgICAgTW92ZSBhbGwgb2YgdGhlIGNvZGUgdG8gbWFrZSBhIFNoYXJlIG1lbnVp dGVtIGludG8gcGxhdGZvcm1Jbml0aWFsaXplU2hhcmVNZW51SXRlbS4KKyAgICAgICAgTWFrZSBh biBOU0ltYWdlIGRpcmVjdGx5IGZyb20gdGhlIGltYWdlIGRhdGEgaWYgcG9zc2libGUuCisKIDIw MTUtMDgtMjcgIFRpbW90aHkgSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFZpZGVvIGZ1bGwtc2NyZWVuIHNob3VsZG4ndCB1c2UgdGhlIER5bmFtaWNTaXplV2l0 aE1pbmltdW1WaWV3U2l6ZSBsYXlvdXQgbW9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nv bnRleHRNZW51SXRlbS5jcHAKaW5kZXggYzFiOWU1ODMzNzUxNmQwNWRjMDRlNzZiOGJkNGU5Yjcy OWEwNjViMS4uMjEwOGQyOGU1OTUwOTIyZmIyZjBhNzdlZWQzNGVjMGVhMTZiMmVjNSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnVJdGVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250ZXh0TWVudUl0ZW0uY3BwCkBAIC0xMzEsMTEgKzEz MSw2IEBAIGJvb2wgQ29udGV4dE1lbnVJdGVtOjplbmFibGVkKCkgY29uc3QKICAgICByZXR1cm4g bV9lbmFibGVkOwogfQogCi1Db250ZXh0TWVudUl0ZW0gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1l bnVJdGVtKGNvbnN0IFVSTCYsIGNvbnN0IFVSTCYsIEltYWdlKiwgY29uc3QgU3RyaW5nJikKLXsK LSAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtKFN1Ym1lbnVUeXBlLCBDb250ZXh0TWVudUl0ZW1U YWdTaGFyZU1lbnUsIGVtcHR5U3RyaW5nKCkpOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3Jl CiAKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9NRU5VUykgJiYgVVNFKENST1NTX1BMQVRGT1JN X0NPTlRFWFRfTUVOVVMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db250 ZXh0TWVudUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5o CmluZGV4IDIxZmUyN2E5ZTlhY2JjYzY2NDE4MDA2ZTJhMzIzY2NkYTYyODRmOTcuLjBmNGM2NWZl MTE3YzAwODI2ODM1MWMxYzIwZDkxNjdjMDZlNmY0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0NvbnRleHRNZW51SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0NvbnRleHRNZW51SXRlbS5oCkBAIC0zNCw2ICszNCw3IEBACiAKICNpZiBQTEFURk9STShD T0NPQSkKICNpbmNsdWRlIDx3dGYvUmV0YWluUHRyLmg+CitPQkpDX0NMQVNTIE5TSW1hZ2U7CiBP QkpDX0NMQVNTIE5TTWVudUl0ZW07CiAjZWxpZiBQTEFURk9STShHVEspCiB0eXBlZGVmIHN0cnVj dCBfR3RrTWVudUl0ZW0gR3RrTWVudUl0ZW07CkBAIC0yMDcsNyArMjA4LDkgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIHZvaWQgc2V0U3ViTWVudShDb250ZXh0TWVudSopOwogCi0g ICAgICAgIFdFQkNPUkVfRVhQT1JUIHN0YXRpYyBDb250ZXh0TWVudUl0ZW0gc2hhcmVNZW51SXRl bShjb25zdCBVUkwmIGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRp YVVSTCwgSW1hZ2UqLCBjb25zdCBTdHJpbmcmIHNlbGVjdGVkVGV4dCk7CisjaWYgUExBVEZPUk0o TUFDKQorICAgICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgQ29udGV4dE1lbnVJdGVtIHNoYXJl TWVudUl0ZW0oY29uc3QgVVJMJiBhYnNvbHV0ZUxpbmtVUkwsIGNvbnN0IFVSTCYgZG93bmxvYWRh YmxlTWVkaWFVUkwsIE5TSW1hZ2UgKiwgY29uc3QgU3RyaW5nJiBzZWxlY3RlZFRleHQpOworI2Vu ZGlmCiAKICNpZiBQTEFURk9STShHVEspCiAgICAgICAgIEd0a0FjdGlvbiogZ3RrQWN0aW9uKCkg Y29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ29udGV4dE1l bnVJdGVtR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUl0 ZW1HdGsuY3BwCmluZGV4IGQwOGFmZWIwYzJmMDVhMTI1YmJiMzRhYWQ5YzZmMTczYjI0Y2U4YzIu Ljg3ODliMTFlYzg5MjUzYTM4ZTBhZjc0NDVkMDQ3NWZjOTA0NDA5NzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUl0ZW1HdGsuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Db250ZXh0TWVudUl0ZW1HdGsuY3BwCkBAIC0yODgs MTEgKzI4OCw2IEBAIEd0a0FjdGlvbiogQ29udGV4dE1lbnVJdGVtOjpndGtBY3Rpb24oKSBjb25z dAogICAgIHJldHVybiBndGtfYWN0aXZhdGFibGVfZ2V0X3JlbGF0ZWRfYWN0aW9uKEdUS19BQ1RJ VkFUQUJMRShtX3BsYXRmb3JtRGVzY3JpcHRpb24pKTsKIH0KIAotQ29udGV4dE1lbnVJdGVtIENv bnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShjb25zdCBVUkwmLCBjb25zdCBVUkwmLCBJbWFn ZSosIGNvbnN0IFN0cmluZyYpCi17Ci0gICAgcmV0dXJuIENvbnRleHRNZW51SXRlbSgpOwotfQot CiB9CiAKICNlbmRpZiAvLyBFTkFCTEUoQ09OVEVYVF9NRU5VUykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9Db250ZXh0TWVudUl0ZW1NYWMubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvQ29udGV4dE1lbnVJdGVtTWFjLm1tCmluZGV4IGEyYjhkYTY2NzU0 YzY0MThlZjE5ZWU5MTFmZDc2YzU1NGNjODRhOTIuLmNmNjFiNjIzZjgyYzE0ZTc5ZTcyNjdmN2Mx OWRkNGU5YjQxYTMzZjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9D b250ZXh0TWVudUl0ZW1NYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Nv bnRleHRNZW51SXRlbU1hYy5tbQpAQCAtMTk2LDcgKzE5Niw3IEBAIGJvb2wgQ29udGV4dE1lbnVJ dGVtOjpjaGVja2VkKCkgY29uc3QKICAgICByZXR1cm4gW21fcGxhdGZvcm1EZXNjcmlwdGlvbi5n ZXQoKSBzdGF0ZV0gPT0gTlNPblN0YXRlOwogfQogCi1Db250ZXh0TWVudUl0ZW0gQ29udGV4dE1l bnVJdGVtOjpzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1dGVMaW5rVVJMLCBjb25zdCBV UkwmIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBJbWFnZSogaW1hZ2UsIGNvbnN0IFN0cmluZyYgc2Vs ZWN0ZWRUZXh0KQorQ29udGV4dE1lbnVJdGVtIENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRl bShjb25zdCBVUkwmIGFic29sdXRlTGlua1VSTCwgY29uc3QgVVJMJiBkb3dubG9hZGFibGVNZWRp YVVSTCwgTlNJbWFnZSAqaW1hZ2UsIGNvbnN0IFN0cmluZyYgc2VsZWN0ZWRUZXh0KQogewogICAg IGlmICghW1tOU01lbnVJdGVtIGNsYXNzXSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHN0 YW5kYXJkU2hhcmVNZW51SXRlbVdpdGhJdGVtczopXSkKICAgICAgICAgcmV0dXJuIENvbnRleHRN ZW51SXRlbSgpOwpAQCAtMjA5LDExICsyMDksOCBAQCBDb250ZXh0TWVudUl0ZW0gQ29udGV4dE1l bnVJdGVtOjpzaGFyZU1lbnVJdGVtKGNvbnN0IFVSTCYgYWJzb2x1dGVMaW5rVVJMLCBjb25zdAog ICAgIGlmICghZG93bmxvYWRhYmxlTWVkaWFVUkwuaXNFbXB0eSgpKQogICAgICAgICBbaXRlbXMg YWRkT2JqZWN0OihOU1VSTCAqKWRvd25sb2FkYWJsZU1lZGlhVVJMXTsKIAotICAgIGlmIChpbWFn ZSkgewotICAgICAgICBOU0ltYWdlICpuc0ltYWdlID0gaW1hZ2UtPmdldE5TSW1hZ2UoKTsKLSAg ICAgICAgaWYgKG5zSW1hZ2UpCi0gICAgICAgICAgICBbaXRlbXMgYWRkT2JqZWN0Om5zSW1hZ2Vd OwotICAgIH0KKyAgICBpZiAoaW1hZ2UpCisgICAgICAgIFtpdGVtcyBhZGRPYmplY3Q6aW1hZ2Vd OwogCiAgICAgaWYgKCFzZWxlY3RlZFRleHQuaXNFbXB0eSgpKQogICAgICAgICBbaXRlbXMgYWRk T2JqZWN0OihOU1N0cmluZyAqKXNlbGVjdGVkVGV4dF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbSBiL1NvdXJjZS9X ZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCmluZGV4IGJi MWU2ZGQ3MWU1Mjk3M2U3OGM0MWI4NTUyN2ZjZTE1OTYzYWRhYTQuLjEyNzgwMjBiODVjNThiMmVi M2E4NzhjM2IwM2IzMWQzZmU5ZmQzZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51Q2xpZW50Lm1tCkBAIC0zODcsNyArMzg3 LDEzIEBAIENvbnRleHRNZW51SXRlbSBXZWJDb250ZXh0TWVudUNsaWVudDo6c2hhcmVNZW51SXRl bShjb25zdCBIaXRUZXN0UmVzdWx0JiBoaXRUZXN0CiAgICAgaWYgKCFoaXRUZXN0UmVzdWx0LmFi c29sdXRlTWVkaWFVUkwoKS5pc0VtcHR5KCkgJiYgaGl0VGVzdFJlc3VsdC5pc0Rvd25sb2FkYWJs ZU1lZGlhKCkpCiAgICAgICAgIGRvd25sb2FkYWJsZU1lZGlhVVJMID0gaGl0VGVzdFJlc3VsdC5h YnNvbHV0ZU1lZGlhVVJMKCk7CiAKLSAgICByZXR1cm4gQ29udGV4dE1lbnVJdGVtOjpzaGFyZU1l bnVJdGVtKGhpdFRlc3RSZXN1bHQuYWJzb2x1dGVMaW5rVVJMKCksIGRvd25sb2FkYWJsZU1lZGlh VVJMLCBoaXRUZXN0UmVzdWx0LmltYWdlKCksIGhpdFRlc3RSZXN1bHQuc2VsZWN0ZWRUZXh0KCkp OworICAgIFJldGFpblB0cjxOU0ltYWdlPiBuc0ltYWdlOworICAgIGlmIChJbWFnZSogaW1hZ2Ug PSBoaXRUZXN0UmVzdWx0LmltYWdlKCkpIHsKKyAgICAgICAgaWYgKFJlZlB0cjxTaGFyZWRCdWZm ZXI+IGJ1ZmZlciA9IGltYWdlLT5kYXRhKCkpCisgICAgICAgICAgICBuc0ltYWdlID0gYWRvcHRO UyhbW05TSW1hZ2UgYWxsb2NdIGluaXRXaXRoRGF0YTpbTlNEYXRhIGRhdGFXaXRoQnl0ZXM6YnVm ZmVyLT5kYXRhKCkgbGVuZ3RoOmJ1ZmZlci0+c2l6ZSgpXV0pOworICAgIH0KKworICAgIHJldHVy biBDb250ZXh0TWVudUl0ZW06OnNoYXJlTWVudUl0ZW0oaGl0VGVzdFJlc3VsdC5hYnNvbHV0ZUxp bmtVUkwoKSwgZG93bmxvYWRhYmxlTWVkaWFVUkwsIG5zSW1hZ2UuZ2V0KCksIGhpdFRlc3RSZXN1 bHQuc2VsZWN0ZWRUZXh0KCkpOwogfQogCiBib29sIFdlYkNvbnRleHRNZW51Q2xpZW50OjpjbGll bnRGbG9hdFJlY3RGb3JOb2RlKE5vZGUmIG5vZGUsIEZsb2F0UmVjdCYgcmVjdCkgY29uc3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNGNlZWEwY2FjYmUx YTYxYjk3OGM1MzE2MzhkMjAxMGIzOWJjMTcwMC4uOGQzOWZhY2M3MmUzNWE2YmNiZmU4YTAzM2Zj NzQ3MTMxNTAxN2E0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5j cHAKQEAgLTQyNTksMjcgKzQyNTksOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93 Q29udGV4dE1lbnUoY29uc3QgSW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29uc3QgQwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBDcmVhdGUgdGhlIHJlYWwg U2hhcmUgbWVudSBpdGVtCi0gICAgICAgIFVSTCBhYnNvbHV0ZUxpbmtVUkw7Ci0gICAgICAgIGlm ICghY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0YSgpLmFic29sdXRl TGlua1VSTC5pc0VtcHR5KCkpCi0gICAgICAgICAgICBhYnNvbHV0ZUxpbmtVUkwgPSBVUkwoUGFy c2VkVVJMU3RyaW5nLCBjb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRh KCkuYWJzb2x1dGVMaW5rVVJMKTsKLQotICAgICAgICBVUkwgZG93bmxvYWRhYmxlTWVkaWFVUkw7 Ci0gICAgICAgIGlmICghY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0UmVzdWx0RGF0 YSgpLmFic29sdXRlTWVkaWFVUkwuaXNFbXB0eSgpICYmIGNvbnRleHRNZW51Q29udGV4dERhdGEu d2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pc0Rvd25sb2FkYWJsZU1lZGlhKQotICAgICAgICAgICAg ZG93bmxvYWRhYmxlTWVkaWFVUkwgPSBVUkwoUGFyc2VkVVJMU3RyaW5nLCBjb250ZXh0TWVudUNv bnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuYWJzb2x1dGVNZWRpYVVSTCk7Ci0KLSAg ICAgICAgUmVmUHRyPEltYWdlPiBpbWFnZTsKLSAgICAgICAgaWYgKGNvbnRleHRNZW51Q29udGV4 dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKS5pbWFnZVNoYXJlZE1lbW9yeSAmJiBjb250ZXh0 TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1hZ2VTaXplKSB7Ci0gICAg ICAgICAgICBpbWFnZSA9IEJpdG1hcEltYWdlOjpjcmVhdGUoKTsKLSAgICAgICAgICAgIFJlZlB0 cjxTaGFyZWRCdWZmZXI+IGltYWdlRGF0YSA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKCh1bnNpZ25l ZCBjaGFyKiljb250ZXh0TWVudUNvbnRleHREYXRhLndlYkhpdFRlc3RSZXN1bHREYXRhKCkuaW1h Z2VTaGFyZWRNZW1vcnktPmRhdGEoKSwgY29udGV4dE1lbnVDb250ZXh0RGF0YS53ZWJIaXRUZXN0 UmVzdWx0RGF0YSgpLmltYWdlU2l6ZSk7Ci0gICAgICAgICAgICBpbWFnZS0+c2V0RGF0YShpbWFn ZURhdGEucmVsZWFzZSgpLCB0cnVlKTsKLSAgICAgICAgfQotCi0gICAgICAgIENvbnRleHRNZW51 SXRlbSBjb3JlSXRlbSA9IENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShhYnNvbHV0ZUxp bmtVUkwsIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBpbWFnZS5nZXQoKSwgY29udGV4dE1lbnVDb250 ZXh0RGF0YS5zZWxlY3RlZFRleHQoKSk7Ci0gICAgICAgIGlmICghY29yZUl0ZW0uaXNOdWxsKCkp IHsKLSAgICAgICAgICAgIHBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oY29yZUl0ZW0p OworICAgICAgICBDb250ZXh0TWVudUl0ZW0gY29yZUl0ZW0gPSBwbGF0Zm9ybUluaXRpYWxpemVT aGFyZU1lbnVJdGVtKGNvbnRleHRNZW51Q29udGV4dERhdGEpOworICAgICAgICBpZiAoIWNvcmVJ dGVtLmlzTnVsbCgpKQogICAgICAgICAgICAgcHJvcG9zZWRBUElJdGVtcy5hcHBlbmQoV2ViQ29u dGV4dE1lbnVJdGVtOjpjcmVhdGUoY29yZUl0ZW0pKTsKLSAgICAgICAgfQogICAgIH0KIAogICAg IFZlY3RvcjxSZWZQdHI8V2ViQ29udGV4dE1lbnVJdGVtPj4gY2xpZW50SXRlbXM7CkBAIC00Mjk1 LDkgKzQyNzcsMTAgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmludGVybmFsU2hvd0NvbnRleHRNZW51 KGNvbnN0IEludFBvaW50JiBtZW51TG9jYXRpb24sIGNvbnN0IEMKICAgICBtX2NvbnRleHRNZW51 Q2xpZW50LT5jb250ZXh0TWVudURpc21pc3NlZCgqdGhpcyk7CiB9CiAKLSNpZiAhUExBVEZPUk0o TUFDKQotdm9pZCBXZWJQYWdlUHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0o Q29udGV4dE1lbnVJdGVtJikKKyNpZiAhRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCitDb250ZXh0 TWVudUl0ZW0gV2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJdGVtKGNv bnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmKQogeworICAgIHJldHVybiBDb250ZXh0TWVudUl0 ZW0oKTsKIH0KICNlbmRpZgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgK aW5kZXggMTg5MmQ3OWU5MzMxMTE2ZTdmMDNhNDQ3NWUwZDIyM2ZlZTBmMjg4Mi4uZmI2NDQ1Yzg5 ZGYyODdjMDJmMTJhYWI0OWZmOTAzYTliZjQxNWZkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaApAQCAtMTI2NSw4ICsxMjY1LDcgQEAgcHJpdmF0ZToKICAgICB9Owog ICAgIHZvaWQgc2hvd0NvbnRleHRNZW51KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBtZW51TG9j YXRpb24sIGNvbnN0IENvbnRleHRNZW51Q29udGV4dERhdGEmLCBjb25zdCBWZWN0b3I8V2ViQ29u dGV4dE1lbnVJdGVtRGF0YT4mLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgaW50ZXJuYWxT aG93Q29udGV4dE1lbnUoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG1lbnVMb2NhdGlvbiwgY29u c3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYsIGNvbnN0IFZlY3RvcjxXZWJDb250ZXh0TWVudUl0 ZW1EYXRhPiYsIENvbnRleHRNZW51Q2xpZW50RWxpZ2liaWxpdHksIGNvbnN0IFVzZXJEYXRhJik7 Ci0KLSAgICB2b2lkIHBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJlTWVudUl0ZW0oV2ViQ29yZTo6Q29u dGV4dE1lbnVJdGVtJik7CisgICAgV2ViQ29yZTo6Q29udGV4dE1lbnVJdGVtIHBsYXRmb3JtSW5p dGlhbGl6ZVNoYXJlTWVudUl0ZW0oY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYpOwogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoVEVMRVBIT05FX05VTUJFUl9ERVRFQ1RJT04pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1hYy5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCmluZGV4IGI2ZmJjYmZm NzE4YWEwMzczODk5YTM4MDlhNTgzNmI5ZGRhYTUyMzEuLmNkNDM0ZDJkYWJjZjM2ODU5YTY3NDY5 NjUyOWY5M2QzOGU0NDZkMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv V2ViUGFnZVByb3h5TWFjLm1tCkBAIC03NDgsOSArNzQ4LDI1IEBAIHZvaWQgV2ViUGFnZVByb3h5 OjplZGl0b3JTdGF0ZUNoYW5nZWQoY29uc3QgRWRpdG9yU3RhdGUmIGVkaXRvclN0YXRlKQogI2Vu ZGlmCiB9CiAKLXZvaWQgV2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKENvbnRleHRNZW51SXRlbSYgaXRlbSkKLXsKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9M UykKK0NvbnRleHRNZW51SXRlbSBXZWJQYWdlUHJveHk6OnBsYXRmb3JtSW5pdGlhbGl6ZVNoYXJl TWVudUl0ZW0oY29uc3QgQ29udGV4dE1lbnVDb250ZXh0RGF0YSYgY29udGV4dE1lbnVDb250ZXh0 RGF0YSkKK3sKKyAgICBjb25zdCBXZWJIaXRUZXN0UmVzdWx0OjpEYXRhJiBoaXRUZXN0RGF0YSA9 IGNvbnRleHRNZW51Q29udGV4dERhdGEud2ViSGl0VGVzdFJlc3VsdERhdGEoKTsKKworICAgIFVS TCBhYnNvbHV0ZUxpbmtVUkw7CisgICAgaWYgKCFoaXRUZXN0RGF0YS5hYnNvbHV0ZUxpbmtVUkwu aXNFbXB0eSgpKQorICAgICAgICBhYnNvbHV0ZUxpbmtVUkwgPSBVUkwoUGFyc2VkVVJMU3RyaW5n LCBoaXRUZXN0RGF0YS5hYnNvbHV0ZUxpbmtVUkwpOworCisgICAgVVJMIGRvd25sb2FkYWJsZU1l ZGlhVVJMOworICAgIGlmICghaGl0VGVzdERhdGEuYWJzb2x1dGVNZWRpYVVSTC5pc0VtcHR5KCkg JiYgaGl0VGVzdERhdGEuaXNEb3dubG9hZGFibGVNZWRpYSkKKyAgICAgICAgZG93bmxvYWRhYmxl TWVkaWFVUkwgPSBVUkwoUGFyc2VkVVJMU3RyaW5nLCBoaXRUZXN0RGF0YS5hYnNvbHV0ZU1lZGlh VVJMKTsKKworICAgIFJldGFpblB0cjxOU0ltYWdlPiBpbWFnZTsKKyAgICBpZiAoaGl0VGVzdERh dGEuaW1hZ2VTaGFyZWRNZW1vcnkgJiYgaGl0VGVzdERhdGEuaW1hZ2VTaXplKQorICAgICAgICBp bWFnZSA9IGFkb3B0TlMoW1tOU0ltYWdlIGFsbG9jXSBpbml0V2l0aERhdGE6W05TRGF0YSBkYXRh V2l0aEJ5dGVzOih1bnNpZ25lZCBjaGFyKiloaXRUZXN0RGF0YS5pbWFnZVNoYXJlZE1lbW9yeS0+ ZGF0YSgpIGxlbmd0aDpoaXRUZXN0RGF0YS5pbWFnZVNpemVdXSk7CisKKyAgICBDb250ZXh0TWVu dUl0ZW0gaXRlbSA9IENvbnRleHRNZW51SXRlbTo6c2hhcmVNZW51SXRlbShhYnNvbHV0ZUxpbmtV UkwsIGRvd25sb2FkYWJsZU1lZGlhVVJMLCBpbWFnZS5nZXQoKSwgY29udGV4dE1lbnVDb250ZXh0 RGF0YS5zZWxlY3RlZFRleHQoKSk7CisKICAgICBOU01lbnVJdGVtICpuc0l0ZW0gPSBpdGVtLnBs YXRmb3JtRGVzY3JpcHRpb24oKTsKIAogICAgIE5TU2hhcmluZ1NlcnZpY2VQaWNrZXIgKnNoYXJp bmdTZXJ2aWNlUGlja2VyID0gW25zSXRlbSByZXByZXNlbnRlZE9iamVjdF07CkBAIC03NjIsOSAr Nzc4LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpwbGF0Zm9ybUluaXRpYWxpemVTaGFyZU1lbnVJ dGVtKENvbnRleHRNZW51SXRlbSYgaXRlbSkKIAogICAgIC8vIFNldHRpbmcgdGhlIHBpY2tlciBs ZXRzIHRoZSBkZWxlZ2F0ZSByZXRhaW4gaXQgdG8ga2VlcCBpdCBhbGl2ZSwgYnV0IHRoaXMgcGlj a2VyIGlzIGtlcHQgYWxpdmUgYnkgdGhlIG1lbnUgaXRlbS4KICAgICBbW1dLU2hhcmluZ1NlcnZp Y2VQaWNrZXJEZWxlZ2F0ZSBzaGFyZWRTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRlXSBzZXRQ aWNrZXI6bmlsXTsKLSNlbmRpZgorCisgICAgcmV0dXJuIGl0ZW07CiB9Ci0gICAgCisjZW5kaWYK KwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CiAKICNlbmRpZiAvLyBQTEFURk9STShNQUMpCg==