181365 2018-01-06 10:47:55 -0800 Copying, pasting, and then deleting an attachment element breaks attachment data requests 2018-01-08 14:19:20 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh commit-queue mitz thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1386501 0 wenson_hsieh 2018-01-06 10:47:55 -0800 To reproduce: 1. Copy an attachment element 2. Paste the element 3. Delete the element Observe: -[_WKAttachment requestData:] no longer works! 1386569 1 webkit-bug-importer 2018-01-07 14:42:43 -0800 <rdar://problem/36340647> 1386577 2 330663 wenson_hsieh 2018-01-07 16:29:49 -0800 Created attachment 330663 Patch 1386590 3 330666 wenson_hsieh 2018-01-07 18:18:16 -0800 Created attachment 330666 Fix API tests on macOS 1386911 4 330666 wenson_hsieh 2018-01-08 14:14:23 -0800 Comment on attachment 330666 Fix API tests on macOS Thanks for the review! 1386914 5 330666 commit-queue 2018-01-08 14:19:18 -0800 Comment on attachment 330666 Fix API tests on macOS Clearing flags on attachment: 330666 Committed r226539: <https://trac.webkit.org/changeset/226539> 1386915 6 commit-queue 2018-01-08 14:19:20 -0800 All reviewed patches have been landed. Closing bug. 330663 2018-01-07 16:29:49 -0800 2018-01-07 18:18:15 -0800 Patch bug-181365-20180107162948.patch text/plain 19118 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ2NjZlYmEzMGFjM2Qw NWFiMTc1ZDgyYmUyODI3ZWVmYjZjYTBjNC4uMjZiNThhNjYxNmRlYmZmYTJjMWVlMzc5OWI1N2I4 ZTMzMGVhOGFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY0IEBACisyMDE4LTAxLTA3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIENvcHlpbmcsIHBh c3RpbmcsIGFuZCB0aGVuIGRlbGV0aW5nIGFuIGF0dGFjaG1lbnQgZWxlbWVudCBicmVha3MgYXR0 YWNobWVudCBkYXRhIHJlcXVlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODEzNjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2MzQwNjQ3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRs eSwgY29weWluZyBhbmQgcGFzdGluZyBhbiBhdHRhY2htZW50IGVsZW1lbnQgd2l0aGluIHRoZSBz YW1lIGRvY3VtZW50IGFuZCB0aGVuIGRlbGV0aW5nIGJhY2t3YXJkcyB0bworICAgICAgICByZW1v dmUgdGhlIHBhc3RlZCBhdHRhY2htZW50IGVsZW1lbnQgY2F1c2VzIHRoZSBvcmlnaW5hbCBhdHRh Y2htZW50IGVsZW1lbnQgdG8gYmUgaW5hY2Nlc3NpYmxlIHZpYSBTUEkuIFRoaXMgaXMKKyAgICAg ICAgYmVjYXVzZSB0aGVyZSBhcmUgbm93IHR3byBkaWZmZXJlbnQgYXR0YWNobWVudCBlbGVtZW50 cyB3aXRoIHRoZSBzYW1lIHVuaXF1ZSBpZGVudGlmaWVyLCBzdWNoIHRoYXQgRG9jdW1lbnQsCisg ICAgICAgIHdoaWNoIGtlZXBzIGEgbWFwIG9mIGFsbCB1bmlxdWUgYXR0YWNobWVudCBpZGVudGlm aWVycyB0byBhdHRhY2htZW50IGVsZW1lbnRzLCB3aWxsIGxvc2UgdHJhY2sgb2YgdGhlIG9yaWdp bmFsCisgICAgICAgIGF0dGFjaG1lbnQgZWxlbWVudC4KKworICAgICAgICBUbyBmaXggdGhpcywg d2UgZW5zdXJlIHRoYXQgYXR0YWNobWVudCBlbGVtZW50cyBzaG91bGQgYWx3YXlzIGhhdmUgdW5p cXVlIGlkZW50aWZpZXJzIHdoZW4gdGhleSBhcmUgaW5zZXJ0ZWQKKyAgICAgICAgaW50byB0aGUg ZG9jdW1lbnQuIFdlIG1ha2Ugc2V2ZXJhbCBzbWFsbCBhZGp1c3RtZW50cyB0byBhY2NvbXBsaXNo IHRoaXM6CisKKyAgICAgICAgMS4gIEZpcnN0LCByZWZhY3RvciBIVE1MQXR0YWNobWVudEVsZW1l bnQncyB1bmlxdWUgaWRlbnRpZmllciBzbyB0aGF0IGl0IG5vIGxvbmdlciBkZXBlbmRzIG9uIHRo ZSB2YWx1ZSBvZiB0aGUKKyAgICAgICAgICAgICJ3ZWJraXRhdHRhY2htZW50aWQiIGF0dHJpYnV0 ZSwgYW5kIGlzIGluc3RlYWQganVzdCBhIG1lbWJlciBvZiBIVE1MQXR0YWNobWVudEVsZW1lbnQg dGhhdCBpcyBub3QgZXhwb3NlZCB0bworICAgICAgICAgICAgRE9NIGJpbmRpbmdzLiBUaGlzIG1l YW5zIHNldHRpbmcgYW5kIHF1ZXJ5aW5nIGFuIGF0dGFjaG1lbnQgZWxlbWVudCdzIHVuaXF1ZUlk ZW50aWZpZXIgY2FuIGJlIGRvbmUgd2l0aG91dAorICAgICAgICAgICAgdHJpZ2dlcmluZyBhbnkg c2lkZSBlZmZlY3RzLCBzdWNoIGFzIGxheW91dCBvciBtdXRhdGlvbiBldmVudHMuCisKKyAgICAg ICAgMi4gIE5leHQsIG1ha2UgIndlYmtpdGF0dGFjaG1lbnRpZCIgYSB0ZW1wb3JhcnkgYXR0cmli dXRlIHNpbWlsYXIgdG8gIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBhbmQKKyAgICAgICAgICAgICJ3 ZWJraXRhdHRhY2htZW50YmxvYnVybCIsIHNvIHRoYXQgaXQgaXMgYWRkZWQgb25seSB3aGVuIGdl bmVyYXRpbmcgYSBtYXJrdXAgZnJhZ21lbnQgZm9yIGVkaXRpbmcsIGFuZAorICAgICAgICAgICAg cmVtb3ZlZCB1cG9uIGRlc2VyaWFsaXphdGlvbi4KKworICAgICAgICAzLiAgTGFzdGx5LCBzaGlm dCB0aGUgcmVzcG9uc2liaWxpdHkgb2YgYXNzaWduaW5nIGEgdW5pcXVlIGlkZW50aWZpZXIgdG8g YW4gYXR0YWNobWVudCBhd2F5IGZyb20gcGxhY2VzIHdoZXJlIHdlCisgICAgICAgICAgICBjcmVh dGUgYXR0YWNobWVudCBlbGVtZW50cywgYW5kIGluc3RlYWQgaGF2ZSBEb2N1bWVudCBlbmZvcmNl IHRoaXMgd2hlbiBhbiBhdHRhY2htZW50IGVsZW1lbnQgaXMgaW5zZXJ0ZWQuCisKKyAgICAgICAg VGVzdHM6ICBXS0F0dGFjaG1lbnRUZXN0cy5JbnNlcnRBbmRSZW1vdmVEdXBsaWNhdGVBdHRhY2ht ZW50CisgICAgICAgICAgICAgICAgV0tBdHRhY2htZW50VGVzdHMuSW5zZXJ0RHVwbGljYXRlQXR0 YWNobWVudEFuZFVwZGF0ZURhdGEKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkSW5zZXJ0QXR0YWNobWVudEVsZW1lbnQpOgorCisg ICAgICAgIEFzc2lnbiB0aGUgdW5pcXVlIGlkZW50aWZpZXIgb2YgYW4gYXR0YWNobWVudCBlbGVt ZW50IHRoYXQgaGFzIGJlZW4gaW5zZXJ0ZWQuIElmIHRoZSBpZGVudGlmaWVyIGFscmVhZHkgdHJh Y2tzCisgICAgICAgIGFuIGV4aXN0aW5nIGF0dGFjaG1lbnQgZWxlbWVudCBpbiB0aGUgZG9jdW1l bnQgb3IgaXMgbWlzc2luZywgcmVhc3NpZ24gdGhlIGlkZW50aWZpZXIgdG8gYSBuZXcgdmFsdWUu CisKKyAgICAgICAgKiBlZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbToKKyAg ICAgICAgKFdlYkNvcmU6OmNyZWF0ZUZyYWdtZW50Rm9ySW1hZ2VBdHRhY2htZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OnJlcGxhY2VSaWNoQ29udGVudFdpdGhBdHRhY2htZW50cyk6CisgICAgICAg IChXZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFkRmlsZVBhdGhzKToKKworICAgICAgICBS ZW1vdmUgY2FsbHMgdG8gc2V0VW5pcXVlSWRlbnRpZmllciBoZXJlLCBzaW5jZSBEb2N1bWVudCB3 aWxsIGFzc2lnbiBhIHVuaXF1ZSBpZGVudGlmaWVyIHVwb24gaW5zZXJ0aW9uLgorCisgICAgICAg ICogZWRpdGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkTWFya3VwQWNj dW11bGF0b3I6OmFwcGVuZEN1c3RvbUF0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlRnJhZ21lbnRGcm9tTWFya3VwKToKKworICAgICAgICBTZXQgdGhlIGF0dGFjaG1lbnQncyB1 bmlxdWUgaWRlbnRpZmllciB0byB0aGUgdmFsdWUgb2YgdGhlICJ3ZWJraXRhdHRhY2htZW50aWQi IGF0dHJpYnV0ZS4gV2hlbiBtb3ZpbmcgZXhpc3RpbmcKKyAgICAgICAgYXR0YWNobWVudHMgYXJv dW5kIGluIHRoZSBET00gd2l0aG91dCBkdXBsaWNhdGlvbiwgdGhpcyBlbnN1cmVzIHRoYXQgdGhl IGF0dGFjaG1lbnQgd2lsbCBiZSByZW1vdmVkIGFuZAorICAgICAgICByZWluc2VydGVkIGluIHRo ZSBkb2N1bWVudCB3aXRob3V0IHRyaWdnZXJpbmcgcmVtb3ZhbCBhbmQgaW5zZXJ0aW9uIGNsaWVu dCBkZWxlZ2F0ZSBtZXRob2RzLgorCisgICAgICAgIFdoZW4gcGFzdGluZyBhbiBhdHRhY2htZW50 IGVsZW1lbnQgdGhhdCBoYXMgdGhlIHNhbWUgaWRlbnRpZmllciBhcyBhbiBleGlzdGluZyBhdHRh Y2htZW50LCB3ZSBsZXQgRG9jdW1lbnQKKyAgICAgICAgcmVhbGl6ZSB0aGF0IHRoZSBhdHRhY2ht ZW50IGlkZW50aWZpZXIgYWxyZWFkeSBleGlzdHMsIGFuZCByZWFzc2lnbiBpdCB0byBhIHVuaXF1 ZSB2YWx1ZS4KKworICAgICAgICAqIGh0bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxBdHRhY2htZW50RWxlbWVudDo6dW5pcXVlSWRlbnRpZmllciBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MQXR0YWNobWVudEVsZW1lbnQ6 OnNldFVuaXF1ZUlkZW50aWZpZXIpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvSFRNTEF0dGFj aG1lbnRFbGVtZW50Lmg6CisKIDIwMTgtMDEtMDUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW0F0dGFjaG1lbnQgU3VwcG9ydF0gQWRkIGEgd2F5IHRv IHdyaXRlIGJsb2IgZGF0YSB0byBhIGZpbGUgVVJMIGZyb20gdGhlIFVJIHByb2Nlc3MKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCmluZGV4IGRiMDQ3MzZjODEyYWU1MmVlODYwODNkZGMyMTMyMWNiZmJk YmRjNDEuLjBmNDg0NzIzYTBmMWJkOGMzNTc0MzVkNzQ3N2ExMjFlZGNhYzE3ODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcApAQCAtNzU5OSw4ICs3NTk5LDEwIEBAIFZlY3RvcjxSZWZQdHI8V2Vi QW5pbWF0aW9uPj4gRG9jdW1lbnQ6OmdldEFuaW1hdGlvbnMoKQogdm9pZCBEb2N1bWVudDo6ZGlk SW5zZXJ0QXR0YWNobWVudEVsZW1lbnQoSFRNTEF0dGFjaG1lbnRFbGVtZW50JiBhdHRhY2htZW50 KQogewogICAgIGF1dG8gaWRlbnRpZmllciA9IGF0dGFjaG1lbnQudW5pcXVlSWRlbnRpZmllcigp OwotICAgIGlmICghaWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuOworICAgIGlmIChpZGVudGlm aWVyLmlzRW1wdHkoKSB8fCBtX2F0dGFjaG1lbnRJZGVudGlmaWVyVG9FbGVtZW50TWFwLmNvbnRh aW5zKGlkZW50aWZpZXIpKSB7CisgICAgICAgIGlkZW50aWZpZXIgPSBjcmVhdGVDYW5vbmljYWxV VUlEU3RyaW5nKCk7CisgICAgICAgIGF0dGFjaG1lbnQuc2V0VW5pcXVlSWRlbnRpZmllcihpZGVu dGlmaWVyKTsKKyAgICB9CiAKICAgICBtX2F0dGFjaG1lbnRJZGVudGlmaWVyVG9FbGVtZW50TWFw LnNldChpZGVudGlmaWVyLCBhdHRhY2htZW50KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQppbmRleCAyMDQ5MDNkYTk4 ZTc0MDM5Yzk3YzRlMzcyYzU5ZDEzZjVlODQ5NmE1Li4xYjlhZTNmZTQ1YzljNDg2OTI2ZThjMjdj MmU2NTE2MDA3YTZlMThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29h L1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nv Y29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQpAQCAtNTksNyArNTksNiBAQAogI2ltcG9ydCAi bWFya3VwLmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TQXR0cmlidXRlZFN0cmluZ1NQSS5o PgogI2ltcG9ydCA8d3RmL1NvZnRMaW5raW5nLmg+Ci0jaW1wb3J0IDx3dGYvVVVJRC5oPgogCiAj aWYgKFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTEwMDAwKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDEwMTMwMCkKIEBpbnRlcmZhY2UgTlNBdHRyaWJ1dGVkU3RyaW5nICgpCkBAIC0xOTQs NyArMTkzLDYgQEAgc3RhdGljIFJlZjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZv ckltYWdlQXR0YWNobWVudChEb2N1bWVudCYgZG9jdW1lbnQKIHsKICNpZiBFTkFCTEUoQVRUQUNI TUVOVF9FTEVNRU5UKQogICAgIGF1dG8gYXR0YWNobWVudCA9IEhUTUxBdHRhY2htZW50RWxlbWVu dDo6Y3JlYXRlKEhUTUxOYW1lczo6YXR0YWNobWVudFRhZywgZG9jdW1lbnQpOwotICAgIGF0dGFj aG1lbnQtPnNldFVuaXF1ZUlkZW50aWZpZXIoY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpKTsK ICAgICBhdHRhY2htZW50LT5zZXRGaWxlKEZpbGU6OmNyZWF0ZShibG9iLCBBdG9taWNTdHJpbmco ImltYWdlIikpLCBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OlVwZGF0ZURpc3BsYXlBdHRyaWJ1dGVz OjpZZXMpOwogICAgIGF0dGFjaG1lbnQtPnVwZGF0ZURpc3BsYXlNb2RlKEF0dGFjaG1lbnREaXNw bGF5TW9kZTo6SW5QbGFjZSk7CiAKQEAgLTI3NSw3ICsyNzMsNiBAQCBzdGF0aWMgdm9pZCByZXBs YWNlUmljaENvbnRlbnRXaXRoQXR0YWNobWVudHMoRG9jdW1lbnRGcmFnbWVudCYgZnJhZ21lbnQs IGNvbnN0CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvIGF0dGFjaG1lbnQg PSBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OmNyZWF0ZShIVE1MTmFtZXM6OmF0dGFjaG1lbnRUYWcs IGZyYWdtZW50LmRvY3VtZW50KCkpOwotICAgICAgICBhdHRhY2htZW50LT5zZXRVbmlxdWVJZGVu dGlmaWVyKGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSk7CiAgICAgICAgIGF0dGFjaG1lbnQt PnNldEZpbGUoV1RGTW92ZShmaWxlKSwgSFRNTEF0dGFjaG1lbnRFbGVtZW50OjpVcGRhdGVEaXNw bGF5QXR0cmlidXRlczo6WWVzKTsKICAgICAgICAgYXR0YWNobWVudC0+dXBkYXRlRGlzcGxheU1v ZGUoaW5mby5kaXNwbGF5TW9kZSk7CiAgICAgICAgIHBhcmVudC0+cmVwbGFjZUNoaWxkKGF0dGFj aG1lbnQsIGVsZW1lbnRUb1JlcGxhY2UpOwpAQCAtNjA3LDcgKzYwNCw2IEBAIGJvb2wgV2ViQ29u dGVudFJlYWRlcjo6cmVhZEZpbGVQYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpCiAj aWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKICAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVk RmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuYXR0YWNobWVudEVsZW1lbnRFbmFibGVkKCkpIHsK ICAgICAgICAgICAgIGF1dG8gYXR0YWNobWVudCA9IEhUTUxBdHRhY2htZW50RWxlbWVudDo6Y3Jl YXRlKEhUTUxOYW1lczo6YXR0YWNobWVudFRhZywgZG9jdW1lbnQpOwotICAgICAgICAgICAgYXR0 YWNobWVudC0+c2V0VW5pcXVlSWRlbnRpZmllcihjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkp OwogICAgICAgICAgICAgYXR0YWNobWVudC0+c2V0RmlsZShGaWxlOjpjcmVhdGUocGF0aCksIEhU TUxBdHRhY2htZW50RWxlbWVudDo6VXBkYXRlRGlzcGxheUF0dHJpYnV0ZXM6Olllcyk7CiAgICAg ICAgICAgICBlbnN1cmVGcmFnbWVudCgpLmFwcGVuZENoaWxkKGF0dGFjaG1lbnQpOwogICAgICAg ICAgICAgcmVhZEFueUZpbGVQYXRoID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbWFya3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcApp bmRleCA2YTZmNzY1M2ZmNGNiMTc3MDJiMDUyODMzNmEzNjk0MDk3ZTUxNjUwLi43YjNiMTkzMWU0 MDg4OTZjYjRlNDQ2ZmNiZDE3MzdkOGIxMjJmMjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL21hcmt1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAu Y3BwCkBAIC0zNzgsNiArMzc4LDcgQEAgdm9pZCBTdHlsZWRNYXJrdXBBY2N1bXVsYXRvcjo6YXBw ZW5kQ3VzdG9tQXR0cmlidXRlcyhTdHJpbmdCdWlsZGVyJiBvdXQsIGNvbnN0IEUKICAgICAgICAg cmV0dXJuOwogICAgIAogICAgIGNvbnN0IEhUTUxBdHRhY2htZW50RWxlbWVudCYgYXR0YWNobWVu dCA9IGRvd25jYXN0PEhUTUxBdHRhY2htZW50RWxlbWVudD4oZWxlbWVudCk7CisgICAgYXBwZW5k QXR0cmlidXRlKG91dCwgZWxlbWVudCwgeyB3ZWJraXRhdHRhY2htZW50aWRBdHRyLCBhdHRhY2ht ZW50LnVuaXF1ZUlkZW50aWZpZXIoKSB9LCBuYW1lc3BhY2VzKTsKICAgICBpZiAoYXV0byogZmls ZSA9IGF0dGFjaG1lbnQuZmlsZSgpKSB7CiAgICAgICAgIC8vIFRoZXNlIGF0dHJpYnV0ZXMgYXJl IG9ubHkgaW50ZW5kZWQgZm9yIEZpbGUgZGVzZXJpYWxpemF0aW9uLCBhbmQgYXJlIHJlbW92ZWQg ZnJvbSB0aGUgZ2VuZXJhdGVkIGF0dGFjaG1lbnQKICAgICAgICAgLy8gZWxlbWVudCBhZnRlciB3 ZSd2ZSBkZXNlcmlhbGl6ZWQgYW5kIHNldCBpdHMgYmFja2luZyBGaWxlLgpAQCAtNzY3LDEyICs3 NjgsMTYgQEAgUmVmPERvY3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChE b2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFN0cmluZyYKICAgICAgICAgYXR0YWNobWVudHMuYXBw ZW5kKGF0dGFjaG1lbnQpOwogCiAgICAgZm9yIChhdXRvJiBhdHRhY2htZW50IDogYXR0YWNobWVu dHMpIHsKKyAgICAgICAgYXR0YWNobWVudC0+c2V0VW5pcXVlSWRlbnRpZmllcihhdHRhY2htZW50 LT5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHdlYmtpdGF0dGFjaG1lbnRpZEF0dHIp KTsKKwogICAgICAgICBhdXRvIGF0dGFjaG1lbnRQYXRoID0gYXR0YWNobWVudC0+YXR0YWNobWVu dFBhdGgoKTsKICAgICAgICAgYXV0byBibG9iVVJMID0gYXR0YWNobWVudC0+YmxvYlVSTCgpOwog ICAgICAgICBpZiAoIWF0dGFjaG1lbnRQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGF0dGFj aG1lbnQtPnNldEZpbGUoRmlsZTo6Y3JlYXRlKGF0dGFjaG1lbnRQYXRoKSk7CiAgICAgICAgIGVs c2UgaWYgKCFibG9iVVJMLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGF0dGFjaG1lbnQtPnNldEZp bGUoRmlsZTo6ZGVzZXJpYWxpemUoeyB9LCBibG9iVVJMLCBhdHRhY2htZW50LT5hdHRhY2htZW50 VHlwZSgpLCBhdHRhY2htZW50LT5hdHRhY2htZW50VGl0bGUoKSkpOworCisgICAgICAgIGF0dGFj aG1lbnQtPnJlbW92ZUF0dHJpYnV0ZSh3ZWJraXRhdHRhY2htZW50aWRBdHRyKTsKICAgICAgICAg YXR0YWNobWVudC0+cmVtb3ZlQXR0cmlidXRlKHdlYmtpdGF0dGFjaG1lbnRwYXRoQXR0cik7CiAg ICAgICAgIGF0dGFjaG1lbnQtPnJlbW92ZUF0dHJpYnV0ZSh3ZWJraXRhdHRhY2htZW50YmxvYnVy bEF0dHIpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFj aG1lbnRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFjaG1lbnRFbGVt ZW50LmNwcAppbmRleCAxZjQ0NWU4MDYzMjcwMGM3ZTg5NTBlNzM4MTA3MDk3YzVlMDBiNDI5Li5k MzcwOGZhZDA5ZWVkZTNhZjY4OTUyMDRjNjE2ZTYxY2RkMTA3ZjVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQXR0YWNobWVudEVsZW1lbnQuY3BwCkBAIC0xODIsMTYgKzE4Miw2IEBA IHZvaWQgSFRNTEF0dGFjaG1lbnRFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZp ZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tCiAgICAgSFRNTEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRl KG5hbWUsIHZhbHVlKTsKIH0KIAotU3RyaW5nIEhUTUxBdHRhY2htZW50RWxlbWVudDo6dW5pcXVl SWRlbnRpZmllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJv bml6YXRpb24oSFRNTE5hbWVzOjp3ZWJraXRhdHRhY2htZW50aWRBdHRyKTsKLX0KLQotdm9pZCBI VE1MQXR0YWNobWVudEVsZW1lbnQ6OnNldFVuaXF1ZUlkZW50aWZpZXIoY29uc3QgU3RyaW5nJiBp ZGVudGlmaWVyKQotewotICAgIHNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRN TE5hbWVzOjp3ZWJraXRhdHRhY2htZW50aWRBdHRyLCBpZGVudGlmaWVyKTsKLX0KLQogU3RyaW5n IEhUTUxBdHRhY2htZW50RWxlbWVudDo6YXR0YWNobWVudFRpdGxlKCkgY29uc3QKIHsKICAgICBh dXRvJiB0aXRsZSA9IGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24odGl0bGVBdHRyKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5oCmluZGV4IDE3OTVk MWZkMGI5Y2IwYjE5YzI3MTU1YjBjMTVlNTMyNWY0MDA3NGQuLmIzMjIzZmFkNGE2OWM2ZjE0Nzk3 YzU5ZGRlODQxYmVlM2QxNDFlYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TEF0dGFjaG1lbnRFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0YWNo bWVudEVsZW1lbnQuaApAQCAtNDksOCArNDksOCBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBV cGRhdGVEaXNwbGF5QXR0cmlidXRlcyB7IE5vLCBZZXMgfTsKICAgICB2b2lkIHNldEZpbGUoUmVm UHRyPEZpbGU+JiYsIFVwZGF0ZURpc3BsYXlBdHRyaWJ1dGVzID0gVXBkYXRlRGlzcGxheUF0dHJp YnV0ZXM6Ok5vKTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyB1bmlxdWVJZGVudGlmaWVy KCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRVbmlxdWVJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYpOwor ICAgIFN0cmluZyB1bmlxdWVJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV91bmlxdWVJZGVu dGlmaWVyOyB9CisgICAgdm9pZCBzZXRVbmlxdWVJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgdW5p cXVlSWRlbnRpZmllcikgeyBtX3VuaXF1ZUlkZW50aWZpZXIgPSB1bmlxdWVJZGVudGlmaWVyOyB9 CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZURpc3BsYXlNb2RlKEF0dGFjaG1lbnRE aXNwbGF5TW9kZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVGaWxlV2l0aERhdGEo UmVmPFNoYXJlZEJ1ZmZlcj4mJiBkYXRhLCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4mJiBuZXdDb250 ZW50VHlwZSA9IHN0ZDo6bnVsbG9wdCwgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiYgbmV3RmlsZW5h bWUgPSBzdGQ6Om51bGxvcHQpOwpAQCAtMTAwLDYgKzEwMCw3IEBAIHByaXZhdGU6CiAgICAgCiAg ICAgUmVmUHRyPEZpbGU+IG1fZmlsZTsKICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPEF0dGFj aG1lbnREYXRhUmVhZGVyPj4gbV9hdHRhY2htZW50UmVhZGVyczsKKyAgICBTdHJpbmcgbV91bmlx dWVJZGVudGlmaWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDIxNDhiNjBiYzQ1NTVhZDBi Y2E5Zjc4N2UxYjI2NGNkNWU3YjA2NTguLjU0ZDJiOWNlNDk4MDYwNTM0MTY3MzNhNjU3NzlmZDkx ODQ3NGQ1YTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wMS0wNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBDb3B5aW5nLCBwYXN0aW5nLCBhbmQgdGhlbiBkZWxl dGluZyBhbiBhdHRhY2htZW50IGVsZW1lbnQgYnJlYWtzIGF0dGFjaG1lbnQgZGF0YSByZXF1ZXN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMzY1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjM0MDY0Nz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIHR3byBuZXcgYXR0YWNobWVudCBBUEkg dGVzdHMgdG8gdmVyaWZ5IHRoYXQgY29weWluZyBhbmQgcGFzdGluZyBhbiBleGlzdGluZyBhdHRh Y2htZW50IGluc2VydHMgYW4KKyAgICAgICAgYXR0YWNobWVudCBlbGVtZW50IHRoYXQgbWF5IGJl IGVkaXRlZCBpbmRlcGVuZGVudGx5IG9mIHRoZSBvcmlnaW5hbCBhdHRhY2htZW50LiBTZWUgV2Vi Q29yZS9DaGFuZ2VMb2cgZm9yIG1vcmUKKyAgICAgICAgZGV0YWlsLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbToKKyAgICAg ICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE4LTAxLTA1ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVzdHJpY3QgbmF2aWdhdGlv bi10aW1lIFdLV2Vic2l0ZURhdGFTdG9yZSBzd2FwcGluZyB0byBtYWluIGZyYW1lIG5hdmlnYXRp b25zCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dL QXR0YWNobWVudFRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS0F0dGFjaG1lbnRUZXN0cy5tbQppbmRleCA3NDM1NDdkM2M3N2FjZTkxMTU4NzZmNWM4NGE5 ODM5ZGI2YzY4ZDZiLi5kZmYzYTE2MGE1MTlhZDIzYjgzNmQ5NDYyMDlkYzZkYTAwMTJiNDYxIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNo bWVudFRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tBdHRhY2htZW50VGVzdHMubW0KQEAgLTQ0Nyw2ICs0NDcsNyBAQCBURVNUKFdLQXR0YWNobWVu dFRlc3RzLCBBdHRhY2htZW50RWxlbWVudEluc2VydGlvbikKICAgICBbc2Vjb25kQXR0YWNobWVu dCBleHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SW1hZ2VEYXRhKCldOwogICAgIEVYUEVDVF9G QUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9y UXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7CiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3 IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAi YXR0YWNobWVudCJdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFzQXR0cmlidXRlOkAi d2Via2l0YXR0YWNobWVudGlkIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKIH0K IAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5n QW5kRGVsZXRpbmdOZXdsaW5lKQpAQCAtNTE0LDYgKzUxNSw3IEBAIFRFU1QoV0tBdHRhY2htZW50 VGVzdHMsIEF0dGFjaG1lbnRVcGRhdGVzV2hlbkNoYW5naW5nRm9udFN0eWxlcykKICAgICBbYXR0 YWNobWVudCBleHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJs IiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dl YlZpZXcgaGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0 b3I6QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1 dGU6QCJ3ZWJraXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0p OwogCiAgICAgLy8gSW5zZXJ0aW5nIHRleHQgc2hvdWxkIGRlbGV0ZSB0aGUgY3VycmVudCBzZWxl Y3Rpb24sIHJlbW92aW5nIHRoZSBhdHRhY2htZW50IGluIHRoZSBwcm9jZXNzLgogICAgIFt3ZWJW aWV3IGV4cGVjdFVwZGF0ZXNBZnRlckNvbW1hbmQ6QCJJbnNlcnRUZXh0IiB3aXRoQXJndW1lbnQ6 QCJmb28iIGV4cGVjdGVkUmVtb3ZhbHM6QFthdHRhY2htZW50LmdldCgpXSBleHBlY3RlZEluc2Vy dGlvbnM6QFtdXTsKQEAgLTUzNyw2ICs1MzksNyBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBB dHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdMaXN0cykKICAgICBbYXR0YWNobWVudCBleHBl Y3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQRUNUX0ZBTFNFKFt3 ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJsIiBmb3JRdWVyeVNl bGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFzQXR0 cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2ht ZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRh dHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOwogfQogCiBURVNU KFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdSaWNoTWFy a3VwKQpAQCAtNTQ1LDEyICs1NDgsMTMgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNo bWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5nUmljaE1hcmt1cCkKICAgICBSZXRhaW5QdHI8X1dLQXR0 YWNobWVudD4gYXR0YWNobWVudDsKICAgICB7CiAgICAgICAgIE9ic2VydmVBdHRhY2htZW50VXBk YXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOwotICAgICAgICBbd2ViVmlldyBf c3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIkluc2VydEhUTUwiIGFyZ3VtZW50OkAi PGRpdj48c3Ryb25nPjxhdHRhY2htZW50IHRpdGxlPSdhJyB3ZWJraXRhdHRhY2htZW50aWQ9J2Ew NmZlYzQxLTlhYTAtNGMyYy1iYTNhLTAxNDliNTRhYWQ5OSc+PC9hdHRhY2htZW50Pjwvc3Ryb25n PjwvZGl2PiJdOworICAgICAgICBbd2ViVmlldyBfc3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29t bWFuZDpAIkluc2VydEhUTUwiIGFyZ3VtZW50OkAiPGRpdj48c3Ryb25nPjxhdHRhY2htZW50IHRp dGxlPSdhJz48L2F0dGFjaG1lbnQ+PC9zdHJvbmc+PC9kaXY+Il07CiAgICAgICAgIGF0dGFjaG1l bnQgPSBvYnNlcnZlci5vYnNlcnZlcigpLmluc2VydGVkWzBdOwogICAgICAgICBvYnNlcnZlci5l eHBlY3RBdHRhY2htZW50VXBkYXRlcyhAWyBdLCBAW2F0dGFjaG1lbnQuZ2V0KCldKTsKICAgICB9 CiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1l bnRibG9idXJsIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1Rf RkFMU0UoW3dlYlZpZXcgaGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1 ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBo YXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRh Y2htZW50Il0pOwogICAgIHsKICAgICAgICAgT2JzZXJ2ZUF0dGFjaG1lbnRVcGRhdGVzRm9yU2Nv cGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CiAgICAgICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZh bHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdhdHRhY2htZW50Jyku cmVtb3ZlKCkiXTsKQEAgLTU4NSw2ICs1ODksNyBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBB dHRhY2htZW50VXBkYXRlc1doZW5DdXR0aW5nQW5kUGFzdGluZykKICAgICBbYXR0YWNobWVudCBl eHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQRUNUX0ZBTFNF KFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJsIiBmb3JRdWVy eVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFz QXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRh Y2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJr aXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOwogfQogCiBU RVNUKFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2htZW50RGF0YUZvckVtcHR5RmlsZSkKQEAgLTky NSw2ICs5MzAsNzEgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgRG9Ob3RJbnNlcnREYXRhVVJM SW1hZ2VzQXNBdHRhY2htZW50cykKICAgICBFWFBFQ1RfV0tfU1RSRVEoIlRoaXMgaXMgYW4gYXBw bGUiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYm9k eS50ZXh0Q29udGVudCJdKTsKIH0KIAorVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgSW5zZXJ0QW5k UmVtb3ZlRHVwbGljYXRlQXR0YWNobWVudCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3 Rm9yVGVzdGluZ0F0dGFjaG1lbnRzKCk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gZGF0YSA9IHRl c3RIVE1MRGF0YSgpOworICAgIFJldGFpblB0cjxfV0tBdHRhY2htZW50PiBvcmlnaW5hbEF0dGFj aG1lbnQ7CisgICAgUmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IHBhc3RlZEF0dGFjaG1lbnQ7Cisg ICAgeworICAgICAgICBPYnNlcnZlQXR0YWNobWVudFVwZGF0ZXNGb3JTY29wZSBvYnNlcnZlcih3 ZWJWaWV3LmdldCgpKTsKKyAgICAgICAgb3JpZ2luYWxBdHRhY2htZW50ID0gW3dlYlZpZXcgc3lu Y2hyb25vdXNseUluc2VydEF0dGFjaG1lbnRXaXRoRmlsZW5hbWU6QCJmb28udHh0IiBjb250ZW50 VHlwZTpAInRleHQvcGxhaW4iIGRhdGE6ZGF0YS5nZXQoKSBvcHRpb25zOm5pbF07CisgICAgICAg IEVYUEVDVF9FUSgwVSwgb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5yZW1vdmVkLmNvdW50KTsKKyAgICAg ICAgb2JzZXJ2ZXIuZXhwZWN0QXR0YWNobWVudFVwZGF0ZXMoQFtdLCBAW29yaWdpbmFsQXR0YWNo bWVudC5nZXQoKV0pOworICAgIH0KKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAgICBb d2ViVmlldyBjb3B5Om5pbF07CisgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAiZ2V0 U2VsZWN0aW9uKCkuY29sbGFwc2VUb0VuZCgpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAg IHsKKyAgICAgICAgT2JzZXJ2ZUF0dGFjaG1lbnRVcGRhdGVzRm9yU2NvcGUgb2JzZXJ2ZXIod2Vi Vmlldy5nZXQoKSk7CisgICAgICAgIFt3ZWJWaWV3IF9zeW5jaHJvbm91c2x5RXhlY3V0ZUVkaXRD b21tYW5kOkAiUGFzdGUiIGFyZ3VtZW50Om5pbF07CisgICAgICAgIEVYUEVDVF9FUSgwVSwgb2Jz ZXJ2ZXIub2JzZXJ2ZXIoKS5yZW1vdmVkLmNvdW50KTsKKyAgICAgICAgRVhQRUNUX0VRKDFVLCBv YnNlcnZlci5vYnNlcnZlcigpLmluc2VydGVkLmNvdW50KTsKKyAgICAgICAgcGFzdGVkQXR0YWNo bWVudCA9IG9ic2VydmVyLm9ic2VydmVyKCkuaW5zZXJ0ZWQuZmlyc3RPYmplY3Q7CisgICAgICAg IEVYUEVDVF9GQUxTRShbcGFzdGVkQXR0YWNobWVudCBpc0VxdWFsOm9yaWdpbmFsQXR0YWNobWVu dC5nZXQoKV0pOworICAgIH0KKyAgICB7CisgICAgICAgIE9ic2VydmVBdHRhY2htZW50VXBkYXRl c0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOworICAgICAgICBbd2ViVmlldyBfc3lu Y2hyb25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIkRlbGV0ZUJhY2t3YXJkIiBhcmd1bWVudDpu aWxdOworICAgICAgICBvYnNlcnZlci5leHBlY3RBdHRhY2htZW50VXBkYXRlcyhAW3Bhc3RlZEF0 dGFjaG1lbnQuZ2V0KCldLCBAW10pOworICAgICAgICBbb3JpZ2luYWxBdHRhY2htZW50IGV4cGVj dFJlcXVlc3RlZERhdGFUb0JlOmRhdGEuZ2V0KCldOworICAgIH0KKyAgICB7CisgICAgICAgIE9i c2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOwor ICAgICAgICBbd2ViVmlldyBfc3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIkRlbGV0 ZUJhY2t3YXJkIiBhcmd1bWVudDpuaWxdOworICAgICAgICBvYnNlcnZlci5leHBlY3RBdHRhY2ht ZW50VXBkYXRlcyhAW29yaWdpbmFsQXR0YWNobWVudC5nZXQoKV0sIEBbXSk7CisgICAgfQorfQor CitURVNUKFdLQXR0YWNobWVudFRlc3RzLCBJbnNlcnREdXBsaWNhdGVBdHRhY2htZW50QW5kVXBk YXRlRGF0YSkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3Rm9yVGVzdGluZ0F0dGFjaG1l bnRzKCk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gb3JpZ2luYWxEYXRhID0gdGVzdEhUTUxEYXRh KCk7CisgICAgUmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IG9yaWdpbmFsQXR0YWNobWVudDsKKyAg ICBSZXRhaW5QdHI8X1dLQXR0YWNobWVudD4gcGFzdGVkQXR0YWNobWVudDsKKyAgICB7CisgICAg ICAgIE9ic2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0 KCkpOworICAgICAgICBvcmlnaW5hbEF0dGFjaG1lbnQgPSBbd2ViVmlldyBzeW5jaHJvbm91c2x5 SW5zZXJ0QXR0YWNobWVudFdpdGhGaWxlbmFtZTpAImZvby50eHQiIGNvbnRlbnRUeXBlOkAidGV4 dC9wbGFpbiIgZGF0YTpvcmlnaW5hbERhdGEuZ2V0KCkgb3B0aW9uczpuaWxdOworICAgICAgICBF WFBFQ1RfRVEoMFUsIG9ic2VydmVyLm9ic2VydmVyKCkucmVtb3ZlZC5jb3VudCk7CisgICAgICAg IG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbXSwgQFtvcmlnaW5hbEF0dGFjaG1l bnQuZ2V0KCldKTsKKyAgICB9CisgICAgW3dlYlZpZXcgc2VsZWN0QWxsOm5pbF07CisgICAgW3dl YlZpZXcgY29weTpuaWxdOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAImdldFNl bGVjdGlvbigpLmNvbGxhcHNlVG9FbmQoKSIgY29tcGxldGlvbkhhbmRsZXI6bmlsXTsKKyAgICB7 CisgICAgICAgIE9ic2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZp ZXcuZ2V0KCkpOworICAgICAgICBbd2ViVmlldyBfc3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29t bWFuZDpAIlBhc3RlIiBhcmd1bWVudDpuaWxdOworICAgICAgICBFWFBFQ1RfRVEoMFUsIG9ic2Vy dmVyLm9ic2VydmVyKCkucmVtb3ZlZC5jb3VudCk7CisgICAgICAgIEVYUEVDVF9FUSgxVSwgb2Jz ZXJ2ZXIub2JzZXJ2ZXIoKS5pbnNlcnRlZC5jb3VudCk7CisgICAgICAgIHBhc3RlZEF0dGFjaG1l bnQgPSBvYnNlcnZlci5vYnNlcnZlcigpLmluc2VydGVkLmZpcnN0T2JqZWN0OworICAgICAgICBF WFBFQ1RfRkFMU0UoW3Bhc3RlZEF0dGFjaG1lbnQgaXNFcXVhbDpvcmlnaW5hbEF0dGFjaG1lbnQu Z2V0KCldKTsKKyAgICB9CisgICAgYXV0byB1cGRhdGVkRGF0YSA9IHJldGFpblB0cihbQCJIRUxM TyBXT1JMRCIgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddKTsKKyAgICBb b3JpZ2luYWxBdHRhY2htZW50IHN5bmNocm9ub3VzbHlTZXREYXRhOnVwZGF0ZWREYXRhLmdldCgp IG5ld0NvbnRlbnRUeXBlOm5pbCBuZXdGaWxlbmFtZTpuaWwgZXJyb3I6bmlsXTsKKyAgICBbb3Jp Z2luYWxBdHRhY2htZW50IGV4cGVjdFJlcXVlc3RlZERhdGFUb0JlOnVwZGF0ZWREYXRhLmdldCgp XTsKKyAgICBbcGFzdGVkQXR0YWNobWVudCBleHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTpvcmlnaW5h bERhdGEuZ2V0KCldOworfQorCiAjcHJhZ21hIG1hcmsgLSBQbGF0Zm9ybS1zcGVjaWZpYyB0ZXN0 cwogCiAjaWYgUExBVEZPUk0oTUFDKQo= 330666 2018-01-07 18:18:16 -0800 2018-01-08 14:19:18 -0800 Fix API tests on macOS bug-181365-20180107181815.patch text/plain 19212 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2NDc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWQ2NjZlYmEzMGFjM2Qw NWFiMTc1ZDgyYmUyODI3ZWVmYjZjYTBjNC4uMjZiNThhNjYxNmRlYmZmYTJjMWVlMzc5OWI1N2I4 ZTMzMGVhOGFjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDY0IEBACisyMDE4LTAxLTA3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIENvcHlpbmcsIHBh c3RpbmcsIGFuZCB0aGVuIGRlbGV0aW5nIGFuIGF0dGFjaG1lbnQgZWxlbWVudCBicmVha3MgYXR0 YWNobWVudCBkYXRhIHJlcXVlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xODEzNjUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2MzQwNjQ3Pgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRs eSwgY29weWluZyBhbmQgcGFzdGluZyBhbiBhdHRhY2htZW50IGVsZW1lbnQgd2l0aGluIHRoZSBz YW1lIGRvY3VtZW50IGFuZCB0aGVuIGRlbGV0aW5nIGJhY2t3YXJkcyB0bworICAgICAgICByZW1v dmUgdGhlIHBhc3RlZCBhdHRhY2htZW50IGVsZW1lbnQgY2F1c2VzIHRoZSBvcmlnaW5hbCBhdHRh Y2htZW50IGVsZW1lbnQgdG8gYmUgaW5hY2Nlc3NpYmxlIHZpYSBTUEkuIFRoaXMgaXMKKyAgICAg ICAgYmVjYXVzZSB0aGVyZSBhcmUgbm93IHR3byBkaWZmZXJlbnQgYXR0YWNobWVudCBlbGVtZW50 cyB3aXRoIHRoZSBzYW1lIHVuaXF1ZSBpZGVudGlmaWVyLCBzdWNoIHRoYXQgRG9jdW1lbnQsCisg ICAgICAgIHdoaWNoIGtlZXBzIGEgbWFwIG9mIGFsbCB1bmlxdWUgYXR0YWNobWVudCBpZGVudGlm aWVycyB0byBhdHRhY2htZW50IGVsZW1lbnRzLCB3aWxsIGxvc2UgdHJhY2sgb2YgdGhlIG9yaWdp bmFsCisgICAgICAgIGF0dGFjaG1lbnQgZWxlbWVudC4KKworICAgICAgICBUbyBmaXggdGhpcywg d2UgZW5zdXJlIHRoYXQgYXR0YWNobWVudCBlbGVtZW50cyBzaG91bGQgYWx3YXlzIGhhdmUgdW5p cXVlIGlkZW50aWZpZXJzIHdoZW4gdGhleSBhcmUgaW5zZXJ0ZWQKKyAgICAgICAgaW50byB0aGUg ZG9jdW1lbnQuIFdlIG1ha2Ugc2V2ZXJhbCBzbWFsbCBhZGp1c3RtZW50cyB0byBhY2NvbXBsaXNo IHRoaXM6CisKKyAgICAgICAgMS4gIEZpcnN0LCByZWZhY3RvciBIVE1MQXR0YWNobWVudEVsZW1l bnQncyB1bmlxdWUgaWRlbnRpZmllciBzbyB0aGF0IGl0IG5vIGxvbmdlciBkZXBlbmRzIG9uIHRo ZSB2YWx1ZSBvZiB0aGUKKyAgICAgICAgICAgICJ3ZWJraXRhdHRhY2htZW50aWQiIGF0dHJpYnV0 ZSwgYW5kIGlzIGluc3RlYWQganVzdCBhIG1lbWJlciBvZiBIVE1MQXR0YWNobWVudEVsZW1lbnQg dGhhdCBpcyBub3QgZXhwb3NlZCB0bworICAgICAgICAgICAgRE9NIGJpbmRpbmdzLiBUaGlzIG1l YW5zIHNldHRpbmcgYW5kIHF1ZXJ5aW5nIGFuIGF0dGFjaG1lbnQgZWxlbWVudCdzIHVuaXF1ZUlk ZW50aWZpZXIgY2FuIGJlIGRvbmUgd2l0aG91dAorICAgICAgICAgICAgdHJpZ2dlcmluZyBhbnkg c2lkZSBlZmZlY3RzLCBzdWNoIGFzIGxheW91dCBvciBtdXRhdGlvbiBldmVudHMuCisKKyAgICAg ICAgMi4gIE5leHQsIG1ha2UgIndlYmtpdGF0dGFjaG1lbnRpZCIgYSB0ZW1wb3JhcnkgYXR0cmli dXRlIHNpbWlsYXIgdG8gIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBhbmQKKyAgICAgICAgICAgICJ3 ZWJraXRhdHRhY2htZW50YmxvYnVybCIsIHNvIHRoYXQgaXQgaXMgYWRkZWQgb25seSB3aGVuIGdl bmVyYXRpbmcgYSBtYXJrdXAgZnJhZ21lbnQgZm9yIGVkaXRpbmcsIGFuZAorICAgICAgICAgICAg cmVtb3ZlZCB1cG9uIGRlc2VyaWFsaXphdGlvbi4KKworICAgICAgICAzLiAgTGFzdGx5LCBzaGlm dCB0aGUgcmVzcG9uc2liaWxpdHkgb2YgYXNzaWduaW5nIGEgdW5pcXVlIGlkZW50aWZpZXIgdG8g YW4gYXR0YWNobWVudCBhd2F5IGZyb20gcGxhY2VzIHdoZXJlIHdlCisgICAgICAgICAgICBjcmVh dGUgYXR0YWNobWVudCBlbGVtZW50cywgYW5kIGluc3RlYWQgaGF2ZSBEb2N1bWVudCBlbmZvcmNl IHRoaXMgd2hlbiBhbiBhdHRhY2htZW50IGVsZW1lbnQgaXMgaW5zZXJ0ZWQuCisKKyAgICAgICAg VGVzdHM6ICBXS0F0dGFjaG1lbnRUZXN0cy5JbnNlcnRBbmRSZW1vdmVEdXBsaWNhdGVBdHRhY2ht ZW50CisgICAgICAgICAgICAgICAgV0tBdHRhY2htZW50VGVzdHMuSW5zZXJ0RHVwbGljYXRlQXR0 YWNobWVudEFuZFVwZGF0ZURhdGEKKworICAgICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGlkSW5zZXJ0QXR0YWNobWVudEVsZW1lbnQpOgorCisg ICAgICAgIEFzc2lnbiB0aGUgdW5pcXVlIGlkZW50aWZpZXIgb2YgYW4gYXR0YWNobWVudCBlbGVt ZW50IHRoYXQgaGFzIGJlZW4gaW5zZXJ0ZWQuIElmIHRoZSBpZGVudGlmaWVyIGFscmVhZHkgdHJh Y2tzCisgICAgICAgIGFuIGV4aXN0aW5nIGF0dGFjaG1lbnQgZWxlbWVudCBpbiB0aGUgZG9jdW1l bnQgb3IgaXMgbWlzc2luZywgcmVhc3NpZ24gdGhlIGlkZW50aWZpZXIgdG8gYSBuZXcgdmFsdWUu CisKKyAgICAgICAgKiBlZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbToKKyAg ICAgICAgKFdlYkNvcmU6OmNyZWF0ZUZyYWdtZW50Rm9ySW1hZ2VBdHRhY2htZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OnJlcGxhY2VSaWNoQ29udGVudFdpdGhBdHRhY2htZW50cyk6CisgICAgICAg IChXZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFkRmlsZVBhdGhzKToKKworICAgICAgICBS ZW1vdmUgY2FsbHMgdG8gc2V0VW5pcXVlSWRlbnRpZmllciBoZXJlLCBzaW5jZSBEb2N1bWVudCB3 aWxsIGFzc2lnbiBhIHVuaXF1ZSBpZGVudGlmaWVyIHVwb24gaW5zZXJ0aW9uLgorCisgICAgICAg ICogZWRpdGluZy9tYXJrdXAuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkTWFya3VwQWNj dW11bGF0b3I6OmFwcGVuZEN1c3RvbUF0dHJpYnV0ZXMpOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlRnJhZ21lbnRGcm9tTWFya3VwKToKKworICAgICAgICBTZXQgdGhlIGF0dGFjaG1lbnQncyB1 bmlxdWUgaWRlbnRpZmllciB0byB0aGUgdmFsdWUgb2YgdGhlICJ3ZWJraXRhdHRhY2htZW50aWQi IGF0dHJpYnV0ZS4gV2hlbiBtb3ZpbmcgZXhpc3RpbmcKKyAgICAgICAgYXR0YWNobWVudHMgYXJv dW5kIGluIHRoZSBET00gd2l0aG91dCBkdXBsaWNhdGlvbiwgdGhpcyBlbnN1cmVzIHRoYXQgdGhl IGF0dGFjaG1lbnQgd2lsbCBiZSByZW1vdmVkIGFuZAorICAgICAgICByZWluc2VydGVkIGluIHRo ZSBkb2N1bWVudCB3aXRob3V0IHRyaWdnZXJpbmcgcmVtb3ZhbCBhbmQgaW5zZXJ0aW9uIGNsaWVu dCBkZWxlZ2F0ZSBtZXRob2RzLgorCisgICAgICAgIFdoZW4gcGFzdGluZyBhbiBhdHRhY2htZW50 IGVsZW1lbnQgdGhhdCBoYXMgdGhlIHNhbWUgaWRlbnRpZmllciBhcyBhbiBleGlzdGluZyBhdHRh Y2htZW50LCB3ZSBsZXQgRG9jdW1lbnQKKyAgICAgICAgcmVhbGl6ZSB0aGF0IHRoZSBhdHRhY2ht ZW50IGlkZW50aWZpZXIgYWxyZWFkeSBleGlzdHMsIGFuZCByZWFzc2lnbiBpdCB0byBhIHVuaXF1 ZSB2YWx1ZS4KKworICAgICAgICAqIGh0bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxBdHRhY2htZW50RWxlbWVudDo6dW5pcXVlSWRlbnRpZmllciBj b25zdCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MQXR0YWNobWVudEVsZW1lbnQ6 OnNldFVuaXF1ZUlkZW50aWZpZXIpOiBEZWxldGVkLgorICAgICAgICAqIGh0bWwvSFRNTEF0dGFj aG1lbnRFbGVtZW50Lmg6CisKIDIwMTgtMDEtMDUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgW0F0dGFjaG1lbnQgU3VwcG9ydF0gQWRkIGEgd2F5IHRv IHdyaXRlIGJsb2IgZGF0YSB0byBhIGZpbGUgVVJMIGZyb20gdGhlIFVJIHByb2Nlc3MKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCmluZGV4IGRiMDQ3MzZjODEyYWU1MmVlODYwODNkZGMyMTMyMWNiZmJk YmRjNDEuLjBmNDg0NzIzYTBmMWJkOGMzNTc0MzVkNzQ3N2ExMjFlZGNhYzE3ODIgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcApAQCAtNzU5OSw4ICs3NTk5LDEwIEBAIFZlY3RvcjxSZWZQdHI8V2Vi QW5pbWF0aW9uPj4gRG9jdW1lbnQ6OmdldEFuaW1hdGlvbnMoKQogdm9pZCBEb2N1bWVudDo6ZGlk SW5zZXJ0QXR0YWNobWVudEVsZW1lbnQoSFRNTEF0dGFjaG1lbnRFbGVtZW50JiBhdHRhY2htZW50 KQogewogICAgIGF1dG8gaWRlbnRpZmllciA9IGF0dGFjaG1lbnQudW5pcXVlSWRlbnRpZmllcigp OwotICAgIGlmICghaWRlbnRpZmllcikKLSAgICAgICAgcmV0dXJuOworICAgIGlmIChpZGVudGlm aWVyLmlzRW1wdHkoKSB8fCBtX2F0dGFjaG1lbnRJZGVudGlmaWVyVG9FbGVtZW50TWFwLmNvbnRh aW5zKGlkZW50aWZpZXIpKSB7CisgICAgICAgIGlkZW50aWZpZXIgPSBjcmVhdGVDYW5vbmljYWxV VUlEU3RyaW5nKCk7CisgICAgICAgIGF0dGFjaG1lbnQuc2V0VW5pcXVlSWRlbnRpZmllcihpZGVu dGlmaWVyKTsKKyAgICB9CiAKICAgICBtX2F0dGFjaG1lbnRJZGVudGlmaWVyVG9FbGVtZW50TWFw LnNldChpZGVudGlmaWVyLCBhdHRhY2htZW50KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQppbmRleCAyMDQ5MDNkYTk4 ZTc0MDM5Yzk3YzRlMzcyYzU5ZDEzZjVlODQ5NmE1Li4xYjlhZTNmZTQ1YzljNDg2OTI2ZThjMjdj MmU2NTE2MDA3YTZlMThjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29h L1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2Nv Y29hL1dlYkNvbnRlbnRSZWFkZXJDb2NvYS5tbQpAQCAtNTksNyArNTksNiBAQAogI2ltcG9ydCAi bWFya3VwLmgiCiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TQXR0cmlidXRlZFN0cmluZ1NQSS5o PgogI2ltcG9ydCA8d3RmL1NvZnRMaW5raW5nLmg+Ci0jaW1wb3J0IDx3dGYvVVVJRC5oPgogCiAj aWYgKFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTEwMDAwKSB8fCAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDEwMTMwMCkKIEBpbnRlcmZhY2UgTlNBdHRyaWJ1dGVkU3RyaW5nICgpCkBAIC0xOTQs NyArMTkzLDYgQEAgc3RhdGljIFJlZjxEb2N1bWVudEZyYWdtZW50PiBjcmVhdGVGcmFnbWVudEZv ckltYWdlQXR0YWNobWVudChEb2N1bWVudCYgZG9jdW1lbnQKIHsKICNpZiBFTkFCTEUoQVRUQUNI TUVOVF9FTEVNRU5UKQogICAgIGF1dG8gYXR0YWNobWVudCA9IEhUTUxBdHRhY2htZW50RWxlbWVu dDo6Y3JlYXRlKEhUTUxOYW1lczo6YXR0YWNobWVudFRhZywgZG9jdW1lbnQpOwotICAgIGF0dGFj aG1lbnQtPnNldFVuaXF1ZUlkZW50aWZpZXIoY3JlYXRlQ2Fub25pY2FsVVVJRFN0cmluZygpKTsK ICAgICBhdHRhY2htZW50LT5zZXRGaWxlKEZpbGU6OmNyZWF0ZShibG9iLCBBdG9taWNTdHJpbmco ImltYWdlIikpLCBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OlVwZGF0ZURpc3BsYXlBdHRyaWJ1dGVz OjpZZXMpOwogICAgIGF0dGFjaG1lbnQtPnVwZGF0ZURpc3BsYXlNb2RlKEF0dGFjaG1lbnREaXNw bGF5TW9kZTo6SW5QbGFjZSk7CiAKQEAgLTI3NSw3ICsyNzMsNiBAQCBzdGF0aWMgdm9pZCByZXBs YWNlUmljaENvbnRlbnRXaXRoQXR0YWNobWVudHMoRG9jdW1lbnRGcmFnbWVudCYgZnJhZ21lbnQs IGNvbnN0CiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBhdXRvIGF0dGFjaG1lbnQg PSBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OmNyZWF0ZShIVE1MTmFtZXM6OmF0dGFjaG1lbnRUYWcs IGZyYWdtZW50LmRvY3VtZW50KCkpOwotICAgICAgICBhdHRhY2htZW50LT5zZXRVbmlxdWVJZGVu dGlmaWVyKGNyZWF0ZUNhbm9uaWNhbFVVSURTdHJpbmcoKSk7CiAgICAgICAgIGF0dGFjaG1lbnQt PnNldEZpbGUoV1RGTW92ZShmaWxlKSwgSFRNTEF0dGFjaG1lbnRFbGVtZW50OjpVcGRhdGVEaXNw bGF5QXR0cmlidXRlczo6WWVzKTsKICAgICAgICAgYXR0YWNobWVudC0+dXBkYXRlRGlzcGxheU1v ZGUoaW5mby5kaXNwbGF5TW9kZSk7CiAgICAgICAgIHBhcmVudC0+cmVwbGFjZUNoaWxkKGF0dGFj aG1lbnQsIGVsZW1lbnRUb1JlcGxhY2UpOwpAQCAtNjA3LDcgKzYwNCw2IEBAIGJvb2wgV2ViQ29u dGVudFJlYWRlcjo6cmVhZEZpbGVQYXRocyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGF0aHMpCiAj aWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKICAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVk RmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuYXR0YWNobWVudEVsZW1lbnRFbmFibGVkKCkpIHsK ICAgICAgICAgICAgIGF1dG8gYXR0YWNobWVudCA9IEhUTUxBdHRhY2htZW50RWxlbWVudDo6Y3Jl YXRlKEhUTUxOYW1lczo6YXR0YWNobWVudFRhZywgZG9jdW1lbnQpOwotICAgICAgICAgICAgYXR0 YWNobWVudC0+c2V0VW5pcXVlSWRlbnRpZmllcihjcmVhdGVDYW5vbmljYWxVVUlEU3RyaW5nKCkp OwogICAgICAgICAgICAgYXR0YWNobWVudC0+c2V0RmlsZShGaWxlOjpjcmVhdGUocGF0aCksIEhU TUxBdHRhY2htZW50RWxlbWVudDo6VXBkYXRlRGlzcGxheUF0dHJpYnV0ZXM6Olllcyk7CiAgICAg ICAgICAgICBlbnN1cmVGcmFnbWVudCgpLmFwcGVuZENoaWxkKGF0dGFjaG1lbnQpOwogICAgICAg ICAgICAgcmVhZEFueUZpbGVQYXRoID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvbWFya3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcApp bmRleCA2YTZmNzY1M2ZmNGNiMTc3MDJiMDUyODMzNmEzNjk0MDk3ZTUxNjUwLi43YjNiMTkzMWU0 MDg4OTZjYjRlNDQ2ZmNiZDE3MzdkOGIxMjJmMjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL21hcmt1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJrdXAu Y3BwCkBAIC0zNzgsNiArMzc4LDcgQEAgdm9pZCBTdHlsZWRNYXJrdXBBY2N1bXVsYXRvcjo6YXBw ZW5kQ3VzdG9tQXR0cmlidXRlcyhTdHJpbmdCdWlsZGVyJiBvdXQsIGNvbnN0IEUKICAgICAgICAg cmV0dXJuOwogICAgIAogICAgIGNvbnN0IEhUTUxBdHRhY2htZW50RWxlbWVudCYgYXR0YWNobWVu dCA9IGRvd25jYXN0PEhUTUxBdHRhY2htZW50RWxlbWVudD4oZWxlbWVudCk7CisgICAgYXBwZW5k QXR0cmlidXRlKG91dCwgZWxlbWVudCwgeyB3ZWJraXRhdHRhY2htZW50aWRBdHRyLCBhdHRhY2ht ZW50LnVuaXF1ZUlkZW50aWZpZXIoKSB9LCBuYW1lc3BhY2VzKTsKICAgICBpZiAoYXV0byogZmls ZSA9IGF0dGFjaG1lbnQuZmlsZSgpKSB7CiAgICAgICAgIC8vIFRoZXNlIGF0dHJpYnV0ZXMgYXJl IG9ubHkgaW50ZW5kZWQgZm9yIEZpbGUgZGVzZXJpYWxpemF0aW9uLCBhbmQgYXJlIHJlbW92ZWQg ZnJvbSB0aGUgZ2VuZXJhdGVkIGF0dGFjaG1lbnQKICAgICAgICAgLy8gZWxlbWVudCBhZnRlciB3 ZSd2ZSBkZXNlcmlhbGl6ZWQgYW5kIHNldCBpdHMgYmFja2luZyBGaWxlLgpAQCAtNzY3LDEyICs3 NjgsMTYgQEAgUmVmPERvY3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChE b2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IFN0cmluZyYKICAgICAgICAgYXR0YWNobWVudHMuYXBw ZW5kKGF0dGFjaG1lbnQpOwogCiAgICAgZm9yIChhdXRvJiBhdHRhY2htZW50IDogYXR0YWNobWVu dHMpIHsKKyAgICAgICAgYXR0YWNobWVudC0+c2V0VW5pcXVlSWRlbnRpZmllcihhdHRhY2htZW50 LT5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKHdlYmtpdGF0dGFjaG1lbnRpZEF0dHIp KTsKKwogICAgICAgICBhdXRvIGF0dGFjaG1lbnRQYXRoID0gYXR0YWNobWVudC0+YXR0YWNobWVu dFBhdGgoKTsKICAgICAgICAgYXV0byBibG9iVVJMID0gYXR0YWNobWVudC0+YmxvYlVSTCgpOwog ICAgICAgICBpZiAoIWF0dGFjaG1lbnRQYXRoLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGF0dGFj aG1lbnQtPnNldEZpbGUoRmlsZTo6Y3JlYXRlKGF0dGFjaG1lbnRQYXRoKSk7CiAgICAgICAgIGVs c2UgaWYgKCFibG9iVVJMLmlzRW1wdHkoKSkKICAgICAgICAgICAgIGF0dGFjaG1lbnQtPnNldEZp bGUoRmlsZTo6ZGVzZXJpYWxpemUoeyB9LCBibG9iVVJMLCBhdHRhY2htZW50LT5hdHRhY2htZW50 VHlwZSgpLCBhdHRhY2htZW50LT5hdHRhY2htZW50VGl0bGUoKSkpOworCisgICAgICAgIGF0dGFj aG1lbnQtPnJlbW92ZUF0dHJpYnV0ZSh3ZWJraXRhdHRhY2htZW50aWRBdHRyKTsKICAgICAgICAg YXR0YWNobWVudC0+cmVtb3ZlQXR0cmlidXRlKHdlYmtpdGF0dGFjaG1lbnRwYXRoQXR0cik7CiAg ICAgICAgIGF0dGFjaG1lbnQtPnJlbW92ZUF0dHJpYnV0ZSh3ZWJraXRhdHRhY2htZW50YmxvYnVy bEF0dHIpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFj aG1lbnRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFjaG1lbnRFbGVt ZW50LmNwcAppbmRleCAxZjQ0NWU4MDYzMjcwMGM3ZTg5NTBlNzM4MTA3MDk3YzVlMDBiNDI5Li5k MzcwOGZhZDA5ZWVkZTNhZjY4OTUyMDRjNjE2ZTYxY2RkMTA3ZjVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQXR0YWNobWVudEVsZW1lbnQuY3BwCkBAIC0xODIsMTYgKzE4Miw2IEBA IHZvaWQgSFRNTEF0dGFjaG1lbnRFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShjb25zdCBRdWFsaWZp ZWROYW1lJiBuYW1lLCBjb25zdCBBdG9tCiAgICAgSFRNTEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRl KG5hbWUsIHZhbHVlKTsKIH0KIAotU3RyaW5nIEhUTUxBdHRhY2htZW50RWxlbWVudDo6dW5pcXVl SWRlbnRpZmllcigpIGNvbnN0Ci17Ci0gICAgcmV0dXJuIGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJv bml6YXRpb24oSFRNTE5hbWVzOjp3ZWJraXRhdHRhY2htZW50aWRBdHRyKTsKLX0KLQotdm9pZCBI VE1MQXR0YWNobWVudEVsZW1lbnQ6OnNldFVuaXF1ZUlkZW50aWZpZXIoY29uc3QgU3RyaW5nJiBp ZGVudGlmaWVyKQotewotICAgIHNldEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRN TE5hbWVzOjp3ZWJraXRhdHRhY2htZW50aWRBdHRyLCBpZGVudGlmaWVyKTsKLX0KLQogU3RyaW5n IEhUTUxBdHRhY2htZW50RWxlbWVudDo6YXR0YWNobWVudFRpdGxlKCkgY29uc3QKIHsKICAgICBh dXRvJiB0aXRsZSA9IGF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24odGl0bGVBdHRyKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5oCmluZGV4IDE3OTVk MWZkMGI5Y2IwYjE5YzI3MTU1YjBjMTVlNTMyNWY0MDA3NGQuLmIzMjIzZmFkNGE2OWM2ZjE0Nzk3 YzU5ZGRlODQxYmVlM2QxNDFlYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TEF0dGFjaG1lbnRFbGVtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQXR0YWNo bWVudEVsZW1lbnQuaApAQCAtNDksOCArNDksOCBAQCBwdWJsaWM6CiAgICAgZW51bSBjbGFzcyBV cGRhdGVEaXNwbGF5QXR0cmlidXRlcyB7IE5vLCBZZXMgfTsKICAgICB2b2lkIHNldEZpbGUoUmVm UHRyPEZpbGU+JiYsIFVwZGF0ZURpc3BsYXlBdHRyaWJ1dGVzID0gVXBkYXRlRGlzcGxheUF0dHJp YnV0ZXM6Ok5vKTsKIAotICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyB1bmlxdWVJZGVudGlmaWVy KCkgY29uc3Q7Ci0gICAgdm9pZCBzZXRVbmlxdWVJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYpOwor ICAgIFN0cmluZyB1bmlxdWVJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV91bmlxdWVJZGVu dGlmaWVyOyB9CisgICAgdm9pZCBzZXRVbmlxdWVJZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgdW5p cXVlSWRlbnRpZmllcikgeyBtX3VuaXF1ZUlkZW50aWZpZXIgPSB1bmlxdWVJZGVudGlmaWVyOyB9 CiAKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHVwZGF0ZURpc3BsYXlNb2RlKEF0dGFjaG1lbnRE aXNwbGF5TW9kZSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCB1cGRhdGVGaWxlV2l0aERhdGEo UmVmPFNoYXJlZEJ1ZmZlcj4mJiBkYXRhLCBzdGQ6Om9wdGlvbmFsPFN0cmluZz4mJiBuZXdDb250 ZW50VHlwZSA9IHN0ZDo6bnVsbG9wdCwgc3RkOjpvcHRpb25hbDxTdHJpbmc+JiYgbmV3RmlsZW5h bWUgPSBzdGQ6Om51bGxvcHQpOwpAQCAtMTAwLDYgKzEwMCw3IEBAIHByaXZhdGU6CiAgICAgCiAg ICAgUmVmUHRyPEZpbGU+IG1fZmlsZTsKICAgICBWZWN0b3I8c3RkOjp1bmlxdWVfcHRyPEF0dGFj aG1lbnREYXRhUmVhZGVyPj4gbV9hdHRhY2htZW50UmVhZGVyczsKKyAgICBTdHJpbmcgbV91bmlx dWVJZGVudGlmaWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDIxNDhiNjBiYzQ1NTVhZDBi Y2E5Zjc4N2UxYjI2NGNkNWU3YjA2NTguLjU0ZDJiOWNlNDk4MDYwNTM0MTY3MzNhNjU3NzlmZDkx ODQ3NGQ1YTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOC0wMS0wNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hz aWVoQGFwcGxlLmNvbT4KKworICAgICAgICBDb3B5aW5nLCBwYXN0aW5nLCBhbmQgdGhlbiBkZWxl dGluZyBhbiBhdHRhY2htZW50IGVsZW1lbnQgYnJlYWtzIGF0dGFjaG1lbnQgZGF0YSByZXF1ZXN0 cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMzY1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjM0MDY0Nz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIHR3byBuZXcgYXR0YWNobWVudCBBUEkg dGVzdHMgdG8gdmVyaWZ5IHRoYXQgY29weWluZyBhbmQgcGFzdGluZyBhbiBleGlzdGluZyBhdHRh Y2htZW50IGluc2VydHMgYW4KKyAgICAgICAgYXR0YWNobWVudCBlbGVtZW50IHRoYXQgbWF5IGJl IGVkaXRlZCBpbmRlcGVuZGVudGx5IG9mIHRoZSBvcmlnaW5hbCBhdHRhY2htZW50LiBTZWUgV2Vi Q29yZS9DaGFuZ2VMb2cgZm9yIG1vcmUKKyAgICAgICAgZGV0YWlsLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0cy5tbToKKyAgICAg ICAgKFRlc3RXZWJLaXRBUEk6OlRFU1QpOgorCiAyMDE4LTAxLTA1ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmVzdHJpY3QgbmF2aWdhdGlv bi10aW1lIFdLV2Vic2l0ZURhdGFTdG9yZSBzd2FwcGluZyB0byBtYWluIGZyYW1lIG5hdmlnYXRp b25zCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dL QXR0YWNobWVudFRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS0F0dGFjaG1lbnRUZXN0cy5tbQppbmRleCA3NDM1NDdkM2M3N2FjZTkxMTU4NzZmNWM4NGE5 ODM5ZGI2YzY4ZDZiLi42YjBmMDU1NzQ1NmE3YmZjNTE1ZjAzOTkwMGZiMGJiZjk4MjU0YzdhIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNo bWVudFRlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tBdHRhY2htZW50VGVzdHMubW0KQEAgLTQ0Nyw2ICs0NDcsNyBAQCBURVNUKFdLQXR0YWNobWVu dFRlc3RzLCBBdHRhY2htZW50RWxlbWVudEluc2VydGlvbikKICAgICBbc2Vjb25kQXR0YWNobWVu dCBleHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SW1hZ2VEYXRhKCldOwogICAgIEVYUEVDVF9G QUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9y UXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7CiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3 IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAi YXR0YWNobWVudCJdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFzQXR0cmlidXRlOkAi d2Via2l0YXR0YWNobWVudGlkIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKIH0K IAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5n QW5kRGVsZXRpbmdOZXdsaW5lKQpAQCAtNTE0LDYgKzUxNSw3IEBAIFRFU1QoV0tBdHRhY2htZW50 VGVzdHMsIEF0dGFjaG1lbnRVcGRhdGVzV2hlbkNoYW5naW5nRm9udFN0eWxlcykKICAgICBbYXR0 YWNobWVudCBleHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJs IiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dl YlZpZXcgaGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0 b3I6QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1 dGU6QCJ3ZWJraXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0p OwogCiAgICAgLy8gSW5zZXJ0aW5nIHRleHQgc2hvdWxkIGRlbGV0ZSB0aGUgY3VycmVudCBzZWxl Y3Rpb24sIHJlbW92aW5nIHRoZSBhdHRhY2htZW50IGluIHRoZSBwcm9jZXNzLgogICAgIFt3ZWJW aWV3IGV4cGVjdFVwZGF0ZXNBZnRlckNvbW1hbmQ6QCJJbnNlcnRUZXh0IiB3aXRoQXJndW1lbnQ6 QCJmb28iIGV4cGVjdGVkUmVtb3ZhbHM6QFthdHRhY2htZW50LmdldCgpXSBleHBlY3RlZEluc2Vy dGlvbnM6QFtdXTsKQEAgLTUzNyw2ICs1MzksNyBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBB dHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdMaXN0cykKICAgICBbYXR0YWNobWVudCBleHBl Y3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQRUNUX0ZBTFNFKFt3 ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJsIiBmb3JRdWVyeVNl bGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFzQXR0 cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2ht ZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRh dHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOwogfQogCiBURVNU KFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdSaWNoTWFy a3VwKQpAQCAtNTQ1LDEyICs1NDgsMTMgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNo bWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5nUmljaE1hcmt1cCkKICAgICBSZXRhaW5QdHI8X1dLQXR0 YWNobWVudD4gYXR0YWNobWVudDsKICAgICB7CiAgICAgICAgIE9ic2VydmVBdHRhY2htZW50VXBk YXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOwotICAgICAgICBbd2ViVmlldyBf c3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29tbWFuZDpAIkluc2VydEhUTUwiIGFyZ3VtZW50OkAi PGRpdj48c3Ryb25nPjxhdHRhY2htZW50IHRpdGxlPSdhJyB3ZWJraXRhdHRhY2htZW50aWQ9J2Ew NmZlYzQxLTlhYTAtNGMyYy1iYTNhLTAxNDliNTRhYWQ5OSc+PC9hdHRhY2htZW50Pjwvc3Ryb25n PjwvZGl2PiJdOworICAgICAgICBbd2ViVmlldyBfc3luY2hyb25vdXNseUV4ZWN1dGVFZGl0Q29t bWFuZDpAIkluc2VydEhUTUwiIGFyZ3VtZW50OkAiPGRpdj48c3Ryb25nPjxhdHRhY2htZW50IHRp dGxlPSdhJz48L2F0dGFjaG1lbnQ+PC9zdHJvbmc+PC9kaXY+Il07CiAgICAgICAgIGF0dGFjaG1l bnQgPSBvYnNlcnZlci5vYnNlcnZlcigpLmluc2VydGVkWzBdOwogICAgICAgICBvYnNlcnZlci5l eHBlY3RBdHRhY2htZW50VXBkYXRlcyhAWyBdLCBAW2F0dGFjaG1lbnQuZ2V0KCldKTsKICAgICB9 CiAgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1l bnRibG9idXJsIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1Rf RkFMU0UoW3dlYlZpZXcgaGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1 ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBo YXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRh Y2htZW50Il0pOwogICAgIHsKICAgICAgICAgT2JzZXJ2ZUF0dGFjaG1lbnRVcGRhdGVzRm9yU2Nv cGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CiAgICAgICAgIFt3ZWJWaWV3IHN0cmluZ0J5RXZh bHVhdGluZ0phdmFTY3JpcHQ6QCJkb2N1bWVudC5xdWVyeVNlbGVjdG9yKCdhdHRhY2htZW50Jyku cmVtb3ZlKCkiXTsKQEAgLTU4NSw2ICs1ODksNyBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBB dHRhY2htZW50VXBkYXRlc1doZW5DdXR0aW5nQW5kUGFzdGluZykKICAgICBbYXR0YWNobWVudCBl eHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SFRNTERhdGEoKV07CiAgICAgRVhQRUNUX0ZBTFNF KFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRibG9idXJsIiBmb3JRdWVy eVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcgaGFz QXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudHBhdGgiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRh Y2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJr aXRhdHRhY2htZW50aWQiIGZvclF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOwogfQogCiBU RVNUKFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2htZW50RGF0YUZvckVtcHR5RmlsZSkKQEAgLTky NSw2ICs5MzAsNzEgQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgRG9Ob3RJbnNlcnREYXRhVVJM SW1hZ2VzQXNBdHRhY2htZW50cykKICAgICBFWFBFQ1RfV0tfU1RSRVEoIlRoaXMgaXMgYW4gYXBw bGUiLCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYm9k eS50ZXh0Q29udGVudCJdKTsKIH0KIAorVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgSW5zZXJ0QW5k UmVtb3ZlRHVwbGljYXRlQXR0YWNobWVudCkKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSB3ZWJWaWV3 Rm9yVGVzdGluZ0F0dGFjaG1lbnRzKCk7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gZGF0YSA9IHRl c3RIVE1MRGF0YSgpOworICAgIFJldGFpblB0cjxfV0tBdHRhY2htZW50PiBvcmlnaW5hbEF0dGFj aG1lbnQ7CisgICAgUmV0YWluUHRyPF9XS0F0dGFjaG1lbnQ+IHBhc3RlZEF0dGFjaG1lbnQ7Cisg ICAgeworICAgICAgICBPYnNlcnZlQXR0YWNobWVudFVwZGF0ZXNGb3JTY29wZSBvYnNlcnZlcih3 ZWJWaWV3LmdldCgpKTsKKyAgICAgICAgb3JpZ2luYWxBdHRhY2htZW50ID0gW3dlYlZpZXcgc3lu Y2hyb25vdXNseUluc2VydEF0dGFjaG1lbnRXaXRoRmlsZW5hbWU6QCJmb28udHh0IiBjb250ZW50 VHlwZTpAInRleHQvcGxhaW4iIGRhdGE6ZGF0YS5nZXQoKSBvcHRpb25zOm5pbF07CisgICAgICAg IEVYUEVDVF9FUSgwVSwgb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5yZW1vdmVkLmNvdW50KTsKKyAgICAg ICAgb2JzZXJ2ZXIuZXhwZWN0QXR0YWNobWVudFVwZGF0ZXMoQFtdLCBAW29yaWdpbmFsQXR0YWNo bWVudC5nZXQoKV0pOworICAgIH0KKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAgICBb d2ViVmlldyBfZXhlY3V0ZUVkaXRDb21tYW5kOkAiQ29weSIgYXJndW1lbnQ6bmlsIGNvbXBsZXRp b246bmlsXTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJnZXRTZWxlY3Rpb24o KS5jb2xsYXBzZVRvRW5kKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAgeworICAgICAg ICBPYnNlcnZlQXR0YWNobWVudFVwZGF0ZXNGb3JTY29wZSBvYnNlcnZlcih3ZWJWaWV3LmdldCgp KTsKKyAgICAgICAgW3dlYlZpZXcgX3N5bmNocm9ub3VzbHlFeGVjdXRlRWRpdENvbW1hbmQ6QCJQ YXN0ZSIgYXJndW1lbnQ6bmlsXTsKKyAgICAgICAgRVhQRUNUX0VRKDBVLCBvYnNlcnZlci5vYnNl cnZlcigpLnJlbW92ZWQuY291bnQpOworICAgICAgICBFWFBFQ1RfRVEoMVUsIG9ic2VydmVyLm9i c2VydmVyKCkuaW5zZXJ0ZWQuY291bnQpOworICAgICAgICBwYXN0ZWRBdHRhY2htZW50ID0gb2Jz ZXJ2ZXIub2JzZXJ2ZXIoKS5pbnNlcnRlZC5maXJzdE9iamVjdDsKKyAgICAgICAgRVhQRUNUX0ZB TFNFKFtwYXN0ZWRBdHRhY2htZW50IGlzRXF1YWw6b3JpZ2luYWxBdHRhY2htZW50LmdldCgpXSk7 CisgICAgfQorICAgIHsKKyAgICAgICAgT2JzZXJ2ZUF0dGFjaG1lbnRVcGRhdGVzRm9yU2NvcGUg b2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CisgICAgICAgIFt3ZWJWaWV3IF9zeW5jaHJvbm91c2x5 RXhlY3V0ZUVkaXRDb21tYW5kOkAiRGVsZXRlQmFja3dhcmQiIGFyZ3VtZW50Om5pbF07CisgICAg ICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbcGFzdGVkQXR0YWNobWVudC5n ZXQoKV0sIEBbXSk7CisgICAgICAgIFtvcmlnaW5hbEF0dGFjaG1lbnQgZXhwZWN0UmVxdWVzdGVk RGF0YVRvQmU6ZGF0YS5nZXQoKV07CisgICAgfQorICAgIHsKKyAgICAgICAgT2JzZXJ2ZUF0dGFj aG1lbnRVcGRhdGVzRm9yU2NvcGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CisgICAgICAgIFt3 ZWJWaWV3IF9zeW5jaHJvbm91c2x5RXhlY3V0ZUVkaXRDb21tYW5kOkAiRGVsZXRlQmFja3dhcmQi IGFyZ3VtZW50Om5pbF07CisgICAgICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVz KEBbb3JpZ2luYWxBdHRhY2htZW50LmdldCgpXSwgQFtdKTsKKyAgICB9Cit9CisKK1RFU1QoV0tB dHRhY2htZW50VGVzdHMsIEluc2VydER1cGxpY2F0ZUF0dGFjaG1lbnRBbmRVcGRhdGVEYXRhKQor eworICAgIGF1dG8gd2ViVmlldyA9IHdlYlZpZXdGb3JUZXN0aW5nQXR0YWNobWVudHMoKTsKKyAg ICBSZXRhaW5QdHI8TlNEYXRhPiBvcmlnaW5hbERhdGEgPSB0ZXN0SFRNTERhdGEoKTsKKyAgICBS ZXRhaW5QdHI8X1dLQXR0YWNobWVudD4gb3JpZ2luYWxBdHRhY2htZW50OworICAgIFJldGFpblB0 cjxfV0tBdHRhY2htZW50PiBwYXN0ZWRBdHRhY2htZW50OworICAgIHsKKyAgICAgICAgT2JzZXJ2 ZUF0dGFjaG1lbnRVcGRhdGVzRm9yU2NvcGUgb2JzZXJ2ZXIod2ViVmlldy5nZXQoKSk7CisgICAg ICAgIG9yaWdpbmFsQXR0YWNobWVudCA9IFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlJbnNlcnRBdHRh Y2htZW50V2l0aEZpbGVuYW1lOkAiZm9vLnR4dCIgY29udGVudFR5cGU6QCJ0ZXh0L3BsYWluIiBk YXRhOm9yaWdpbmFsRGF0YS5nZXQoKSBvcHRpb25zOm5pbF07CisgICAgICAgIEVYUEVDVF9FUSgw VSwgb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5yZW1vdmVkLmNvdW50KTsKKyAgICAgICAgb2JzZXJ2ZXIu ZXhwZWN0QXR0YWNobWVudFVwZGF0ZXMoQFtdLCBAW29yaWdpbmFsQXR0YWNobWVudC5nZXQoKV0p OworICAgIH0KKyAgICBbd2ViVmlldyBzZWxlY3RBbGw6bmlsXTsKKyAgICBbd2ViVmlldyBfZXhl Y3V0ZUVkaXRDb21tYW5kOkAiQ29weSIgYXJndW1lbnQ6bmlsIGNvbXBsZXRpb246bmlsXTsKKyAg ICBbd2ViVmlldyBldmFsdWF0ZUphdmFTY3JpcHQ6QCJnZXRTZWxlY3Rpb24oKS5jb2xsYXBzZVRv RW5kKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisgICAgeworICAgICAgICBPYnNlcnZlQXR0 YWNobWVudFVwZGF0ZXNGb3JTY29wZSBvYnNlcnZlcih3ZWJWaWV3LmdldCgpKTsKKyAgICAgICAg W3dlYlZpZXcgX3N5bmNocm9ub3VzbHlFeGVjdXRlRWRpdENvbW1hbmQ6QCJQYXN0ZSIgYXJndW1l bnQ6bmlsXTsKKyAgICAgICAgRVhQRUNUX0VRKDBVLCBvYnNlcnZlci5vYnNlcnZlcigpLnJlbW92 ZWQuY291bnQpOworICAgICAgICBFWFBFQ1RfRVEoMVUsIG9ic2VydmVyLm9ic2VydmVyKCkuaW5z ZXJ0ZWQuY291bnQpOworICAgICAgICBwYXN0ZWRBdHRhY2htZW50ID0gb2JzZXJ2ZXIub2JzZXJ2 ZXIoKS5pbnNlcnRlZC5maXJzdE9iamVjdDsKKyAgICAgICAgRVhQRUNUX0ZBTFNFKFtwYXN0ZWRB dHRhY2htZW50IGlzRXF1YWw6b3JpZ2luYWxBdHRhY2htZW50LmdldCgpXSk7CisgICAgfQorICAg IGF1dG8gdXBkYXRlZERhdGEgPSByZXRhaW5QdHIoW0AiSEVMTE8gV09STEQiIGRhdGFVc2luZ0Vu Y29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXSk7CisgICAgW29yaWdpbmFsQXR0YWNobWVudCBz eW5jaHJvbm91c2x5U2V0RGF0YTp1cGRhdGVkRGF0YS5nZXQoKSBuZXdDb250ZW50VHlwZTpuaWwg bmV3RmlsZW5hbWU6bmlsIGVycm9yOm5pbF07CisgICAgW29yaWdpbmFsQXR0YWNobWVudCBleHBl Y3RSZXF1ZXN0ZWREYXRhVG9CZTp1cGRhdGVkRGF0YS5nZXQoKV07CisgICAgW3Bhc3RlZEF0dGFj aG1lbnQgZXhwZWN0UmVxdWVzdGVkRGF0YVRvQmU6b3JpZ2luYWxEYXRhLmdldCgpXTsKK30KKwog I3ByYWdtYSBtYXJrIC0gUGxhdGZvcm0tc3BlY2lmaWMgdGVzdHMKIAogI2lmIFBMQVRGT1JNKE1B QykK