171446 2017-04-28 13:02:23 -0700 Fix and re-enable data interaction unit tests 2017-04-28 17:44:18 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh bdakin commit-queue megan_gardner thorton webkit-bug-importer oldest_to_newest 1302732 0 wenson_hsieh 2017-04-28 13:02:23 -0700 Fix and re-enable data interaction unit tests 1302766 1 wenson_hsieh 2017-04-28 13:47:03 -0700 <rdar://problem/31820646> 1302854 2 308610 wenson_hsieh 2017-04-28 16:10:05 -0700 Created attachment 308610 Patch 1302912 3 308610 commit-queue 2017-04-28 17:44:16 -0700 Comment on attachment 308610 Patch Clearing flags on attachment: 308610 Committed r215962: <http://trac.webkit.org/changeset/215962> 1302913 4 commit-queue 2017-04-28 17:44:18 -0700 All reviewed patches have been landed. Closing bug. 308610 2017-04-28 16:10:05 -0700 2017-04-28 17:44:16 -0700 Patch bug-171446-20170428161004.patch text/plain 23128 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjE1OTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjE1Yjk2MGQyM2UyMDVk ZWE4NjgwNzZmNDczYjM4YWI3OTJjYjkzZC4uNzlhNjY1MTlkMjdiOTE2Mzg2MGY1NDA1ZWJhNDk0 OWNmOTM2MDQ0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDE3LTA0LTI4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIEZpeCBhbmQgcmUt ZW5hYmxlIGRhdGEgaW50ZXJhY3Rpb24gdW5pdCB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcxNDQ2CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zMTgyMDY0Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBUaHJlZSBzbWFsbCB0d2Vha3MgdG8gZ2V0IGFsbCBkYXRhIGludGVyYWN0aW9uIHRlc3Rz IHBhc3NpbmcgYWdhaW4gKGNoYW5nZXMgZGV0YWlsZWQgYmVsb3cpLgorICAgICAgICBGaXhlcyBh IGZhaWxpbmcgdW5pdCB0ZXN0OiBEYXRhSW50ZXJhY3Rpb25UZXN0cy5SZXNwZWN0c0V4dGVybmFs U291cmNlRmlkZWxpdHlSYW5raW5ncy4KKworICAgICAgICAqIHBhZ2UvbWFjL0RyYWdDb250cm9s bGVyTWFjLm1tOgorCisgICAgICAgIFdoZW4gZHJvcHBpbmcgaW4gYSBwbGFpbiB0ZXh0IGVkaXRh YmxlIGFyZWEsIGRvbid0IGNvbnNpZGVyIGtVVFR5cGVUZXh0IHRvIGJlIGEgVVRJIHN1cHBvcnRl ZCBieSB0aGUgZGVzdGluYXRpb24uCisgICAgICAgIFRoaXMgaXMgYmVjYXVzZSBkb2luZyBzbyB3 b3VsZCBjYXVzZSByaWNoIHRleHQgVVRJcywgc3VjaCBhcyBrVVRUeXBlSFRNTCwgdG8gbWF0Y2gs IHNvIHRoYXQgdGhlIHBsYWluIHRleHQgYXJlYQorICAgICAgICB3b3VsZCByZXBvcnQgSFRNTCBh cyBhIHByZWZlcnJlZCBVVEkgdHlwZSB0byBsb2FkIHdoZW4gZHJvcHBpbmcgcmljaCBjb250ZW50 IG92ZXIgaXQuIFdoYXQgd2Ugd2FudCB0byBjaGVjayBmb3IKKyAgICAgICAgY29uZm9ybWFuY2Ug aGVyZSBpcyByZWFsbHkga1VUVHlwZVBsYWluVGV4dC4KKworICAgICAgICAoV2ViQ29yZTo6RHJh Z0NvbnRyb2xsZXI6OnVwZGF0ZVByZWZlcnJlZFR5cGVJZGVudGlmaWVyc0ZvckRyYWdIYW5kbGlu Z01ldGhvZCk6CisgICAgICAgICogcGxhdGZvcm0vUGFzdGVib2FyZC5oOgorICAgICAgICAqIHBs YXRmb3JtL2lvcy9QYXN0ZWJvYXJkSU9TLm1tOgorCisgICAgICAgIFRoZSBkZWZhdWx0IFBhc3Rl Ym9hcmQgY29uc3RydWN0b3Igbm8gbG9uZ2VyIG1ha2VzIGEgc3luYyBjYWxsIHRvIHRoZSBVSSBw cm9jZXNzIHRvIGdldCB0aGUgY2hhbmdlIGNvdW50LgorICAgICAgICBJbnN0ZWFkLCB3ZSBpbnRy b2R1Y2UgYSBuZXcgY29uc3RydWN0b3IgdGhhdCB0YWtlcyBhbmQgc2V0cyB0aGUgY2hhbmdlIGNv dW50LiBUaGlzIGRlZmF1bHQgY29uc3RydWN0b3Igd2FzIHVzZWQKKyAgICAgICAgZnJvbSB0aHJl ZSBwbGFjZXM6IFBhc3RlYm9hcmQ6OmNyZWF0ZUZvckNvcHlBbmRQYXN0ZSwgUGFzdGVib2FyZDo6 Y3JlYXRlUHJpdmF0ZSBhbmQgU3RhdGljUGFzdGVib2FyZDo6Y3JlYXRlLgorCisgICAgICAgIFRo ZSBmaXJzdCB0d28gY2FsbCBzaXRlcyBoYXZlIGJlZW4gcmVmYWN0b3JlZCB0byBmaXJzdCBmZXRj aCB0aGUgY2hhbmdlIGNvdW50IGZyb20gdGhlIFVJIHByb2Nlc3MgYW5kIHRoZW4gcGFzcworICAg ICAgICBpdCBpbiB0byB0aGUgY29uc3RydWN0b3IuCisKKyAgICAgICAgKFdlYkNvcmU6OmNoYW5n ZUNvdW50Rm9yUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpQYXN0 ZWJvYXJkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmNyZWF0ZUZvckNvcHlBbmRQ YXN0ZSk6CisgICAgICAgIChXZWJDb3JlOjpQYXN0ZWJvYXJkOjpjcmVhdGVQcml2YXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OnJlYWRTdHJpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6UGFzdGVib2FyZDo6dHlwZXMpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9EcmFnRGF0YU1h Yy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnR5cGVJc0FwcHJvcHJpYXRlRm9yU3VwcG9ydGVkVHlw ZXMpOgorICAgICAgICAoV2ViQ29yZTo6RHJhZ0RhdGE6OnVwZGF0ZVByZWZlcnJlZFR5cGVJZGVu dGlmaWVycyk6CisKKyAgICAgICAgUmVtb3ZlIHRoZSB0d28tcGFzcyBoZXVyaXN0aWMuIEluc3Rl YWQsIHdlIHNob3VsZCBmb2xsb3cgdGhpcyBwb2xpY3k6ICJzZWxlY3QgdGhlIGhpZ2hlc3QgZmlk ZWxpdHkgVVRJIHRoYXQKKyAgICAgICAgY29uZm9ybXMgdG8gb25lIG9mIHRoZSBkZXN0aW5hdGlv bidzIHN1cHBvcnRlZCB0eXBlcyIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGFzdGVib2Fy ZE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OlBhc3RlYm9hcmQpOgorCiAy MDE3LTA0LTI3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAg ICAgIERhdGEgaW50ZXJhY3Rpb24gc2hvdWxkIG5vdCBsb2FkIHBhc3RlYm9hcmQgY29udGVudCBi ZWZvcmUgcGVyZm9ybWluZyB0aGUgZGF0YSBvcGVyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvbWFjL0RyYWdDb250cm9sbGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9tYWMvRHJhZ0NvbnRyb2xsZXJNYWMubW0KaW5kZXggNDFjYzg4MjRmMDhiMjBjNjc1MDMzYzZj MjhhMWJmNzQ2MjZhZGEyMi4uMjQ3M2E0MzVlZDkwZTA0NDFmOTUzZGU1ZDUwMTc3ODdkMzdlZWQ1 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRHJhZ0NvbnRyb2xsZXJNYWMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRHJhZ0NvbnRyb2xsZXJNYWMubW0KQEAg LTExMyw4ICsxMTMsNyBAQCB2b2lkIERyYWdDb250cm9sbGVyOjp1cGRhdGVQcmVmZXJyZWRUeXBl SWRlbnRpZmllcnNGb3JEcmFnSGFuZGxpbmdNZXRob2QoRHJhZ0hhbgogICAgICAgICBicmVhazsK ICAgICBjYXNlIERyYWdIYW5kbGluZ01ldGhvZDo6RWRpdFBsYWluVGV4dDoKICAgICAgICAgc3Vw cG9ydGVkVHlwZXMuYXBwZW5kKGtVVFR5cGVVUkwpOwotICAgICAgICBzdXBwb3J0ZWRUeXBlcy5h cHBlbmQoa1VUVHlwZVRleHQpOwotICAgICAgICBzdXBwb3J0ZWRUeXBlcy5hcHBlbmQoa1VUVHlw ZVVURjhQbGFpblRleHQpOworICAgICAgICBzdXBwb3J0ZWRUeXBlcy5hcHBlbmQoa1VUVHlwZVBs YWluVGV4dCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgRHJhZ0hhbmRsaW5nTWV0aG9kOjpF ZGl0UmljaFRleHQ6CiAgICAgICAgIGZvciAoTlNTdHJpbmcgKnR5cGUgaW4gUGFzdGVib2FyZDo6 c3VwcG9ydGVkUGFzdGVib2FyZFR5cGVzKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9QYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9QYXN0ZWJvYXJk LmgKaW5kZXggNDI5ZTFhZjE0MDAyNDcwYTdjOGNmNjgwNjI1MmVlMTUyOTMyNzQyNy4uOGMyMTNk OWUzMjk1Mjk2YjRkZjIzNGRiNTY2NmVmZWY5NTM1NmY0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L1Bhc3RlYm9hcmQuaApAQCAtMTk3LDYgKzE5Nyw4IEBAIHB1YmxpYzoKICNlbmRpZgogCiAjaWYg UExBVEZPUk0oSU9TKQorICAgIGV4cGxpY2l0IFBhc3RlYm9hcmQobG9uZyBjaGFuZ2VDb3VudCk7 CisKICAgICBzdGF0aWMgTlNBcnJheSogc3VwcG9ydGVkUGFzdGVib2FyZFR5cGVzKCk7CiAgICAg c3RhdGljIFN0cmluZyByZXNvdXJjZU1JTUVUeXBlKGNvbnN0IE5TU3RyaW5nICptaW1lVHlwZSk7 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QYXN0ZWJv YXJkSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0K aW5kZXggN2Q0MjU0ZjhiZGMwZGI3YzJlYWE4NTk3MWUwNmUyMzg3YThjOGVhYi4uM2Q4ZDc0Y2Fm ZDRjOWEyMmRkMzY4ZDIzZTllOWU1NWJmMDkwYWJjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KQEAgLTY0LDYgKzY0LDExIEBAIEBlbmQKIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogCitzdGF0aWMgbG9uZyBjaGFuZ2VDb3VudEZvclBhc3RlYm9hcmQo Y29uc3QgU3RyaW5nJiBwYXN0ZWJvYXJkTmFtZSA9IHsgfSkKK3sKKyAgICByZXR1cm4gcGxhdGZv cm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5jaGFuZ2VDb3VudChwYXN0ZWJv YXJkTmFtZSk7Cit9CisKIC8vIEZJWE1FOiBEb2VzIHRoaXMgbmVlZCB0byBiZSBkZWNsYXJlZCBp biB0aGUgaGVhZGVyIGZpbGU/CiBXRUJDT1JFX0VYUE9SVCBOU1N0cmluZyAqV2ViQXJjaGl2ZVBi b2FyZFR5cGUgPSBAIkFwcGxlIFdlYiBBcmNoaXZlIHBhc3RlYm9hcmQgdHlwZSI7CiAKQEAgLTg2 LDcgKzkxLDEyIEBAIFBhc3RlYm9hcmRJbWFnZTo6flBhc3RlYm9hcmRJbWFnZSgpCiB9CiAKIFBh c3RlYm9hcmQ6OlBhc3RlYm9hcmQoKQotICAgIDogbV9jaGFuZ2VDb3VudChwbGF0Zm9ybVN0cmF0 ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5KCktPmNoYW5nZUNvdW50KG1fcGFzdGVib2FyZE5h bWUpKQorICAgIDogbV9jaGFuZ2VDb3VudCgwKQoreworfQorCitQYXN0ZWJvYXJkOjpQYXN0ZWJv YXJkKGxvbmcgY2hhbmdlQ291bnQpCisgICAgOiBtX2NoYW5nZUNvdW50KGNoYW5nZUNvdW50KQog ewogfQogCkBAIC05NiwxMiArMTA2LDEyIEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVNYXJrdXAo Y29uc3QgU3RyaW5nJikKIAogc3RkOjp1bmlxdWVfcHRyPFBhc3RlYm9hcmQ+IFBhc3RlYm9hcmQ6 OmNyZWF0ZUZvckNvcHlBbmRQYXN0ZSgpCiB7Ci0gICAgcmV0dXJuIHN0ZDo6bWFrZV91bmlxdWU8 UGFzdGVib2FyZD4oKTsKKyAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxQYXN0ZWJvYXJkPihj aGFuZ2VDb3VudEZvclBhc3RlYm9hcmQoKSk7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxQYXN0ZWJv YXJkPiBQYXN0ZWJvYXJkOjpjcmVhdGVQcml2YXRlKCkKIHsKLSAgICByZXR1cm4gc3RkOjptYWtl X3VuaXF1ZTxQYXN0ZWJvYXJkPigpOworICAgIHJldHVybiBzdGQ6Om1ha2VfdW5pcXVlPFBhc3Rl Ym9hcmQ+KGNoYW5nZUNvdW50Rm9yUGFzdGVib2FyZCgpKTsKIH0KIAogdm9pZCBQYXN0ZWJvYXJk Ojp3cml0ZShjb25zdCBQYXN0ZWJvYXJkV2ViQ29udGVudCYgY29udGVudCkKQEAgLTM1Miw3ICsz NjIsNyBAQCBTdHJpbmcgUGFzdGVib2FyZDo6cmVhZFN0cmluZyhjb25zdCBTdHJpbmcmIHR5cGUp CiAKICAgICAvLyBFbmZvcmNlIGNoYW5nZUNvdW50IG91cnNlbHZlcyBmb3Igc2VjdXJpdHkuIFdl IGNoZWNrIGFmdGVyIHJlYWRpbmcgaW5zdGVhZCBvZiBiZWZvcmUgdG8gYmUKICAgICAvLyBzdXJl IGl0IGRvZXNuJ3QgY2hhbmdlIGJldHdlZW4gb3VyIHRlc3RpbmcgdGhlIGNoYW5nZSBjb3VudCBh bmQgYWNjZXNzaW5nIHRoZSBkYXRhLgotICAgIGlmIChjb2NvYVZhbHVlICYmIG1fY2hhbmdlQ291 bnQgPT0gcGxhdGZvcm1TdHJhdGVnaWVzKCktPnBhc3RlYm9hcmRTdHJhdGVneSgpLT5jaGFuZ2VD b3VudChtX3Bhc3RlYm9hcmROYW1lKSkKKyAgICBpZiAoY29jb2FWYWx1ZSAmJiBtX2NoYW5nZUNv dW50ID09IGNoYW5nZUNvdW50Rm9yUGFzdGVib2FyZChtX3Bhc3RlYm9hcmROYW1lKSkKICAgICAg ICAgcmV0dXJuIGNvY29hVmFsdWU7CiAKICAgICByZXR1cm4gU3RyaW5nKCk7CkBAIC0zOTMsNyAr NDAzLDcgQEAgVmVjdG9yPFN0cmluZz4gUGFzdGVib2FyZDo6dHlwZXMoKQogCiAgICAgLy8gRW5m b3JjZSBjaGFuZ2VDb3VudCBvdXJzZWx2ZXMgZm9yIHNlY3VyaXR5LiBXZSBjaGVjayBhZnRlciBy ZWFkaW5nIGluc3RlYWQgb2YgYmVmb3JlIHRvIGJlCiAgICAgLy8gc3VyZSBpdCBkb2Vzbid0IGNo YW5nZSBiZXR3ZWVuIG91ciB0ZXN0aW5nIHRoZSBjaGFuZ2UgY291bnQgYW5kIGFjY2Vzc2luZyB0 aGUgZGF0YS4KLSAgICBpZiAobV9jaGFuZ2VDb3VudCAhPSBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+ cGFzdGVib2FyZFN0cmF0ZWd5KCktPmNoYW5nZUNvdW50KG1fcGFzdGVib2FyZE5hbWUpKQorICAg IGlmIChtX2NoYW5nZUNvdW50ICE9IGNoYW5nZUNvdW50Rm9yUGFzdGVib2FyZChtX3Bhc3RlYm9h cmROYW1lKSkKICAgICAgICAgcmV0dXJuIFZlY3RvcjxTdHJpbmc+KCk7CiAKICAgICBMaXN0SGFz aFNldDxTdHJpbmc+IHJlc3VsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9EcmFnRGF0YU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9EcmFnRGF0 YU1hYy5tbQppbmRleCA4YjMwY2IzZjRhOTA3ZGVjNWVkMjEyYmU4ODU2NmI5ODQ2YTFiZDVhLi5h NDllMTM0ZjVlYTY0ODZhNGIxYTA0YmQzYWEzYjg4MWVhNGYxM2M1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRHJhZ0RhdGFNYWMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbWFjL0RyYWdEYXRhTWFjLm1tCkBAIC0yOTQsMTMgKzI5NCwxOCBAQCBTdHJp bmcgRHJhZ0RhdGE6OmFzVVJMKEZpbGVuYW1lQ29udmVyc2lvblBvbGljeSwgU3RyaW5nKiB0aXRs ZSkgY29uc3QKIAogI2lmIEVOQUJMRShEQVRBX0lOVEVSQUNUSU9OKQogCi12b2lkIERyYWdEYXRh Ojp1cGRhdGVQcmVmZXJyZWRUeXBlSWRlbnRpZmllcnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHN1 cHBvcnRlZFR5cGVzVmVjdG9yKSBjb25zdAorc3RhdGljIGJvb2wgdHlwZUlzQXBwcm9wcmlhdGVG b3JTdXBwb3J0ZWRUeXBlcyhjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBzdXBwb3J0ZWRUeXBlcykKIHsKLSAgICBOU011dGFibGVTZXQgKnN1cHBvcnRlZFR5cGVzID0g W05TTXV0YWJsZVNldCBzZXRXaXRoQ2FwYWNpdHk6c3VwcG9ydGVkVHlwZXNWZWN0b3Iuc2l6ZSgp XTsKLSAgICBmb3IgKGF1dG8mIHN1cHBvcnRlZFR5cGUgOiBzdXBwb3J0ZWRUeXBlc1ZlY3RvcikK LSAgICAgICAgW3N1cHBvcnRlZFR5cGVzIGFkZE9iamVjdDpzdXBwb3J0ZWRUeXBlXTsKKyAgICBD RlN0cmluZ1JlZiBjZlR5cGUgPSB0eXBlLmNyZWF0ZUNGU3RyaW5nKCkuYXV0b3JlbGVhc2UoKTsK KyAgICBmb3IgKGF1dG8gc3VwcG9ydGVkVHlwZSA6IHN1cHBvcnRlZFR5cGVzKSB7CisgICAgICAg IGlmIChVVFR5cGVDb25mb3Jtc1RvKGNmVHlwZSwgc3VwcG9ydGVkVHlwZS5jcmVhdGVDRlN0cmlu ZygpLmdldCgpKSkKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4g ZmFsc2U7Cit9CiAKLSAgICAvLyBNYXRjaCBVSUl0ZW1Qcm92aWRlciBiZWhhdmlvciBieSBwZXJm b3JtaW5nIHR3by1wYXNzIFVUSSBtYXRjaGluZy4KK3ZvaWQgRHJhZ0RhdGE6OnVwZGF0ZVByZWZl cnJlZFR5cGVJZGVudGlmaWVycyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgc3VwcG9ydGVkVHlwZXMp IGNvbnN0Cit7CiAgICAgVmVjdG9yPFN0cmluZz4gYmVzdFR5cGVJZGVudGlmaWVyczsKICAgICBh dXRvJiBzdHJhdGVneSA9ICpwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5 KCk7CiAgICAgdWludDY0X3QgaXRlbUNvdW50ID0gc3RyYXRlZ3kuZ2V0UGFzdGVib2FyZEl0ZW1z Q291bnQobV9wYXN0ZWJvYXJkTmFtZSk7CkBAIC0zMDksMjYgKzMxNCwxMiBAQCB2b2lkIERyYWdE YXRhOjp1cGRhdGVQcmVmZXJyZWRUeXBlSWRlbnRpZmllcnMoY29uc3QgVmVjdG9yPFN0cmluZz4m IHN1cHBvcnRlZFR5cAogICAgICAgICBzdHJhdGVneS5nZXRUeXBlc0J5RmlkZWxpdHlGb3JJdGVt QXRJbmRleCh0eXBlSWRlbnRpZmllcnMsIGl0ZW1JbmRleCwgbV9wYXN0ZWJvYXJkTmFtZSk7CiAK ICAgICAgICAgU3RyaW5nIGJlc3RUeXBlSWRlbnRpZmllciA9IGVtcHR5U3RyaW5nKCk7Ci0gICAg ICAgIC8vIEluIHRoZSBmaXJzdCBwYXNzLCBsb29rIGZvciB0aGUgaGlnaGVzdCBmaWRlbGl0eSBV VEkgdGhhdCBleGFjdGx5IG1hdGNoZXMgb25lIG9mIHRoZSBzdXBwb3J0ZWQgVVRJcy4KICAgICAg ICAgZm9yIChhdXRvJiB0eXBlIDogdHlwZUlkZW50aWZpZXJzKSB7Ci0gICAgICAgICAgICBpZiAo W3N1cHBvcnRlZFR5cGVzIGNvbnRhaW5zT2JqZWN0OihOU1N0cmluZyAqKXR5cGVdKSB7Ci0gICAg ICAgICAgICAgICAgYmVzdFR5cGVJZGVudGlmaWVyID0gdHlwZTsKLSAgICAgICAgICAgICAgICBi cmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgfQorICAgICAgICAgICAgaWYgKCF0eXBlSXNB cHByb3ByaWF0ZUZvclN1cHBvcnRlZFR5cGVzKHR5cGUsIHN1cHBvcnRlZFR5cGVzKSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAvLyBJbiB0aGUgc2Vjb25kIHBhc3MsIGxv b2sgZm9yIHRoZSBoaWdoZXN0IGZpZGVsaXR5IFVUSSB0aGF0IGNvbmZvcm1zIHRvIG9uZSBvZiB0 aGUgc3VwcG9ydGVkIFVUSXMuCi0gICAgICAgIGlmIChiZXN0VHlwZUlkZW50aWZpZXIuaXNFbXB0 eSgpKSB7Ci0gICAgICAgICAgICBmb3IgKGF1dG8mIHR5cGUgOiB0eXBlSWRlbnRpZmllcnMpIHsK LSAgICAgICAgICAgICAgICBmb3IgKE5TU3RyaW5nICpzdXBwb3J0ZWRUeXBlIGluIHN1cHBvcnRl ZFR5cGVzKSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKHR5cGUu Y3JlYXRlQ0ZTdHJpbmcoKS5hdXRvcmVsZWFzZSgpLCAoQ0ZTdHJpbmdSZWYpc3VwcG9ydGVkVHlw ZSkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGJlc3RUeXBlSWRlbnRpZmllciA9IHR5cGU7 Ci0gICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAgICAgICAgfQot ICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBpZiAoIWJlc3RUeXBlSWRlbnRpZmll ci5pc0VtcHR5KCkpCi0gICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgfQor ICAgICAgICAgICAgYmVzdFR5cGVJZGVudGlmaWVyID0gdHlwZTsKKyAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CiAgICAgICAgIGJlc3RUeXBlSWRlbnRpZmllcnMuYXBwZW5kKGJlc3RUeXBl SWRlbnRpZmllcik7CiAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IDllZmIyZDlhYTJhZmQ1MmI4YWQ5YTg1MGY4NGI3NzAwNTc2ZmYyNmUu LjBlNmFhNWFhNGI4MjExMDExODBmMmQ4ZGNhN2IzZTlkY2QxMTczNjQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAx Ny0wNC0yOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAg ICBGaXggYW5kIHJlLWVuYWJsZSBkYXRhIGludGVyYWN0aW9uIHVuaXQgdGVzdHMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTQ0NgorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMzE4MjA2NDY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgRW5hYmxlcyBhbGwgRGF0YUludGVyYWN0aW9uVGVzdHMsIGFuZCBh ZGp1c3RzIGZpbGUgdXBsb2FkIHRlc3RzIHRvIG5vIGxvbmdlciB3cml0ZSB0byBhIHRlbXBvcmFy eSBmaWxlIGJlZm9yZQorICAgICAgICByZWdpc3RlcmluZyB3aXRoIHRoZSBVSUl0ZW1Qcm92aWRl ciwgYW5kIGluc3RlYWQganVzdCByZWdpc3RlciBkYXRhIGRpcmVjdGx5IHZpYQorICAgICAgICAt cmVnaXN0ZXJEYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjp2aXNpYmlsaXR5Omxv YWRIYW5kbGVyOi4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL0RhdGFJbnRl cmFjdGlvblRlc3RzLm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisgICAgICAg ICh0ZW1wb3JhcnlVUkxGb3JEYXRhSW50ZXJhY3Rpb25GaWxlTG9hZCk6IERlbGV0ZWQuCisgICAg ICAgIChjbGVhblVwRGF0YUludGVyYWN0aW9uVGVtcG9yYXJ5UGF0aCk6IERlbGV0ZWQuCisgICAg ICAgICgtW1VJSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJlcHJlc2VudGF0aW9uRm9yVHlwZUlk ZW50aWZpZXI6d2l0aERhdGE6ZmlsZW5hbWU6XSk6IERlbGV0ZWQuCisgICAgICAgICogVGVzdFdl YktpdEFQSS9pb3MvRGF0YUludGVyYWN0aW9uU2ltdWxhdG9yLmg6CisgICAgICAgICogVGVzdFdl YktpdEFQSS9pb3MvRGF0YUludGVyYWN0aW9uU2ltdWxhdG9yLm1tOgorCiAyMDE3LTA0LTI3ICBB bGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRk IHN0dWIgU1BJIGZvciBzZXR0aW5nIGNvb2tpZSBzdG9yYWdlIHBhdGggb24gX1dLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvaW9zL0RhdGFJbnRlcmFjdGlvblRlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9pb3MvRGF0YUludGVyYWN0aW9uVGVzdHMubW0KaW5kZXggZmU1MTMxZTM5MjJhMzRlMzllYTA1 MDVhMmQ0MzEwYzMyYmQ5ODVlZS4uMzA0ODczYzNkYmNmMDMxY2Y3MzAzYjA2YTJlYWU3ODJhY2Ez ZjA5OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUludGVy YWN0aW9uVGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvRGF0YUlu dGVyYWN0aW9uVGVzdHMubW0KQEAgLTI1LDcgKzI1LDcgQEAKIAogI2luY2x1ZGUgImNvbmZpZy5o IgogCi0jaWYgMAorI2lmIEVOQUJMRShEQVRBX0lOVEVSQUNUSU9OKQogCiAjaW1wb3J0ICJEYXRh SW50ZXJhY3Rpb25TaW11bGF0b3IuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCkBA IC00OCwzOCArNDgsOCBAQCBzdGF0aWMgVUlJbWFnZSAqdGVzdEljb25JbWFnZSgpCiAgICAgcmV0 dXJuIFtVSUltYWdlIGltYWdlTmFtZWQ6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcy9pY29uLnBu ZyJdOwogfQogCi1zdGF0aWMgTlNVUkwgKnRlbXBvcmFyeVVSTEZvckRhdGFJbnRlcmFjdGlvbkZp bGVMb2FkKE5TU3RyaW5nICp0ZW1wb3JhcnlGaWxlTmFtZSkKLXsKLSAgICBOU1N0cmluZyAqdGVt cG9yYXJ5RGlyZWN0b3J5UGF0aCA9IFtOU1RlbXBvcmFyeURpcmVjdG9yeSgpIHN0cmluZ0J5QXBw ZW5kaW5nUGF0aENvbXBvbmVudDpAImRhdGEtaW50ZXJhY3Rpb24iXTsKLSAgICBpZiAoIVtbTlNG aWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDp0ZW1wb3JhcnlEaXJl Y3RvcnlQYXRoXSkKLSAgICAgICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBjcmVh dGVEaXJlY3RvcnlBdFBhdGg6dGVtcG9yYXJ5RGlyZWN0b3J5UGF0aCB3aXRoSW50ZXJtZWRpYXRl RGlyZWN0b3JpZXM6WUVTIGF0dHJpYnV0ZXM6bmlsIGVycm9yOm5pbF07Ci0gICAgcmV0dXJuIFtO U1VSTCBmaWxlVVJMV2l0aFBhdGg6W3RlbXBvcmFyeURpcmVjdG9yeVBhdGggc3RyaW5nQnlBcHBl bmRpbmdQYXRoQ29tcG9uZW50OnRlbXBvcmFyeUZpbGVOYW1lXV07Ci19Ci0KLXN0YXRpYyB2b2lk IGNsZWFuVXBEYXRhSW50ZXJhY3Rpb25UZW1wb3JhcnlQYXRoKCkKLXsKLSAgICBOU0FycmF5ICp0 ZW1wb3JhcnlEaXJlY3RvcnlDb250ZW50cyA9IFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdl cl0gY29udGVudHNPZkRpcmVjdG9yeUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6TlNUZW1w b3JhcnlEaXJlY3RvcnkoKV0gaW5jbHVkaW5nUHJvcGVydGllc0ZvcktleXM6bmlsIG9wdGlvbnM6 MCBlcnJvcjpuaWxdOwotICAgIGZvciAoTlNVUkwgKnVybCBpbiB0ZW1wb3JhcnlEaXJlY3RvcnlD b250ZW50cykgewotICAgICAgICBpZiAoW3VybC5sYXN0UGF0aENvbXBvbmVudCByYW5nZU9mU3Ry aW5nOkAiZGF0YS1pbnRlcmFjdGlvbiJdLmxvY2F0aW9uICE9IE5TTm90Rm91bmQpCi0gICAgICAg ICAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDp1cmwg ZXJyb3I6bmlsXTsKLSAgICB9Ci19Ci0KIEBpbXBsZW1lbnRhdGlvbiBVSUl0ZW1Qcm92aWRlciAo RGF0YUludGVyYWN0aW9uVGVzdHMpCiAKLS0gKHZvaWQpcmVnaXN0ZXJGaWxlUmVwcmVzZW50YXRp b25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKil0eXBlSWRlbnRpZmllciB3aXRoRGF0YToo TlNEYXRhICopZGF0YSBmaWxlbmFtZTooTlNTdHJpbmcgKilmaWxlbmFtZQotewotICAgIFJldGFp blB0cjxOU0RhdGE+IHJldGFpbmVkRGF0YSA9IGRhdGE7Ci0gICAgUmV0YWluUHRyPE5TVVJMPiBy ZXRhaW5lZFRlbXBvcmFyeVVSTCA9IHRlbXBvcmFyeVVSTEZvckRhdGFJbnRlcmFjdGlvbkZpbGVM b2FkKGZpbGVuYW1lKTsKLSAgICBbc2VsZiByZWdpc3RlckZpbGVSZXByZXNlbnRhdGlvbkZvclR5 cGVJZGVudGlmaWVyOnR5cGVJZGVudGlmaWVyIGZpbGVPcHRpb25zOjAgdmlzaWJpbGl0eTpOU0l0 ZW1Qcm92aWRlclJlcHJlc2VudGF0aW9uVmlzaWJpbGl0eUFsbCBsb2FkSGFuZGxlcjogW3JldGFp bmVkRGF0YSwgcmV0YWluZWRUZW1wb3JhcnlVUkxdIChGaWxlTG9hZENvbXBsZXRpb25CbG9jayBi bG9jaykgLT4gTlNQcm9ncmVzcyAqIHsKLSAgICAgICAgW3JldGFpbmVkRGF0YSB3cml0ZVRvRmls ZTpbcmV0YWluZWRUZW1wb3JhcnlVUkwgcGF0aF0gYXRvbWljYWxseTpZRVNdOwotICAgICAgICBk aXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbcmV0YWluZWRUZW1wb3Jh cnlVUkwsIGNhcHR1cmVkQmxvY2sgPSBtYWtlQmxvY2tQdHIoYmxvY2spXSB7Ci0gICAgICAgICAg ICBjYXB0dXJlZEJsb2NrKHJldGFpbmVkVGVtcG9yYXJ5VVJMLmdldCgpLCBOTywgbmlsKTsKLSAg ICAgICAgfSk7Ci0gICAgICAgIHJldHVybiBuaWw7Ci0gICAgfV07Ci19Ci0KIC0gKHZvaWQpcmVn aXN0ZXJEYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKil0eXBl SWRlbnRpZmllciB3aXRoRGF0YTooTlNEYXRhICopZGF0YQogewogICAgIFJldGFpblB0cjxOU0Rh dGE+IHJldGFpbmVkRGF0YSA9IGRhdGE7CkBAIC0zNDIsMTQgKzMxMiwxMyBAQCBURVNUKERhdGFJ bnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNvdXJjZUpTT05Ub0ZpbGVJbnB1dCkKIAogICAgIFJl dGFpblB0cjxVSUl0ZW1Qcm92aWRlcj4gc2ltdWxhdGVkSlNPTkl0ZW1Qcm92aWRlciA9IGFkb3B0 TlMoW1tVSUl0ZW1Qcm92aWRlciBhbGxvY10gaW5pdF0pOwogICAgIE5TRGF0YSAqanNvbkRhdGEg PSBbQCJ7IFwiZm9vXCI6IFwiYmFyXCIsICBcImJhclwiOiBcImJhelwiIH0iIGRhdGFVc2luZ0Vu Y29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXTsKLSAgICBbc2ltdWxhdGVkSlNPTkl0ZW1Qcm92 aWRlciByZWdpc3RlckZpbGVSZXByZXNlbnRhdGlvbkZvclR5cGVJZGVudGlmaWVyOihOU1N0cmlu ZyAqKWtVVFR5cGVKU09OIHdpdGhEYXRhOmpzb25EYXRhIGZpbGVuYW1lOkAiZGF0YS5qc29uIl07 CisgICAgW3NpbXVsYXRlZEpTT05JdGVtUHJvdmlkZXIgcmVnaXN0ZXJEYXRhUmVwcmVzZW50YXRp b25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBlSlNPTiB3aXRoRGF0YTpqc29u RGF0YV07CiAKICAgICBSZXRhaW5QdHI8RGF0YUludGVyYWN0aW9uU2ltdWxhdG9yPiBkYXRhSW50 ZXJhY3Rpb25TaW11bGF0b3IgPSBhZG9wdE5TKFtbRGF0YUludGVyYWN0aW9uU2ltdWxhdG9yIGFs bG9jXSBpbml0V2l0aFdlYlZpZXc6d2ViVmlldy5nZXQoKV0pOwogICAgIFtkYXRhSW50ZXJhY3Rp b25TaW11bGF0b3Igc2V0RXh0ZXJuYWxJdGVtUHJvdmlkZXJzOkBbIHNpbXVsYXRlZEpTT05JdGVt UHJvdmlkZXIuZ2V0KCkgXV07CiAgICAgW2RhdGFJbnRlcmFjdGlvblNpbXVsYXRvciBydW5Gcm9t OkNHUG9pbnRNYWtlKDIwMCwgMTAwKSB0bzpDR1BvaW50TWFrZSgxMDAsIDEwMCldOwogCiAgICAg RVhQRUNUX1dLX1NUUkVRKCJhcHBsaWNhdGlvbi9qc29uIiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpAIm91dHB1dC52YWx1ZSJdKTsKLSAgICBjbGVhblVwRGF0YUludGVy YWN0aW9uVGVtcG9yYXJ5UGF0aCgpOwogfQogCiBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBF eHRlcm5hbFNvdXJjZUltYWdlVG9GaWxlSW5wdXQpCkBAIC0zNTksNyArMzI4LDcgQEAgVEVTVChE YXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VJbWFnZVRvRmlsZUlucHV0KQogCiAg ICAgUmV0YWluUHRyPFVJSXRlbVByb3ZpZGVyPiBzaW11bGF0ZWRJbWFnZUl0ZW1Qcm92aWRlciA9 IGFkb3B0TlMoW1tVSUl0ZW1Qcm92aWRlciBhbGxvY10gaW5pdF0pOwogICAgIE5TRGF0YSAqaW1h Z2VEYXRhID0gVUlJbWFnZUpQRUdSZXByZXNlbnRhdGlvbih0ZXN0SWNvbkltYWdlKCksIDAuNSk7 Ci0gICAgW3NpbXVsYXRlZEltYWdlSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJlcHJlc2VudGF0 aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUpQRUcgd2l0aERhdGE6aW1h Z2VEYXRhIGZpbGVuYW1lOkAiaW1hZ2UucG5nIl07CisgICAgW3NpbXVsYXRlZEltYWdlSXRlbVBy b3ZpZGVyIHJlZ2lzdGVyRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3Ry aW5nICopa1VUVHlwZUpQRUcgd2l0aERhdGE6aW1hZ2VEYXRhXTsKIAogICAgIFJldGFpblB0cjxE YXRhSW50ZXJhY3Rpb25TaW11bGF0b3I+IGRhdGFJbnRlcmFjdGlvblNpbXVsYXRvciA9IGFkb3B0 TlMoW1tEYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgYWxsb2NdIGluaXRXaXRoV2ViVmlldzp3ZWJW aWV3LmdldCgpXSk7CiAgICAgW2RhdGFJbnRlcmFjdGlvblNpbXVsYXRvciBzZXRFeHRlcm5hbEl0 ZW1Qcm92aWRlcnM6QFsgc2ltdWxhdGVkSW1hZ2VJdGVtUHJvdmlkZXIuZ2V0KCkgXV07CkBAIC0z NjcsOCArMzM2LDYgQEAgVEVTVChEYXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VJ bWFnZVRvRmlsZUlucHV0KQogCiAgICAgTlNTdHJpbmcgKm91dHB1dFZhbHVlID0gW3dlYlZpZXcg c3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIm91dHB1dC52YWx1ZSJdOwogICAgIEVYUEVD VF9XS19TVFJFUSgiaW1hZ2UvanBlZyIsIG91dHB1dFZhbHVlLlVURjhTdHJpbmcpOwotCi0gICAg Y2xlYW5VcERhdGFJbnRlcmFjdGlvblRlbXBvcmFyeVBhdGgoKTsKIH0KIAogVEVTVChEYXRhSW50 ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VIVE1MVG9VcGxvYWRBcmVhKQpAQCAtMzc4LDcg KzM0NSw3IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4dGVybmFsU291cmNlSFRNTFRv VXBsb2FkQXJlYSkKIAogICAgIFJldGFpblB0cjxVSUl0ZW1Qcm92aWRlcj4gc2ltdWxhdGVkSFRN TEl0ZW1Qcm92aWRlciA9IGFkb3B0TlMoW1tVSUl0ZW1Qcm92aWRlciBhbGxvY10gaW5pdF0pOwog ICAgIE5TRGF0YSAqaHRtbERhdGEgPSBbQCI8Ym9keSBjb250ZW50ZWRpdGFibGU+PC9ib2R5PiIg ZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddOwotICAgIFtzaW11bGF0ZWRI VE1MSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZp ZXI6KE5TU3RyaW5nICopa1VUVHlwZUhUTUwgd2l0aERhdGE6aHRtbERhdGEgZmlsZW5hbWU6QCJp bmRleC5odG1sIl07CisgICAgW3NpbXVsYXRlZEhUTUxJdGVtUHJvdmlkZXIgcmVnaXN0ZXJEYXRh UmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBlSFRNTCB3 aXRoRGF0YTpodG1sRGF0YV07CiAKICAgICBSZXRhaW5QdHI8RGF0YUludGVyYWN0aW9uU2ltdWxh dG9yPiBkYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgPSBhZG9wdE5TKFtbRGF0YUludGVyYWN0aW9u U2ltdWxhdG9yIGFsbG9jXSBpbml0V2l0aFdlYlZpZXc6d2ViVmlldy5nZXQoKV0pOwogICAgIFtk YXRhSW50ZXJhY3Rpb25TaW11bGF0b3Igc2V0RXh0ZXJuYWxJdGVtUHJvdmlkZXJzOkBbIHNpbXVs YXRlZEhUTUxJdGVtUHJvdmlkZXIuZ2V0KCkgXV07CkBAIC0zODYsOCArMzUzLDYgQEAgVEVTVChE YXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VIVE1MVG9VcGxvYWRBcmVhKQogCiAg ICAgTlNTdHJpbmcgKm91dHB1dFZhbHVlID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2 YVNjcmlwdDpAIm91dHB1dC52YWx1ZSJdOwogICAgIEVYUEVDVF9XS19TVFJFUSgidGV4dC9odG1s Iiwgb3V0cHV0VmFsdWUuVVRGOFN0cmluZyk7Ci0KLSAgICBjbGVhblVwRGF0YUludGVyYWN0aW9u VGVtcG9yYXJ5UGF0aCgpOwogfQogCiBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5h bFNvdXJjZUltYWdlQW5kSFRNTFRvU2luZ2xlRmlsZUlucHV0KQpAQCAtMzk3LDExICszNjIsMTEg QEAgVEVTVChEYXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VJbWFnZUFuZEhUTUxU b1NpbmdsZUZpbGVJbnB1dCkKIAogICAgIFJldGFpblB0cjxVSUl0ZW1Qcm92aWRlcj4gc2ltdWxh dGVkSW1hZ2VJdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbVUlJdGVtUHJvdmlkZXIgYWxsb2NdIGlu aXRdKTsKICAgICBOU0RhdGEgKmltYWdlRGF0YSA9IFVJSW1hZ2VKUEVHUmVwcmVzZW50YXRpb24o dGVzdEljb25JbWFnZSgpLCAwLjUpOwotICAgIFtzaW11bGF0ZWRJbWFnZUl0ZW1Qcm92aWRlciBy ZWdpc3RlckZpbGVSZXByZXNlbnRhdGlvbkZvclR5cGVJZGVudGlmaWVyOihOU1N0cmluZyAqKWtV VFR5cGVKUEVHIHdpdGhEYXRhOmltYWdlRGF0YSBmaWxlbmFtZTpAImltYWdlLnBuZyJdOworICAg IFtzaW11bGF0ZWRJbWFnZUl0ZW1Qcm92aWRlciByZWdpc3RlckRhdGFSZXByZXNlbnRhdGlvbkZv clR5cGVJZGVudGlmaWVyOihOU1N0cmluZyAqKWtVVFR5cGVKUEVHIHdpdGhEYXRhOmltYWdlRGF0 YV07CiAKICAgICBSZXRhaW5QdHI8VUlJdGVtUHJvdmlkZXI+IHNpbXVsYXRlZEhUTUxJdGVtUHJv dmlkZXIgPSBhZG9wdE5TKFtbVUlJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRdKTsKICAgICBOU0Rh dGEgKmh0bWxEYXRhID0gW0AiPGJvZHkgY29udGVudGVkaXRhYmxlPjwvYm9keT4iIGRhdGFVc2lu Z0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXTsKLSAgICBbc2ltdWxhdGVkSFRNTEl0ZW1Q cm92aWRlciByZWdpc3RlckZpbGVSZXByZXNlbnRhdGlvbkZvclR5cGVJZGVudGlmaWVyOihOU1N0 cmluZyAqKWtVVFR5cGVIVE1MIHdpdGhEYXRhOmh0bWxEYXRhIGZpbGVuYW1lOkAiaW5kZXguaHRt bCJdOworICAgIFtzaW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRGF0YVJlcHJlc2Vu dGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUhUTUwgd2l0aERhdGE6 aHRtbERhdGFdOwogCiAgICAgUmV0YWluUHRyPERhdGFJbnRlcmFjdGlvblNpbXVsYXRvcj4gZGF0 YUludGVyYWN0aW9uU2ltdWxhdG9yID0gYWRvcHROUyhbW0RhdGFJbnRlcmFjdGlvblNpbXVsYXRv ciBhbGxvY10gaW5pdFdpdGhXZWJWaWV3OndlYlZpZXcuZ2V0KCldKTsKICAgICBbZGF0YUludGVy YWN0aW9uU2ltdWxhdG9yIHNldEV4dGVybmFsSXRlbVByb3ZpZGVyczpAWyBzaW11bGF0ZWRIVE1M SXRlbVByb3ZpZGVyLmdldCgpLCBzaW11bGF0ZWRJbWFnZUl0ZW1Qcm92aWRlci5nZXQoKSBdXTsK QEAgLTQwOSw4ICszNzQsNiBAQCBURVNUKERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNv dXJjZUltYWdlQW5kSFRNTFRvU2luZ2xlRmlsZUlucHV0KQogCiAgICAgTlNTdHJpbmcgKm91dHB1 dFZhbHVlID0gW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIm91dHB1dC52 YWx1ZSJdOwogICAgIEVYUEVDVF9XS19TVFJFUSgiIiwgb3V0cHV0VmFsdWUuVVRGOFN0cmluZyk7 Ci0KLSAgICBjbGVhblVwRGF0YUludGVyYWN0aW9uVGVtcG9yYXJ5UGF0aCgpOwogfQogCiBURVNU KERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNvdXJjZUltYWdlQW5kSFRNTFRvTXVsdGlw bGVGaWxlSW5wdXQpCkBAIC00MjEsMTEgKzM4NCwxMSBAQCBURVNUKERhdGFJbnRlcmFjdGlvblRl c3RzLCBFeHRlcm5hbFNvdXJjZUltYWdlQW5kSFRNTFRvTXVsdGlwbGVGaWxlSW5wdXQpCiAKICAg ICBSZXRhaW5QdHI8VUlJdGVtUHJvdmlkZXI+IHNpbXVsYXRlZEltYWdlSXRlbVByb3ZpZGVyID0g YWRvcHROUyhbW1VJSXRlbVByb3ZpZGVyIGFsbG9jXSBpbml0XSk7CiAgICAgTlNEYXRhICppbWFn ZURhdGEgPSBVSUltYWdlSlBFR1JlcHJlc2VudGF0aW9uKHRlc3RJY29uSW1hZ2UoKSwgMC41KTsK LSAgICBbc2ltdWxhdGVkSW1hZ2VJdGVtUHJvdmlkZXIgcmVnaXN0ZXJGaWxlUmVwcmVzZW50YXRp b25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBlSlBFRyB3aXRoRGF0YTppbWFn ZURhdGEgZmlsZW5hbWU6QCJpbWFnZS5wbmciXTsKKyAgICBbc2ltdWxhdGVkSW1hZ2VJdGVtUHJv dmlkZXIgcmVnaXN0ZXJEYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJp bmcgKilrVVRUeXBlSlBFRyB3aXRoRGF0YTppbWFnZURhdGFdOwogCiAgICAgUmV0YWluUHRyPFVJ SXRlbVByb3ZpZGVyPiBzaW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyID0gYWRvcHROUyhbW1VJSXRl bVByb3ZpZGVyIGFsbG9jXSBpbml0XSk7CiAgICAgTlNEYXRhICpodG1sRGF0YSA9IFtAIjxib2R5 IGNvbnRlbnRlZGl0YWJsZT48L2JvZHk+IiBkYXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdF bmNvZGluZ107Ci0gICAgW3NpbXVsYXRlZEhUTUxJdGVtUHJvdmlkZXIgcmVnaXN0ZXJGaWxlUmVw cmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjooTlNTdHJpbmcgKilrVVRUeXBlSFRNTCB3aXRo RGF0YTpodG1sRGF0YSBmaWxlbmFtZTpAImluZGV4Lmh0bWwiXTsKKyAgICBbc2ltdWxhdGVkSFRN TEl0ZW1Qcm92aWRlciByZWdpc3RlckRhdGFSZXByZXNlbnRhdGlvbkZvclR5cGVJZGVudGlmaWVy OihOU1N0cmluZyAqKWtVVFR5cGVIVE1MIHdpdGhEYXRhOmh0bWxEYXRhXTsKIAogICAgIFJldGFp blB0cjxEYXRhSW50ZXJhY3Rpb25TaW11bGF0b3I+IGRhdGFJbnRlcmFjdGlvblNpbXVsYXRvciA9 IGFkb3B0TlMoW1tEYXRhSW50ZXJhY3Rpb25TaW11bGF0b3IgYWxsb2NdIGluaXRXaXRoV2ViVmll dzp3ZWJWaWV3LmdldCgpXSk7CiAgICAgW2RhdGFJbnRlcmFjdGlvblNpbXVsYXRvciBzZXRFeHRl cm5hbEl0ZW1Qcm92aWRlcnM6QFsgc2ltdWxhdGVkSFRNTEl0ZW1Qcm92aWRlci5nZXQoKSwgc2lt dWxhdGVkSW1hZ2VJdGVtUHJvdmlkZXIuZ2V0KCkgXV07CkBAIC00MzMsOCArMzk2LDYgQEAgVEVT VChEYXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VJbWFnZUFuZEhUTUxUb011bHRp cGxlRmlsZUlucHV0KQogCiAgICAgTlNTdHJpbmcgKm91dHB1dFZhbHVlID0gW3dlYlZpZXcgc3Ry aW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAIm91dHB1dC52YWx1ZSJdOwogICAgIEVYUEVDVF9X S19TVFJFUSgiaW1hZ2UvanBlZywgdGV4dC9odG1sIiwgb3V0cHV0VmFsdWUuVVRGOFN0cmluZyk7 Ci0KLSAgICBjbGVhblVwRGF0YUludGVyYWN0aW9uVGVtcG9yYXJ5UGF0aCgpOwogfQogCiBURVNU KERhdGFJbnRlcmFjdGlvblRlc3RzLCBFeHRlcm5hbFNvdXJjZUltYWdlQW5kSFRNTFRvVXBsb2Fk QXJlYSkKQEAgLTQ0NCwxNSArNDA1LDE1IEBAIFRFU1QoRGF0YUludGVyYWN0aW9uVGVzdHMsIEV4 dGVybmFsU291cmNlSW1hZ2VBbmRIVE1MVG9VcGxvYWRBcmVhKQogCiAgICAgUmV0YWluUHRyPFVJ SXRlbVByb3ZpZGVyPiBzaW11bGF0ZWRJbWFnZUl0ZW1Qcm92aWRlciA9IGFkb3B0TlMoW1tVSUl0 ZW1Qcm92aWRlciBhbGxvY10gaW5pdF0pOwogICAgIE5TRGF0YSAqaW1hZ2VEYXRhID0gVUlJbWFn ZUpQRUdSZXByZXNlbnRhdGlvbih0ZXN0SWNvbkltYWdlKCksIDAuNSk7Ci0gICAgW3NpbXVsYXRl ZEltYWdlSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50 aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUpQRUcgd2l0aERhdGE6aW1hZ2VEYXRhIGZpbGVuYW1l OkAiaW1hZ2UucG5nIl07CisgICAgW3NpbXVsYXRlZEltYWdlSXRlbVByb3ZpZGVyIHJlZ2lzdGVy RGF0YVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUpQ RUcgd2l0aERhdGE6aW1hZ2VEYXRhXTsKIAogICAgIFJldGFpblB0cjxVSUl0ZW1Qcm92aWRlcj4g Zmlyc3RTaW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyID0gYWRvcHROUyhbW1VJSXRlbVByb3ZpZGVy IGFsbG9jXSBpbml0XSk7CiAgICAgTlNEYXRhICpmaXJzdEhUTUxEYXRhID0gW0AiPGJvZHkgY29u dGVudGVkaXRhYmxlPjwvYm9keT4iIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29k aW5nXTsKLSAgICBbZmlyc3RTaW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJl cHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUhUTUwgd2l0 aERhdGE6Zmlyc3RIVE1MRGF0YSBmaWxlbmFtZTpAImluZGV4Lmh0bWwiXTsKKyAgICBbZmlyc3RT aW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlw ZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUhUTUwgd2l0aERhdGE6Zmlyc3RIVE1MRGF0 YV07CiAKICAgICBSZXRhaW5QdHI8VUlJdGVtUHJvdmlkZXI+IHNlY29uZFNpbXVsYXRlZEhUTUxJ dGVtUHJvdmlkZXIgPSBhZG9wdE5TKFtbVUlJdGVtUHJvdmlkZXIgYWxsb2NdIGluaXRdKTsKICAg ICBOU0RhdGEgKnNlY29uZEhUTUxEYXRhID0gW0AiPGh0bWw+PGJvZHk+aGVsbG8gd29ybGQ8L2Jv ZHk+PC9odG1sPiIgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddOwotICAg IFtzZWNvbmRTaW11bGF0ZWRIVE1MSXRlbVByb3ZpZGVyIHJlZ2lzdGVyRmlsZVJlcHJlc2VudGF0 aW9uRm9yVHlwZUlkZW50aWZpZXI6KE5TU3RyaW5nICopa1VUVHlwZUhUTUwgd2l0aERhdGE6c2Vj b25kSFRNTERhdGEgZmlsZW5hbWU6QCJpbmRleC5odG1sIl07CisgICAgW3NlY29uZFNpbXVsYXRl ZEhUTUxJdGVtUHJvdmlkZXIgcmVnaXN0ZXJEYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRp ZmllcjooTlNTdHJpbmcgKilrVVRUeXBlSFRNTCB3aXRoRGF0YTpzZWNvbmRIVE1MRGF0YV07CiAK ICAgICBSZXRhaW5QdHI8RGF0YUludGVyYWN0aW9uU2ltdWxhdG9yPiBkYXRhSW50ZXJhY3Rpb25T aW11bGF0b3IgPSBhZG9wdE5TKFtbRGF0YUludGVyYWN0aW9uU2ltdWxhdG9yIGFsbG9jXSBpbml0 V2l0aFdlYlZpZXc6d2ViVmlldy5nZXQoKV0pOwogICAgIFtkYXRhSW50ZXJhY3Rpb25TaW11bGF0 b3Igc2V0RXh0ZXJuYWxJdGVtUHJvdmlkZXJzOkBbIHNpbXVsYXRlZEltYWdlSXRlbVByb3ZpZGVy LmdldCgpLCBmaXJzdFNpbXVsYXRlZEhUTUxJdGVtUHJvdmlkZXIuZ2V0KCksIHNlY29uZFNpbXVs YXRlZEhUTUxJdGVtUHJvdmlkZXIuZ2V0KCkgXV07CkBAIC00NjAsOCArNDIxLDYgQEAgVEVTVChE YXRhSW50ZXJhY3Rpb25UZXN0cywgRXh0ZXJuYWxTb3VyY2VJbWFnZUFuZEhUTUxUb1VwbG9hZEFy ZWEpCiAKICAgICBOU1N0cmluZyAqb3V0cHV0VmFsdWUgPSBbd2ViVmlldyBzdHJpbmdCeUV2YWx1 YXRpbmdKYXZhU2NyaXB0OkAib3V0cHV0LnZhbHVlIl07CiAgICAgRVhQRUNUX1dLX1NUUkVRKCJp bWFnZS9qcGVnLCB0ZXh0L2h0bWwsIHRleHQvaHRtbCIsIG91dHB1dFZhbHVlLlVURjhTdHJpbmcp OwotCi0gICAgY2xlYW5VcERhdGFJbnRlcmFjdGlvblRlbXBvcmFyeVBhdGgoKTsKIH0KIAogVEVT VChEYXRhSW50ZXJhY3Rpb25UZXN0cywgUmVzcGVjdHNFeHRlcm5hbFNvdXJjZUZpZGVsaXR5UmFu a2luZ3MpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9EYXRhSW50ZXJhY3Rp b25TaW11bGF0b3IuaCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RhdGFJbnRlcmFjdGlvblNp bXVsYXRvci5oCmluZGV4IDZiYmUwNjY0MGYzNzEyY2QwOGZiZmQ2YzdhYjhjMzdiMjhlNTg3ODIu LjM0MzZlYzQ4ZWE1MjIyYzllZDUyODI0YTUyYTVlOTBlNDQ4ZDA2MWEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RhdGFJbnRlcmFjdGlvblNpbXVsYXRvci5oCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvaW9zL0RhdGFJbnRlcmFjdGlvblNpbXVsYXRvci5oCkBAIC0yMyw3 ICsyMyw3IEBACiAgKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAgKi8KIAotI2lm IDAKKyNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikKIAogI2ltcG9ydCAiVGVzdFdLV2ViVmll dy5oIgogI2ltcG9ydCA8VUlLaXQvVUlJdGVtUHJvdmlkZXIuaD4KZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvaW9zL0RhdGFJbnRlcmFjdGlvblNpbXVsYXRvci5tbSBiL1Rvb2xzL1Rl c3RXZWJLaXRBUEkvaW9zL0RhdGFJbnRlcmFjdGlvblNpbXVsYXRvci5tbQppbmRleCAwMjY2Y2Rk NmYxN2FjMmVmNzVhNWE2MjY5YTBkY2U4MGY1YWMyYjlhLi4xNmM2NTM3YzAzM2UzNzZkN2Q0ZTVi ZGRjODBkMjA5NjMzNzZiYjljIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2lvcy9E YXRhSW50ZXJhY3Rpb25TaW11bGF0b3IubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3Mv RGF0YUludGVyYWN0aW9uU2ltdWxhdG9yLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAi Y29uZmlnLmgiCiAjaW5jbHVkZSAiRGF0YUludGVyYWN0aW9uU2ltdWxhdG9yLmgiCiAKLSNpZiAw CisjaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCiAKICNpbXBvcnQgIkluc3RhbmNlTWV0aG9k U3dpenpsZXIuaCIKICNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCg==