225899 2021-05-17 17:29:25 -0700 Drop SQLiteStatement::return*Results() functions 2021-05-17 22:37:17 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen darin ggaren sam sihui_liu webkit-bug-importer oldest_to_newest 1760969 0 cdumez 2021-05-17 17:29:25 -0700 Drop SQLiteStatement::return*Results() functions. All of them are unused except for returnTextResults(), which is used once in SQLiteDatabase. 1760972 1 428899 cdumez 2021-05-17 17:36:29 -0700 Created attachment 428899 Patch 1761017 2 428908 cdumez 2021-05-17 20:17:48 -0700 Created attachment 428908 Patch 1761034 3 ews-feeder 2021-05-17 22:36:46 -0700 Committed r277642 (237848@main): <https://commits.webkit.org/237848@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428908. 1761035 4 webkit-bug-importer 2021-05-17 22:37:17 -0700 <rdar://problem/78139383> 428899 2021-05-17 17:36:29 -0700 2021-05-17 20:19:54 -0700 Patch bug-225899-20210517173628.patch text/plain 5901 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTIyMTI0OGJjOGFkM2Mx M2QwMzY1YzVjZjVmZWFjMWY4MWM5YjU3My4uYjUyNjczYjBjYjIyYmRiMWNlYjc3ZmMxY2JmOWZm NjkwMjdjZGI5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBTUUxpdGVTdGF0ZW1l bnQ6OnJldHVybipSZXN1bHRzKCkgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBEcm9wIFNRTGl0ZVN0YXRlbWVudDo6cmV0dXJuKlJlc3Vs dHMoKSBmdW5jdGlvbnMuIEFsbCBvZiB0aGVtIGFyZSB1bnVzZWQKKyAgICAgICAgZXhjZXB0IGZv ciByZXR1cm5UZXh0UmVzdWx0cygpLCB3aGljaCBpcyB1c2VkIG9ubHkgb25jZSBpbiBTUUxpdGVE YXRhYmFzZS4KKworICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZTo6Y2xlYXJBbGxUYWJsZXMpOgorICAgICAg ICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVTdGF0ZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U1FMaXRlU3RhdGVtZW50OjpyZXR1cm5UZXh0UmVzdWx0cyk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkludFJlc3VsdHMpOiBEZWxldGVkLgorICAg ICAgICAoV2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50OjpyZXR1cm5JbnQ2NFJlc3VsdHMpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6U1FMaXRlU3RhdGVtZW50OjpyZXR1cm5Eb3VibGVSZXN1 bHRzKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50Lmg6 CisKIDIwMjEtMDUtMTcgIEFsYmVydG8gR2FyY2lhICA8YmVydG9AaWdhbGlhLmNvbT4KIAogICAg ICAgICBbR1RLXSBbMi4zMy4xXSBGYWlscyB0byBidWlsZCB3aGVuIEhBVkVfT1BFTkdMX0VTXzMg aXMgb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRh YmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJhc2UuY3Bw CmluZGV4IDIwMjZmYTIzMTFhN2UxYWM3MGZlNzYzYzk4MjM0OGE2ODY2ZDM1MTUuLjFkYTMyNzcz NjQ2YmJkN2E2MmViZDcyZmNlMmZmMGJkYzc0MDY2YTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcApAQCAtMzk3LDE4ICszOTcsMTcgQEAgYm9v bCBTUUxpdGVEYXRhYmFzZTo6dGFibGVFeGlzdHMoY29uc3QgU3RyaW5nJiB0YWJsZU5hbWUpCiAK IHZvaWQgU1FMaXRlRGF0YWJhc2U6OmNsZWFyQWxsVGFibGVzKCkKIHsKLSAgICBWZWN0b3I8U3Ry aW5nPiB0YWJsZXM7Ci0gICAgYXV0byBzdGF0ZW1lbnQgPSBwcmVwYXJlU3RhdGVtZW50KCJTRUxF Q1QgbmFtZSBGUk9NIHNxbGl0ZV9tYXN0ZXIgV0hFUkUgdHlwZT0ndGFibGUnOyJfcyk7Ci0gICAg aWYgKCFzdGF0ZW1lbnQgfHwgIXN0YXRlbWVudC0+cmV0dXJuVGV4dFJlc3VsdHMoMCwgdGFibGVz KSkgewotICAgICAgICBMT0coU1FMRGF0YWJhc2UsICJVbmFibGUgdG8gcmV0cmlldmUgbGlzdCBv ZiB0YWJsZXMgZnJvbSBkYXRhYmFzZSIpOworICAgIGF1dG8gc3RhdGVtZW50ID0gcHJlcGFyZVN0 YXRlbWVudCgiU0VMRUNUIG5hbWUgRlJPTSBzcWxpdGVfbWFzdGVyIFdIRVJFIHR5cGU9J3RhYmxl JyBuYW1lIE5PVCBMSUtFICdzcWxpdGVfJSc7Il9zKTsKKyAgICBpZiAoIXN0YXRlbWVudCkgewor ICAgICAgICBMT0coU1FMRGF0YWJhc2UsICJGYWlsZWQgdG8gcHJlcGFyZSBzdGF0ZW1lbnQgdG8g cmV0cmlldmUgbGlzdCBvZiB0YWJsZXMgZnJvbSBkYXRhYmFzZSIpOwogICAgICAgICByZXR1cm47 CiAgICAgfQotICAgIAotICAgIGZvciAoVmVjdG9yPFN0cmluZz46Oml0ZXJhdG9yIHRhYmxlID0g dGFibGVzLmJlZ2luKCk7IHRhYmxlICE9IHRhYmxlcy5lbmQoKTsgKyt0YWJsZSApIHsKLSAgICAg ICAgaWYgKCp0YWJsZSA9PSAic3FsaXRlX3NlcXVlbmNlIikKLSAgICAgICAgICAgIGNvbnRpbnVl OwotICAgICAgICBpZiAoIWV4ZWN1dGVDb21tYW5kU2xvdygiRFJPUCBUQUJMRSAiICsgKnRhYmxl KSkKLSAgICAgICAgICAgIExPRyhTUUxEYXRhYmFzZSwgIlVuYWJsZSB0byBkcm9wIHRhYmxlICVz IiwgKCp0YWJsZSkuYXNjaWkoKS5kYXRhKCkpOworICAgIFZlY3RvcjxTdHJpbmc+IHRhYmxlczsK KyAgICB3aGlsZSAoc3RhdGVtZW50LT5zdGVwKCkgPT0gU1FMSVRFX1JPVykKKyAgICAgICAgdGFi bGVzLmFwcGVuZChzdGF0ZW1lbnQtPmdldENvbHVtblRleHQoMCkpOworICAgIGZvciAoYXV0byYg dGFibGUgOiB0YWJsZXMpIHsKKyAgICAgICAgaWYgKCFleGVjdXRlQ29tbWFuZFNsb3coIkRST1Ag VEFCTEUgIiArIHRhYmxlKSkKKyAgICAgICAgICAgIExPRyhTUUxEYXRhYmFzZSwgIlVuYWJsZSB0 byBkcm9wIHRhYmxlICVzIiwgdGFibGUuYXNjaWkoKS5kYXRhKCkpOwogICAgIH0KIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcAppbmRleCA0 OGY5YWVlMmQ3MWQ5MWZiNDU3MDIyMmQ0ZTViMDc4OGEwYmUxNWRmLi5mN2VhNTVlOTY4NzAwMjMy YmJjZGNiOTA3YzUxZWVhNmMyZDQ2NmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcApAQCAtMzU2LDc2ICszNTYsNiBAQCB2b2lkIFNRTGl0 ZVN0YXRlbWVudDo6Z2V0Q29sdW1uQmxvYkFzVmVjdG9yKGludCBjb2wsIFZlY3Rvcjx1aW50OF90 PiYgcmVzdWx0KQogICAgICAgICByZXN1bHRbaV0gPSAoc3RhdGljX2Nhc3Q8Y29uc3QgdWludDhf dCo+KGJsb2IpKVtpXTsKIH0KIAotYm9vbCBTUUxpdGVTdGF0ZW1lbnQ6OnJldHVyblRleHRSZXN1 bHRzKGludCBjb2wsIFZlY3RvcjxTdHJpbmc+JiB2KQotewotICAgIEFTU0VSVChjb2wgPj0gMCk7 Ci0KLSAgICB2LmNsZWFyKCk7Ci0KLSAgICBpZiAoaGFzU3RhcnRlZFN0ZXBwaW5nKCkpCi0gICAg ICAgIHJlc2V0KCk7Ci0KLSAgICB3aGlsZSAoc3RlcCgpID09IFNRTElURV9ST1cpCi0gICAgICAg IHYuYXBwZW5kKGdldENvbHVtblRleHQoY29sKSk7Ci0gICAgYm9vbCByZXN1bHQgPSB0cnVlOwot ICAgIGlmIChtX2RhdGFiYXNlLmxhc3RFcnJvcigpICE9IFNRTElURV9ET05FKSB7Ci0gICAgICAg IHJlc3VsdCA9IGZhbHNlOwotICAgICAgICBMT0coU1FMRGF0YWJhc2UsICJTUUxpdGVTdGF0ZW1l bnQ6OnJldHVyblRleHRSZXN1bHRzOiBFcnJvciByZWFkaW5nIHJlc3VsdHMiKTsKLSAgICB9Ci0g ICAgcmV0dXJuIHJlc3VsdDsKLX0KLQotYm9vbCBTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkludFJl c3VsdHMoaW50IGNvbCwgVmVjdG9yPGludD4mIHYpCi17Ci0gICAgdi5jbGVhcigpOwotCi0gICAg aWYgKGhhc1N0YXJ0ZWRTdGVwcGluZygpKQotICAgICAgICByZXNldCgpOwotCi0gICAgd2hpbGUg KHN0ZXAoKSA9PSBTUUxJVEVfUk9XKQotICAgICAgICB2LmFwcGVuZChnZXRDb2x1bW5JbnQoY29s KSk7Ci0gICAgYm9vbCByZXN1bHQgPSB0cnVlOwotICAgIGlmIChtX2RhdGFiYXNlLmxhc3RFcnJv cigpICE9IFNRTElURV9ET05FKSB7Ci0gICAgICAgIHJlc3VsdCA9IGZhbHNlOwotICAgICAgICBM T0coU1FMRGF0YWJhc2UsICJTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkludFJlc3VsdHM6IEVycm9y IHJlYWRpbmcgcmVzdWx0cyIpOwotICAgIH0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1ib29s IFNRTGl0ZVN0YXRlbWVudDo6cmV0dXJuSW50NjRSZXN1bHRzKGludCBjb2wsIFZlY3RvcjxpbnQ2 NF90PiYgdikKLXsKLSAgICB2LmNsZWFyKCk7Ci0KLSAgICBpZiAoaGFzU3RhcnRlZFN0ZXBwaW5n KCkpCi0gICAgICAgIHJlc2V0KCk7Ci0KLSAgICB3aGlsZSAoc3RlcCgpID09IFNRTElURV9ST1cp Ci0gICAgICAgIHYuYXBwZW5kKGdldENvbHVtbkludDY0KGNvbCkpOwotICAgIGJvb2wgcmVzdWx0 ID0gdHJ1ZTsKLSAgICBpZiAobV9kYXRhYmFzZS5sYXN0RXJyb3IoKSAhPSBTUUxJVEVfRE9ORSkg ewotICAgICAgICByZXN1bHQgPSBmYWxzZTsKLSAgICAgICAgTE9HKFNRTERhdGFiYXNlLCAiU1FM aXRlU3RhdGVtZW50OjpyZXR1cm5JbnQ2NFJlc3VsdHM6IEVycm9yIHJlYWRpbmcgcmVzdWx0cyIp OwotICAgIH0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1ib29sIFNRTGl0ZVN0YXRlbWVudDo6 cmV0dXJuRG91YmxlUmVzdWx0cyhpbnQgY29sLCBWZWN0b3I8ZG91YmxlPiYgdikKLXsKLSAgICB2 LmNsZWFyKCk7Ci0KLSAgICBpZiAoaGFzU3RhcnRlZFN0ZXBwaW5nKCkpCi0gICAgICAgIHJlc2V0 KCk7Ci0KLSAgICB3aGlsZSAoc3RlcCgpID09IFNRTElURV9ST1cpCi0gICAgICAgIHYuYXBwZW5k KGdldENvbHVtbkRvdWJsZShjb2wpKTsKLSAgICBib29sIHJlc3VsdCA9IHRydWU7Ci0gICAgaWYg KG1fZGF0YWJhc2UubGFzdEVycm9yKCkgIT0gU1FMSVRFX0RPTkUpIHsKLSAgICAgICAgcmVzdWx0 ID0gZmFsc2U7Ci0gICAgICAgIExPRyhTUUxEYXRhYmFzZSwgIlNRTGl0ZVN0YXRlbWVudDo6cmV0 dXJuRG91YmxlUmVzdWx0czogRXJyb3IgcmVhZGluZyByZXN1bHRzIik7Ci0gICAgfQotICAgIHJl dHVybiByZXN1bHQ7Ci19Ci0KIGJvb2wgU1FMaXRlU3RhdGVtZW50OjpoYXNTdGFydGVkU3RlcHBp bmcoKQogewogICAgIHJldHVybiBzcWxpdGUzX3N0bXRfYnVzeShtX3N0YXRlbWVudCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmgKaW5kZXggNjM1MTJi YjZlYjQ5YTZlZTE5ZTcxZjFjNjdiMWZlOGYyOWY2NWM4ZC4uYjQ0NjhhYzViNzJkMmVkMDU3ZjFj NDQ0ZDI1MjFmZGUzOGNjMTVlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v c3FsL1NRTGl0ZVN0YXRlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9T UUxpdGVTdGF0ZW1lbnQuaApAQCAtNzcsMTEgKzc3LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVf RVhQT1JUIHZvaWQgZ2V0Q29sdW1uQmxvYkFzVmVjdG9yKGludCBjb2wsIFZlY3RvcjxjaGFyPiYp OwogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZ2V0Q29sdW1uQmxvYkFzVmVjdG9yKGludCBjb2ws IFZlY3Rvcjx1aW50OF90PiYpOwogCi0gICAgYm9vbCByZXR1cm5UZXh0UmVzdWx0cyhpbnQgY29s LCBWZWN0b3I8U3RyaW5nPiYpOwotICAgIGJvb2wgcmV0dXJuSW50UmVzdWx0cyhpbnQgY29sLCBW ZWN0b3I8aW50PiYpOwotICAgIGJvb2wgcmV0dXJuSW50NjRSZXN1bHRzKGludCBjb2wsIFZlY3Rv cjxpbnQ2NF90PiYpOwotICAgIGJvb2wgcmV0dXJuRG91YmxlUmVzdWx0cyhpbnQgY29sLCBWZWN0 b3I8ZG91YmxlPiYpOwotCiAgICAgU1FMaXRlRGF0YWJhc2UmIGRhdGFiYXNlKCkgeyByZXR1cm4g bV9kYXRhYmFzZTsgfQogICAgIAogcHJpdmF0ZToK 428908 2021-05-17 20:17:48 -0700 2021-05-17 22:36:47 -0700 Patch bug-225899-20210517201747.patch text/plain 5937 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc4ODMxNDg0NDU5NTNj MDJkMjZlYmY0NTQ2YTE4NzQxZTc0ZWM2OC4uMjM5ZGM5ODQ5MjM2ZThlZmE1YWI3ZTQ1MTY0MDlh ZDhmYjVmZWEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIxLTA1LTE3ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRHJvcCBTUUxpdGVTdGF0ZW1l bnQ6OnJldHVybipSZXN1bHRzKCkgZnVuY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU4OTkKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4 IENocmlzdGVuc2VuLgorCisgICAgICAgIERyb3AgU1FMaXRlU3RhdGVtZW50OjpyZXR1cm4qUmVz dWx0cygpIGZ1bmN0aW9ucy4gQWxsIG9mIHRoZW0gYXJlIHVudXNlZAorICAgICAgICBleGNlcHQg Zm9yIHJldHVyblRleHRSZXN1bHRzKCksIHdoaWNoIGlzIHVzZWQgb25seSBvbmNlIGluIFNRTGl0 ZURhdGFiYXNlLgorCisgICAgICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlNRTGl0ZURhdGFiYXNlOjpjbGVhckFsbFRhYmxlcyk6CisgICAg ICAgICogcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpTUUxpdGVTdGF0ZW1lbnQ6OnJldHVyblRleHRSZXN1bHRzKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6OlNRTGl0ZVN0YXRlbWVudDo6cmV0dXJuSW50UmVzdWx0cyk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkludDY0UmVzdWx0cyk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkRvdWJsZVJl c3VsdHMpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL3NxbC9TUUxpdGVTdGF0ZW1lbnQu aDoKKwogMjAyMS0wNS0xNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbR1BVIFByb2Nlc3NdIE9iamVjdCBpZGVudGlmaWVycyB3aXRoIHRoZSBkZWxl dGVkIHZhbHVlIHNob3VsZCBjYXVzZSBNRVNTQUdFX0NIRUNLcwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3NxbC9TUUxpdGVEYXRhYmFzZS5jcHAKaW5kZXggZDQ1ODc1ODAwZTVmNDI0OGEx ZDZjNzA1ZTllZThlZjA5ZDdlN2M4My4uMDllYjRhMWI0OTJiOTJiZWZmMzM0MTNjM2UwNWExZGQx M2U4MTc1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZURh dGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlRGF0YWJh c2UuY3BwCkBAIC0zOTcsMTggKzM5NywxNyBAQCBib29sIFNRTGl0ZURhdGFiYXNlOjp0YWJsZUV4 aXN0cyhjb25zdCBTdHJpbmcmIHRhYmxlTmFtZSkKIAogdm9pZCBTUUxpdGVEYXRhYmFzZTo6Y2xl YXJBbGxUYWJsZXMoKQogewotICAgIFZlY3RvcjxTdHJpbmc+IHRhYmxlczsKLSAgICBhdXRvIHN0 YXRlbWVudCA9IHByZXBhcmVTdGF0ZW1lbnQoIlNFTEVDVCBuYW1lIEZST00gc3FsaXRlX21hc3Rl ciBXSEVSRSB0eXBlPSd0YWJsZSc7Il9zKTsKLSAgICBpZiAoIXN0YXRlbWVudCB8fCAhc3RhdGVt ZW50LT5yZXR1cm5UZXh0UmVzdWx0cygwLCB0YWJsZXMpKSB7Ci0gICAgICAgIExPRyhTUUxEYXRh YmFzZSwgIlVuYWJsZSB0byByZXRyaWV2ZSBsaXN0IG9mIHRhYmxlcyBmcm9tIGRhdGFiYXNlIik7 CisgICAgYXV0byBzdGF0ZW1lbnQgPSBwcmVwYXJlU3RhdGVtZW50KCJTRUxFQ1QgbmFtZSBGUk9N IHNxbGl0ZV9tYXN0ZXIgV0hFUkUgdHlwZT0ndGFibGUnIEFORCBuYW1lIE5PVCBMSUtFICdzcWxp dGVfJSc7Il9zKTsKKyAgICBpZiAoIXN0YXRlbWVudCkgeworICAgICAgICBMT0coU1FMRGF0YWJh c2UsICJGYWlsZWQgdG8gcHJlcGFyZSBzdGF0ZW1lbnQgdG8gcmV0cmlldmUgbGlzdCBvZiB0YWJs ZXMgZnJvbSBkYXRhYmFzZSIpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIAotICAgIGZv ciAoVmVjdG9yPFN0cmluZz46Oml0ZXJhdG9yIHRhYmxlID0gdGFibGVzLmJlZ2luKCk7IHRhYmxl ICE9IHRhYmxlcy5lbmQoKTsgKyt0YWJsZSApIHsKLSAgICAgICAgaWYgKCp0YWJsZSA9PSAic3Fs aXRlX3NlcXVlbmNlIikKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBpZiAoIWV4ZWN1 dGVDb21tYW5kU2xvdygiRFJPUCBUQUJMRSAiICsgKnRhYmxlKSkKLSAgICAgICAgICAgIExPRyhT UUxEYXRhYmFzZSwgIlVuYWJsZSB0byBkcm9wIHRhYmxlICVzIiwgKCp0YWJsZSkuYXNjaWkoKS5k YXRhKCkpOworICAgIFZlY3RvcjxTdHJpbmc+IHRhYmxlczsKKyAgICB3aGlsZSAoc3RhdGVtZW50 LT5zdGVwKCkgPT0gU1FMSVRFX1JPVykKKyAgICAgICAgdGFibGVzLmFwcGVuZChzdGF0ZW1lbnQt PmdldENvbHVtblRleHQoMCkpOworICAgIGZvciAoYXV0byYgdGFibGUgOiB0YWJsZXMpIHsKKyAg ICAgICAgaWYgKCFleGVjdXRlQ29tbWFuZFNsb3coIkRST1AgVEFCTEUgIiArIHRhYmxlKSkKKyAg ICAgICAgICAgIExPRyhTUUxEYXRhYmFzZSwgIlVuYWJsZSB0byBkcm9wIHRhYmxlICVzIiwgdGFi bGUuYXNjaWkoKS5kYXRhKCkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmNwcAppbmRleCAwMjBjZTU3OGNiMWVmMTFmZjUwMzMw M2Y1YmRkZTI4NGY5NWE0ZTViLi40YWY3ODE1YjU0N2JhNjc3OGMwZDRjZjljZTU5MjVmZTFiOTc5 ODYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50 LmNwcApAQCAtMzUyLDc2ICszNTIsNiBAQCB2b2lkIFNRTGl0ZVN0YXRlbWVudDo6Z2V0Q29sdW1u QmxvYkFzVmVjdG9yKGludCBjb2wsIFZlY3Rvcjx1aW50OF90PiYgcmVzdWx0KQogICAgICAgICBy ZXN1bHRbaV0gPSAoc3RhdGljX2Nhc3Q8Y29uc3QgdWludDhfdCo+KGJsb2IpKVtpXTsKIH0KIAot Ym9vbCBTUUxpdGVTdGF0ZW1lbnQ6OnJldHVyblRleHRSZXN1bHRzKGludCBjb2wsIFZlY3RvcjxT dHJpbmc+JiB2KQotewotICAgIEFTU0VSVChjb2wgPj0gMCk7Ci0KLSAgICB2LmNsZWFyKCk7Ci0K LSAgICBpZiAoaGFzU3RhcnRlZFN0ZXBwaW5nKCkpCi0gICAgICAgIHJlc2V0KCk7Ci0KLSAgICB3 aGlsZSAoc3RlcCgpID09IFNRTElURV9ST1cpCi0gICAgICAgIHYuYXBwZW5kKGdldENvbHVtblRl eHQoY29sKSk7Ci0gICAgYm9vbCByZXN1bHQgPSB0cnVlOwotICAgIGlmIChtX2RhdGFiYXNlLmxh c3RFcnJvcigpICE9IFNRTElURV9ET05FKSB7Ci0gICAgICAgIHJlc3VsdCA9IGZhbHNlOwotICAg ICAgICBMT0coU1FMRGF0YWJhc2UsICJTUUxpdGVTdGF0ZW1lbnQ6OnJldHVyblRleHRSZXN1bHRz OiBFcnJvciByZWFkaW5nIHJlc3VsdHMiKTsKLSAgICB9Ci0gICAgcmV0dXJuIHJlc3VsdDsKLX0K LQotYm9vbCBTUUxpdGVTdGF0ZW1lbnQ6OnJldHVybkludFJlc3VsdHMoaW50IGNvbCwgVmVjdG9y PGludD4mIHYpCi17Ci0gICAgdi5jbGVhcigpOwotCi0gICAgaWYgKGhhc1N0YXJ0ZWRTdGVwcGlu ZygpKQotICAgICAgICByZXNldCgpOwotCi0gICAgd2hpbGUgKHN0ZXAoKSA9PSBTUUxJVEVfUk9X KQotICAgICAgICB2LmFwcGVuZChnZXRDb2x1bW5JbnQoY29sKSk7Ci0gICAgYm9vbCByZXN1bHQg PSB0cnVlOwotICAgIGlmIChtX2RhdGFiYXNlLmxhc3RFcnJvcigpICE9IFNRTElURV9ET05FKSB7 Ci0gICAgICAgIHJlc3VsdCA9IGZhbHNlOwotICAgICAgICBMT0coU1FMRGF0YWJhc2UsICJTUUxp dGVTdGF0ZW1lbnQ6OnJldHVybkludFJlc3VsdHM6IEVycm9yIHJlYWRpbmcgcmVzdWx0cyIpOwot ICAgIH0KLSAgICByZXR1cm4gcmVzdWx0OwotfQotCi1ib29sIFNRTGl0ZVN0YXRlbWVudDo6cmV0 dXJuSW50NjRSZXN1bHRzKGludCBjb2wsIFZlY3RvcjxpbnQ2NF90PiYgdikKLXsKLSAgICB2LmNs ZWFyKCk7Ci0KLSAgICBpZiAoaGFzU3RhcnRlZFN0ZXBwaW5nKCkpCi0gICAgICAgIHJlc2V0KCk7 Ci0KLSAgICB3aGlsZSAoc3RlcCgpID09IFNRTElURV9ST1cpCi0gICAgICAgIHYuYXBwZW5kKGdl dENvbHVtbkludDY0KGNvbCkpOwotICAgIGJvb2wgcmVzdWx0ID0gdHJ1ZTsKLSAgICBpZiAobV9k YXRhYmFzZS5sYXN0RXJyb3IoKSAhPSBTUUxJVEVfRE9ORSkgewotICAgICAgICByZXN1bHQgPSBm YWxzZTsKLSAgICAgICAgTE9HKFNRTERhdGFiYXNlLCAiU1FMaXRlU3RhdGVtZW50OjpyZXR1cm5J bnQ2NFJlc3VsdHM6IEVycm9yIHJlYWRpbmcgcmVzdWx0cyIpOwotICAgIH0KLSAgICByZXR1cm4g cmVzdWx0OwotfQotCi1ib29sIFNRTGl0ZVN0YXRlbWVudDo6cmV0dXJuRG91YmxlUmVzdWx0cyhp bnQgY29sLCBWZWN0b3I8ZG91YmxlPiYgdikKLXsKLSAgICB2LmNsZWFyKCk7Ci0KLSAgICBpZiAo aGFzU3RhcnRlZFN0ZXBwaW5nKCkpCi0gICAgICAgIHJlc2V0KCk7Ci0KLSAgICB3aGlsZSAoc3Rl cCgpID09IFNRTElURV9ST1cpCi0gICAgICAgIHYuYXBwZW5kKGdldENvbHVtbkRvdWJsZShjb2wp KTsKLSAgICBib29sIHJlc3VsdCA9IHRydWU7Ci0gICAgaWYgKG1fZGF0YWJhc2UubGFzdEVycm9y KCkgIT0gU1FMSVRFX0RPTkUpIHsKLSAgICAgICAgcmVzdWx0ID0gZmFsc2U7Ci0gICAgICAgIExP RyhTUUxEYXRhYmFzZSwgIlNRTGl0ZVN0YXRlbWVudDo6cmV0dXJuRG91YmxlUmVzdWx0czogRXJy b3IgcmVhZGluZyByZXN1bHRzIik7Ci0gICAgfQotICAgIHJldHVybiByZXN1bHQ7Ci19Ci0KIGJv b2wgU1FMaXRlU3RhdGVtZW50OjpoYXNTdGFydGVkU3RlcHBpbmcoKQogewogICAgIHJldHVybiBz cWxpdGUzX3N0bXRfYnVzeShtX3N0YXRlbWVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9zcWwvU1FMaXRlU3RhdGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9zcWwvU1FMaXRlU3RhdGVtZW50LmgKaW5kZXggMTIwY2UxNjhhNmEyYmVkZjQ3NjI2MTM5NDFi MTM4MDE4NTAxODhjYi4uMTUyYWY2YjM2YTBmZDIxZTFlZWI5NTdiZWZiOTQyMTQyMTdjZmY2ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3FsL1NRTGl0ZVN0YXRlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NxbC9TUUxpdGVTdGF0ZW1lbnQuaApAQCAt NzksMTEgKzc5LDYgQEAgcHVibGljOgogICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZ2V0Q29sdW1u QmxvYkFzVmVjdG9yKGludCBjb2wsIFZlY3RvcjxjaGFyPiYpOwogICAgIFdFQkNPUkVfRVhQT1JU IHZvaWQgZ2V0Q29sdW1uQmxvYkFzVmVjdG9yKGludCBjb2wsIFZlY3Rvcjx1aW50OF90PiYpOwog Ci0gICAgYm9vbCByZXR1cm5UZXh0UmVzdWx0cyhpbnQgY29sLCBWZWN0b3I8U3RyaW5nPiYpOwot ICAgIGJvb2wgcmV0dXJuSW50UmVzdWx0cyhpbnQgY29sLCBWZWN0b3I8aW50PiYpOwotICAgIGJv b2wgcmV0dXJuSW50NjRSZXN1bHRzKGludCBjb2wsIFZlY3RvcjxpbnQ2NF90PiYpOwotICAgIGJv b2wgcmV0dXJuRG91YmxlUmVzdWx0cyhpbnQgY29sLCBWZWN0b3I8ZG91YmxlPiYpOwotCiAgICAg U1FMaXRlRGF0YWJhc2UmIGRhdGFiYXNlKCkgeyByZXR1cm4gbV9kYXRhYmFzZTsgfQogICAgIAog cHJpdmF0ZToK