202344 2019-09-28 08:46:40 -0700 Tighten up LayerRepresentation operators 2019-09-29 10:26:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 202256 1 zan zan cmarcelo ews-watchlist fred.wang jamesr koivisto luiz simon.fraser tonikitoo webkit-bug-importer oldest_to_newest 1575051 0 zan 2019-09-28 08:46:40 -0700 Tighten up LayerRepresentation operators 1575052 1 379786 zan 2019-09-28 08:47:06 -0700 Created attachment 379786 Patch iOS changes pending. 1575124 2 379803 zan 2019-09-28 22:36:32 -0700 Created attachment 379803 Patch 1575138 3 379807 zan 2019-09-29 02:13:55 -0700 Created attachment 379807 Patch 1575151 4 379807 zan 2019-09-29 10:25:46 -0700 Comment on attachment 379807 Patch Clearing flags on attachment: 379807 Committed r250491: <https://trac.webkit.org/changeset/250491> 1575152 5 zan 2019-09-29 10:25:50 -0700 All reviewed patches have been landed. Closing bug. 1575153 6 webkit-bug-importer 2019-09-29 10:26:17 -0700 <rdar://problem/55821150> 379786 2019-09-28 08:47:06 -0700 2019-09-28 22:36:29 -0700 Patch bug-202344-20190928174705.patch text/plain 22334 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5ZWNjNGE3ZmYzYjU2 ODlhNTdhZWE0M2RlYjE2ZGM1MTMyMjU3OS4uMDYyNDMxZjEyYTU3MTFiZTdmYTdhMjU4YTkwZmJh ZmM5N2I3MWJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTI4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBUaWdodGVuIHVwIExh eWVyUmVwcmVzZW50YXRpb24gb3BlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3IgR3JhcGhpY3NMYXllciogY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3IgUGxhdGZvcm1MYXllciog Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3Ig R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheWVyUmVwcmVzZW50YXRpb246Om9wZXJhdG9yIGJvb2wgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3I9PSBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXllclJlcHJlc2VudGF0aW9uOjp0b1JlcHJlc2VudGF0aW9uIGNvbnN0KToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6Y29tbWl0U3RhdGVC ZWZvcmVDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGaXhlZE5v ZGU6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L2NvY29hL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6Y29tbWl0U3Rh dGVCZWZvcmVDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xs aW5nVHJlZVBvc2l0aW9uZWROb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJl ZVBvc2l0aW9uZWROb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKToKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTdGlja3lOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxk cmVuKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorCiAyMDE5LTA5LTI3 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUGFnZXMgdXNpbmcg V2ViR0xSZW5kZXJpbmdDb250ZXh0IGZhaWwgdG8gZW50ZXIgdGhlIGJhY2svZm9yd2FyZCBjYWNo ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwppbmRleCA1MzJiNDQyM2U0NmRmM2Q2YTI1ZWJmMDczZTgzMTljZjNkZTU0YmVmLi4x MzM5MjQ0OTRkZGIwZmJhMjM2ZDc5NWQxNmZlZmMxYjQxY2EwMTYxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA5LTI4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNv bT4KKworICAgICAgICBUaWdodGVuIHVwIExheWVyUmVwcmVzZW50YXRpb24gb3BlcmF0b3JzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNDQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RT dGF0ZU5vZGVMYXllcnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFj L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwOgorICAgICAgICAo V2ViS2l0OjpTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlTWFjOjpjb21taXRT dGF0ZUJlZm9yZUNoaWxkcmVuKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlUmVtb3RlTWFjLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZVJlbW90ZU1h Yzo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbik6CisKIDIwMTktMDktMjcgIEFkcmlhbiBQZXJl eiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIEZp eGVzIGZvciBub24tdW5pZmllZCBidWlsZHMgYWZ0ZXIgcjI0OTcxNApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaAppbmRleCBkZjI4ZjQy OTE3MWExY2U4NjJmOTA0ZWY2ZTkzZjgxNWM1MGFhYmZhLi5mM2JhODJhNzM3NjliMzJjMzVlMzU5 MDI0M2QzMDEyZmRlMmJmM2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaApAQCAtOTQsMTMgKzk0LDEzIEBAIHB1YmxpYzoKICAg ICAgICAgICAgIHJlbGVhc2VQbGF0Zm9ybUxheWVyKG1fdHlwZWxlc3NQbGF0Zm9ybUxheWVyKTsK ICAgICB9CiAKLSAgICBvcGVyYXRvciBHcmFwaGljc0xheWVyKigpIGNvbnN0CisgICAgZXhwbGlj aXQgb3BlcmF0b3IgR3JhcGhpY3NMYXllciooKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJU KG1fcmVwcmVzZW50YXRpb24gPT0gR3JhcGhpY3NMYXllclJlcHJlc2VudGF0aW9uKTsKICAgICAg ICAgcmV0dXJuIG1fZ3JhcGhpY3NMYXllci5nZXQoKTsKICAgICB9CiAKLSAgICBvcGVyYXRvciBQ bGF0Zm9ybUxheWVyKigpIGNvbnN0CisgICAgZXhwbGljaXQgb3BlcmF0b3IgUGxhdGZvcm1MYXll ciooKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1fcmVwcmVzZW50YXRpb24gPT0gUGxh dGZvcm1MYXllclJlcHJlc2VudGF0aW9uKTsKICAgICAgICAgcmV0dXJuIG1ha2VQbGF0Zm9ybUxh eWVyVHlwZWQobV90eXBlbGVzc1BsYXRmb3JtTGF5ZXIpOwpAQCAtMTExLDcgKzExMSw3IEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIG1fbGF5ZXJJRDsKICAgICB9CiAKLSAgICBvcGVyYXRvciBH cmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQoKSBjb25zdAorICAgIGV4cGxpY2l0IG9wZXJh dG9yIEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCgpIGNvbnN0CiAgICAgewogICAgICAg ICBBU1NFUlQobV9yZXByZXNlbnRhdGlvbiAhPSBQbGF0Zm9ybUxheWVyUmVwcmVzZW50YXRpb24p OwogICAgICAgICByZXR1cm4gbV9sYXllcklEOwpAQCAtMTMwLDYgKzEzMCwyMiBAQCBwdWJsaWM6 CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAKKyAgICBleHBsaWNpdCBvcGVyYXRvciBi b29sKCkgY29uc3QKKyAgICB7CisgICAgICAgIHN3aXRjaCAobV9yZXByZXNlbnRhdGlvbikgewor ICAgICAgICBjYXNlIEVtcHR5UmVwcmVzZW50YXRpb246CisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIGNhc2UgR3JhcGhpY3NMYXllclJlcHJlc2VudGF0aW9uOgorICAgICAgICAg ICAgcmV0dXJuICEhbV9ncmFwaGljc0xheWVyOworICAgICAgICBjYXNlIFBsYXRmb3JtTGF5ZXJS ZXByZXNlbnRhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiAhIW1fdHlwZWxlc3NQbGF0Zm9ybUxh eWVyOworICAgICAgICBjYXNlIFBsYXRmb3JtTGF5ZXJJRFJlcHJlc2VudGF0aW9uOgorICAgICAg ICAgICAgcmV0dXJuICEhbV9sYXllcklEOworICAgICAgICB9CisgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgYm9vbCBvcGVy YXRvcj09KGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24mIG90aGVyKSBjb25zdAogICAgIHsKICAg ICAgICAgaWYgKG1fcmVwcmVzZW50YXRpb24gIT0gb3RoZXIubV9yZXByZXNlbnRhdGlvbikKQEAg LTE0Niw3ICsxNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICByZXR1cm4gbV9sYXllcklEID09 IG90aGVyLm1fbGF5ZXJJRDsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAg ICAgCiAgICAgTGF5ZXJSZXByZXNlbnRhdGlvbiB0b1JlcHJlc2VudGF0aW9uKFR5cGUgcmVwcmVz ZW50YXRpb24pIGNvbnN0CkBAIC0xNjIsNiArMTc4LDcgQEAgcHVibGljOgogICAgICAgICBjYXNl IFBsYXRmb3JtTGF5ZXJJRFJlcHJlc2VudGF0aW9uOgogICAgICAgICAgICAgcmV0dXJuIExheWVy UmVwcmVzZW50YXRpb24obV9sYXllcklEKTsKICAgICAgICAgfQorICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIExheWVyUmVwcmVzZW50YXRpb24oKTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBkODYwMGU1MzkxZWQ5NTkzYjlmODRjNWFj MThlMTM2MDFlMWY2MGQ3Li44MTI1NmVlM2I0YTQ5OTYzYjZhZjQ2Yjk3NmM3NGY0ZDNkYzhhOTQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0xMDIsMTAgKzEwMiwxMCBAQCB2b2lkIFNj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0 IFNjcm9sbGluZ1N0YXRlTgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKHN0YXRlLmhh c0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRh aW5lckxheWVyKSkKLSAgICAgICAgbV9zY3JvbGxDb250YWluZXJMYXllciA9IHN0YXRlLnNjcm9s bENvbnRhaW5lckxheWVyKCk7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIgPSBzdGF0 aWNfY2FzdDxDQUxheWVyKj4oc3RhdGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSk7CiAKICAgICBp ZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIg PSBzdGF0ZS5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKTsKKyAgICAgICAgbV9zY3JvbGxlZENvbnRl bnRzTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc3RhdGUuc2Nyb2xsZWRDb250ZW50c0xh eWVyKCkpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLm1tCmluZGV4IDhlNGFj MjMwMWE5OGM1ZTdkOGY4NTdmMTAzZjQ1NTdkZDJjNzkxMDEuLmUwZTcwZTg2OThkNDQ1MjQ1NGQw OTJlOGY2OTEyZmQxNGY5NDcyOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbQpAQCAtNjIs NyArNjIsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6OmNvbW1pdFN0YXRlQmVmb3Jl Q2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJgogICAgIGNvbnN0IFNjcm9sbGluZ1N0 YXRlRml4ZWROb2RlJiBmaXhlZFN0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRlRml4 ZWROb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKGZpeGVkU3RhdGVOb2RlLmhhc0NoYW5nZWRQ cm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OkxheWVyKSkKLSAgICAgICAgbV9sYXllciA9IGZp eGVkU3RhdGVOb2RlLmxheWVyKCk7CisgICAgICAgIG1fbGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxh eWVyKj4oZml4ZWRTdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGVOb2RlLmhhc0No YW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZTo6Vmlld3BvcnRDb25zdHJhaW50 cykpCiAgICAgICAgIG1fY29uc3RyYWludHMgPSBmaXhlZFN0YXRlTm9kZS52aWV3cG9ydENvbnN0 cmFpbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2Nv YS9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5v ZGUubW0KaW5kZXggOGI5OWUwNDIwM2FkOTdlZDkzYjQ4MjZlZTIxZjBiMzM1MDJkZjhjZS4uMzEy ZjBlOGJhMWM0YzY5NzUyY2JkMjg3YzQ0N2IwMWQ5MTE0NmIyOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xs UHJveHlOb2RlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Nj cm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5tbQpAQCAtNTIsNyArNTIsNyBAQCB2 b2lkIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6Y29tbWl0U3RhdGVCZWZv cmVDaGlsZHJlbihjb25zdCBTY3JvbAogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dT Y3JvbGxQcm94eU5vZGUmIG92ZXJmbG93UHJveHlTdGF0ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxp bmdTdGF0ZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHN0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVOb2RlOjpMYXllcikpCi0g ICAgICAgIG1fbGF5ZXIgPSBzdGF0ZU5vZGUubGF5ZXIoKTsKKyAgICAgICAgbV9sYXllciA9IHN0 YXRpY19jYXN0PENBTGF5ZXIqPihzdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAob3ZlcmZs b3dQcm94eVN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVPdmVyZmxv d1Njcm9sbFByb3h5Tm9kZTo6T3ZlcmZsb3dTY3JvbGxpbmdOb2RlKSkKICAgICAgICAgbV9vdmVy Zmxvd1Njcm9sbGluZ05vZGVJRCA9IG92ZXJmbG93UHJveHlTdGF0ZU5vZGUub3ZlcmZsb3dTY3Jv bGxpbmdOb2RlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9j b2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUubW0KaW5kZXggMjM4 NTBkYmE3MTAyZDA2ZTE4NTMxOGFhZmFmNWFhNzBlMzc4MWY4Zi4uYTI1YTlkMDY2MDMwNDA2ZTU3 NmM0OWUxNThmODU1OGNiODUyMjYwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZVBvc2l0aW9uZWROb2RlLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVQb3NpdGlvbmVkTm9k ZS5tbQpAQCAtNTUsNyArNTUsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVQb3NpdGlvbmVkTm9kZTo6 Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZQogICAgIGNvbnN0 IFNjcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUmIHBvc2l0aW9uZWRTdGF0ZU5vZGUgPSBkb3du Y2FzdDxTY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYg KHBvc2l0aW9uZWRTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9k ZTo6TGF5ZXIpKQotICAgICAgICBtX2xheWVyID0gcG9zaXRpb25lZFN0YXRlTm9kZS5sYXllcigp OworICAgICAgICBtX2xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHBvc2l0aW9uZWRTdGF0 ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAocG9zaXRpb25lZFN0YXRlTm9kZS5oYXNDaGFuZ2Vk UHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVkTm9kZTo6UmVsYXRlZE92ZXJmbG93U2Ny b2xsaW5nTm9kZXMpKQogICAgICAgICBtX3JlbGF0ZWRPdmVyZmxvd1Njcm9sbGluZ05vZGVzID0g cG9zaXRpb25lZFN0YXRlTm9kZS5yZWxhdGVkT3ZlcmZsb3dTY3JvbGxpbmdOb2RlcygpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJl ZVN0aWNreU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3Jv bGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCBkMjg0MWI2YTY3ZGQwYzgyNTQ2MDEyYTlmY2Fi ZWI2YTkyNGY2YjI3Li4zZmY1ZDBkYjgwOWYwZWIwOGNlMjI4OWI2MWJjODFkZmYxNjczNDQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdU cmVlU3RpY2t5Tm9kZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2Nv YS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQpAQCAtNjEsNyArNjEsNyBAQCB2b2lkIFNjcm9s bGluZ1RyZWVTdGlja3lOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9s bGluZ1N0YXRlTm9kZQogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZSYgc3RpY2t5 U3RhdGVOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlPihzdGF0ZU5vZGUp OwogCiAgICAgaWYgKHN0aWNreVN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5n U3RhdGVOb2RlOjpMYXllcikpCi0gICAgICAgIG1fbGF5ZXIgPSBzdGlja3lTdGF0ZU5vZGUubGF5 ZXIoKTsKKyAgICAgICAgbV9sYXllciA9IHN0YXRpY19jYXN0PENBTGF5ZXIqPihzdGlja3lTdGF0 ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShT Y3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OlZpZXdwb3J0Q29uc3RyYWludHMpKQogICAgICAgICBt X2NvbnN0cmFpbnRzID0gc3RpY2t5U3RhdGVOb2RlLnZpZXdwb3J0Q29uc3RyYWludHMoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggYjUzYTY4NGZh MzBjODdmMzYxNWQ1MmI5ODg4MmEwZjYzN2IwMzcyOC4uMDhhZDQ4MmY3MTRhMjlhMjU3NDg1ZGZj YzQwNThkNDE5YTI3NmQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWMubW0KQEAgLTg1LDIyICs4NSwyMiBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaQogICAg IGNvbnN0IGF1dG8mIHNjcm9sbGluZ1N0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRl RnJhbWVTY3JvbGxpbmdOb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRl Tm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OlJvb3RDb250ZW50c0xheWVyKSkKLSAgICAgICAgbV9yb290Q29udGVudHNMYXllciA9IHNjcm9s bGluZ1N0YXRlTm9kZS5yb290Q29udGVudHNMYXllcigpOworICAgICAgICBtX3Jvb3RDb250ZW50 c0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5yb290Q29u dGVudHNMYXllcigpKTsKIAogICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFBy b3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5n TGF5ZXIpKQotICAgICAgICBtX2NvdW50ZXJTY3JvbGxpbmdMYXllciA9IHNjcm9sbGluZ1N0YXRl Tm9kZS5jb3VudGVyU2Nyb2xsaW5nTGF5ZXIoKTsKKyAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5n TGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJT Y3JvbGxpbmdMYXllcigpKTsKIAogICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdl ZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpJbnNldENsaXBMYXll cikpCi0gICAgICAgIG1faW5zZXRDbGlwTGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRD bGlwTGF5ZXIoKTsKKyAgICAgICAgbV9pbnNldENsaXBMYXllciA9IHN0YXRpY19jYXN0PENBTGF5 ZXIqPihzY3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRDbGlwTGF5ZXIoKSk7CiAKICAgICBpZiAoc2Ny b2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZTo6Q29udGVudFNoYWRvd0xheWVyKSkKLSAgICAgICAgbV9jb250ZW50U2hhZG93 TGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuY29udGVudFNoYWRvd0xheWVyKCk7CisgICAgICAg IG1fY29udGVudFNoYWRvd0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0 YXRlTm9kZS5jb250ZW50U2hhZG93TGF5ZXIoKSk7CiAKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 SGVhZGVyTGF5ZXIpKQotICAgICAgICBtX2hlYWRlckxheWVyID0gc2Nyb2xsaW5nU3RhdGVOb2Rl LmhlYWRlckxheWVyKCk7CisgICAgICAgIG1faGVhZGVyTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxh eWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkpOwogCiAgICAgaWYgKHNjcm9s bGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9s bGluZ05vZGU6OkZvb3RlckxheWVyKSkKLSAgICAgICAgbV9mb290ZXJMYXllciA9IHNjcm9sbGlu Z1N0YXRlTm9kZS5mb290ZXJMYXllcigpOworICAgICAgICBtX2Zvb3RlckxheWVyID0gc3RhdGlj X2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpKTsKIAogICAg IGJvb2wgbG9nU2Nyb2xsaW5nTW9kZSA9ICFtX2hhZEZpcnN0VXBkYXRlOwogICAgIGlmIChzY3Jv bGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpSZWFzb25zRm9yU3luY2hyb25vdXNTY3JvbGxpbmcpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCmluZGV4IDBhY2ViMDNhZmJj MDYwOTM1OWVmNjMyZTE0OTU0ODMxOTIzNGM1ZTAuLjQ4MjNmNzZhOTc3MmY5NzdjZDc2YzI1YzNk NWVhN2QzMmYxZGFjNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eS5jcHAKQEAgLTEwMiw5ICsxMDIsMTEgQEAgdm9pZCBSZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5Ojpjb21taXRTY3JvbGxpbmdUcmVlU3RhdGUoY29uc3QgUmVtb3RlU2Ny b2wKIAogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVO b2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYgc3RhdGVUcmVlLCBjb25zdCBSZW1vdGVMYXll clRyZWVIb3N0JiBsYXllclRyZWVIb3N0KQogeworICAgIHVzaW5nIFBsYXRmb3JtTGF5ZXJJRCA9 IEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRDsKKwogICAgIGZvciAoYXV0byYgY3Vyck5v ZGUgOiBzdGF0ZVRyZWUubm9kZU1hcCgpLnZhbHVlcygpKSB7CiAgICAgICAgIGlmIChjdXJyTm9k ZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9kZTo6TGF5ZXIpKQotICAgICAg ICAgICAgY3Vyck5vZGUtPnNldExheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChjdXJyTm9k ZS0+bGF5ZXIoKSkpOworICAgICAgICAgICAgY3Vyck5vZGUtPnNldExheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBjdXJyTm9kZS0+bGF5ZXIoKSB9KSk7CiAK ICAgICAgICAgc3dpdGNoIChjdXJyTm9kZS0+bm9kZVR5cGUoKSkgewogICAgICAgICBjYXNlIFNj cm9sbGluZ05vZGVUeXBlOjpNYWluRnJhbWU6CkBAIC0xMTIsNTAgKzExNCw1MCBAQCB2b2lkIFJl bW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Ny b2xsaW5nU3RhdGVUcmVlJgogICAgICAgICAgICAgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGlu Z05vZGUmIHNjcm9sbGluZ1N0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlPigqY3Vyck5vZGUpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAo c2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxp bmdTdGF0ZU5vZGUuc2V0U2Nyb2xsQ29udGFpbmVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZv cklEKHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWluZXJMYXllcigpKSk7CisgICAgICAg ICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbENvbnRhaW5lckxheWVyKGxheWVy VHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUu c2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSB9KSk7CiAKICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdT dGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5v ZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3Jv bGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkpKTsKKyAgICAgICAgICAgICAg ICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xs ZWRDb250ZW50c0xheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 Q291bnRlclNjcm9sbGluZ0xheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5v ZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3Jv bGxpbmdTdGF0ZU5vZGUuY291bnRlclNjcm9sbGluZ0xheWVyKCkpKTsKKyAgICAgICAgICAgICAg ICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuY291bnRl clNjcm9sbGluZ0xheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 SW5zZXRDbGlwTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRJ bnNldENsaXBMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2Rl Lmluc2V0Q2xpcExheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUu c2V0SW5zZXRDbGlwTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJ RCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5pbnNldENsaXBMYXllcigpIH0pKTsKIAogICAgICAgICAg ICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU6OkNvbnRlbnRTaGFkb3dMYXllcikpCi0gICAgICAgICAgICAg ICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvbnRlbnRTaGFkb3dMYXllcihsYXllclRyZWVIb3N0 LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmNvbnRlbnRTaGFkb3dMYXllcigpKSk7Cisg ICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvbnRlbnRTaGFkb3dMYXllcihs YXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVO b2RlLmNvbnRlbnRTaGFkb3dMYXllcigpIH0pKTsKIAogICAgICAgICAgICAgLy8gRklYTUU6IHdl IHNob3VsZCBuZXZlciBoYXZlIGhlYWRlciBhbmQgZm9vdGVyIGxheWVycyBjb21pbmcgZnJvbSB0 aGUgV2ViUHJvY2Vzcy4KICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hh bmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJMYXll cikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldEhlYWRlckxheWVyKGxh eWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaGVhZGVyTGF5ZXIoKSkp OworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIZWFkZXJMYXllcihsYXll clRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2Rl LmhlYWRlckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2Rl Lmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9v dGVyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRGb290ZXJM YXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmZvb3Rlckxh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Rm9vdGVyTGF5 ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0 YXRlTm9kZS5mb290ZXJMYXllcigpIH0pKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU6OlZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0 YXRlTm9kZS5zZXRWZXJ0aWNhbFNjcm9sbGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJ RChzY3JvbGxpbmdTdGF0ZU5vZGUudmVydGljYWxTY3JvbGxiYXJMYXllcigpKSk7CisgICAgICAg ICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIobGF5 ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9k ZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xs aW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZTo6SG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKSkKLSAgICAgICAgICAgICAgICBzY3Jv bGxpbmdTdGF0ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKGxheWVyVHJlZUhvc3Qu bGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKCkp KTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9s bGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3Jv bGxpbmdTdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKCkgfSkpOwogCiAgICAgICAg ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Um9vdENvbnRlbnRzTGF5ZXIpKQotICAgICAgICAgICAg ICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRSb290Q29udGVudHNMYXllcihsYXllclRyZWVIb3N0 LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLnJvb3RDb250ZW50c0xheWVyKCkpKTsKKyAg ICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Um9vdENvbnRlbnRzTGF5ZXIobGF5 ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9k ZS5yb290Q29udGVudHNMYXllcigpIH0pKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93OiB7CiAgICAgICAgICAg ICBTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZSYgc2Nyb2xsaW5nU3RhdGVOb2Rl ID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU+KCpjdXJyTm9k ZSk7CiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAg ICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsQ29udGFpbmVyTGF5ZXIo bGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWlu ZXJMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9s bENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQg eyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSB9KSk7CiAKICAgICAg ICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgICAg ICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJl ZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVy KCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250 ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3Jv bGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkgfSkpOwogCiAgICAgICAgICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgICAg ICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJU cmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0VmVydGljYWxT Y3JvbGxiYXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsg c2Nyb2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSB9KSk7CiAKICAgICAg ICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGlu Z1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIpKQotICAg ICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5 ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFs U2Nyb2xsYmFyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5z ZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRm b3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIo KSB9KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFNjcm9s bGluZ05vZGVUeXBlOjpPdmVyZmxvd1Byb3h5OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdO b2RlUmVtb3RlTWFjLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZU1hYy5jcHAKaW5kZXgg MjMzZmZkMDIxZTYzOGJmMTg4ZjhkY2FiZDc3OWM3NDUyOTQzNzI5Ny4uOWEwNDkwNWVlOGY2NTJj MWFiYjdmNDA2Y2JhZTE4ZmI1MTBhYjUzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl UmVtb3RlTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwCkBAIC01 NiwxMCArNTYsMTAgQEAgdm9pZCBTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3Rl TWFjOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFMKIAogICAgIC8vIEZJWE1FOiBQ dXNoIHRvIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVNYWM/CiAgICAgaWYgKHNj cm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNj cm9sbGluZ05vZGU6OlZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIpKQotICAgICAgICBtX3Njcm9sbGVy UGFpci0+dmVydGljYWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzY3JvbGxpbmdTdGF0ZU5vZGUu dmVydGljYWxTY3JvbGxiYXJMYXllcigpKTsKKyAgICAgICAgbV9zY3JvbGxlclBhaXItPnZlcnRp Y2FsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGlu Z1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpKTsKIAogICAgIGlmIChzY3JvbGxp bmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIpKQotICAgICAgICBtX3Njcm9sbGVyUGFp ci0+aG9yaXpvbnRhbFNjcm9sbGVyKCkuc2V0SG9zdExheWVyKHNjcm9sbGluZ1N0YXRlTm9kZS5o b3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIoKSk7CisgICAgICAgIG1fc2Nyb2xsZXJQYWlyLT5ob3Jp em9udGFsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9s bGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIoKSkpOwogCiAgICAgbV9zY3Jv bGxlclBhaXItPnVwZGF0ZVZhbHVlcygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxp bmdOb2RlUmVtb3RlTWFjLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVy VHJlZS9tYWMvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZVJlbW90ZU1hYy5jcHAK aW5kZXggYjZjYTNjYmJhODA4MDdhZjdiOWY2OTliZTliMWIyYWE5Y2RjMWMzMi4uZmE2YzNkYWJl YmMwZjlhNGFhNjM4ZTU0MjM1ZDY5YmMxNDE4NzFjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3Jv bGxpbmdOb2RlUmVtb3RlTWFjLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVSZW1vdGVN YWMuY3BwCkBAIC01NiwxMCArNTYsMTAgQEAgdm9pZCBTY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3Jv bGxpbmdOb2RlUmVtb3RlTWFjOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnMKIAogICAg IC8vIEZJWE1FOiBQdXNoIHRvIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVNYWM/ CiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5n U3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU6OlZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIpKQotICAg ICAgICBtX3Njcm9sbGVyUGFpci0+dmVydGljYWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzY3Jv bGxpbmdTdGF0ZU5vZGUudmVydGljYWxTY3JvbGxiYXJMYXllcigpKTsKKyAgICAgICAgbV9zY3Jv bGxlclBhaXItPnZlcnRpY2FsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc3RhdGljX2Nhc3Q8Q0FM YXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpKTsKIAog ICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0 YXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIpKQotICAg ICAgICBtX3Njcm9sbGVyUGFpci0+aG9yaXpvbnRhbFNjcm9sbGVyKCkuc2V0SG9zdExheWVyKHNj cm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIoKSk7CisgICAgICAgIG1f c2Nyb2xsZXJQYWlyLT5ob3Jpem9udGFsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc3RhdGljX2Nh c3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIo KSkpOwogCiAgICAgbV9zY3JvbGxlclBhaXItPnVwZGF0ZVZhbHVlcygpOwogfQo= 379803 2019-09-28 22:36:32 -0700 2019-09-29 02:13:51 -0700 Patch bug-202344-20190929073631.patch text/plain 29392 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5ZWNjNGE3ZmYzYjU2 ODlhNTdhZWE0M2RlYjE2ZGM1MTMyMjU3OS4uMDYyNDMxZjEyYTU3MTFiZTdmYTdhMjU4YTkwZmJh ZmM5N2I3MWJmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDE5LTA5LTI4ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBUaWdodGVuIHVwIExh eWVyUmVwcmVzZW50YXRpb24gb3BlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBObyBuZXcgdGVzdHMgKE9PUFMhKS4KKworICAgICAgICAqIHBh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3IgR3JhcGhpY3NMYXllciogY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3IgUGxhdGZvcm1MYXllciog Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3Ig R3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheWVyUmVwcmVzZW50YXRpb246Om9wZXJhdG9yIGJvb2wgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5ZXJSZXByZXNlbnRhdGlvbjo6b3BlcmF0b3I9PSBjb25zdCk6CisgICAgICAgIChX ZWJDb3JlOjpMYXllclJlcHJlc2VudGF0aW9uOjp0b1JlcHJlc2VudGF0aW9uIGNvbnN0KToKKyAg ICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZTo6Y29tbWl0U3RhdGVC ZWZvcmVDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGaXhlZE5v ZGU6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5n L2NvY29hL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6Y29tbWl0U3Rh dGVCZWZvcmVDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xs aW5nVHJlZVBvc2l0aW9uZWROb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJl ZVBvc2l0aW9uZWROb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKToKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbToKKyAgICAgICAg KFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVTdGlja3lOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxk cmVuKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Ny b2xsaW5nTm9kZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGluZ1RyZWVGcmFtZVNj cm9sbGluZ05vZGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorCiAyMDE5LTA5LTI3 ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUGFnZXMgdXNpbmcg V2ViR0xSZW5kZXJpbmdDb250ZXh0IGZhaWwgdG8gZW50ZXIgdGhlIGJhY2svZm9yd2FyZCBjYWNo ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZwppbmRleCA1MzJiNDQyM2U0NmRmM2Q2YTI1ZWJmMDczZTgzMTljZjNkZTU0YmVmLi4x MzM5MjQ0OTRkZGIwZmJhMjM2ZDc5NWQxNmZlZmMxYjQxY2EwMTYxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA5LTI4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNv bT4KKworICAgICAgICBUaWdodGVuIHVwIExheWVyUmVwcmVzZW50YXRpb24gb3BlcmF0b3JzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNDQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RT dGF0ZU5vZGVMYXllcnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFj L1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwOgorICAgICAgICAo V2ViS2l0OjpTY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlTWFjOjpjb21taXRT dGF0ZUJlZm9yZUNoaWxkcmVuKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlUmVtb3RlTWFjLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6U2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZVJlbW90ZU1h Yzo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbik6CisKIDIwMTktMDktMjcgIEFkcmlhbiBQZXJl eiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIEZp eGVzIGZvciBub24tdW5pZmllZCBidWlsZHMgYWZ0ZXIgcjI0OTcxNApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaAppbmRleCBkZjI4ZjQy OTE3MWExY2U4NjJmOTA0ZWY2ZTkzZjgxNWM1MGFhYmZhLi5mM2JhODJhNzM3NjliMzJjMzVlMzU5 MDI0M2QzMDEyZmRlMmJmM2IzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9s bGluZy9TY3JvbGxpbmdTdGF0ZU5vZGUuaApAQCAtOTQsMTMgKzk0LDEzIEBAIHB1YmxpYzoKICAg ICAgICAgICAgIHJlbGVhc2VQbGF0Zm9ybUxheWVyKG1fdHlwZWxlc3NQbGF0Zm9ybUxheWVyKTsK ICAgICB9CiAKLSAgICBvcGVyYXRvciBHcmFwaGljc0xheWVyKigpIGNvbnN0CisgICAgZXhwbGlj aXQgb3BlcmF0b3IgR3JhcGhpY3NMYXllciooKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJU KG1fcmVwcmVzZW50YXRpb24gPT0gR3JhcGhpY3NMYXllclJlcHJlc2VudGF0aW9uKTsKICAgICAg ICAgcmV0dXJuIG1fZ3JhcGhpY3NMYXllci5nZXQoKTsKICAgICB9CiAKLSAgICBvcGVyYXRvciBQ bGF0Zm9ybUxheWVyKigpIGNvbnN0CisgICAgZXhwbGljaXQgb3BlcmF0b3IgUGxhdGZvcm1MYXll ciooKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1fcmVwcmVzZW50YXRpb24gPT0gUGxh dGZvcm1MYXllclJlcHJlc2VudGF0aW9uKTsKICAgICAgICAgcmV0dXJuIG1ha2VQbGF0Zm9ybUxh eWVyVHlwZWQobV90eXBlbGVzc1BsYXRmb3JtTGF5ZXIpOwpAQCAtMTExLDcgKzExMSw3IEBAIHB1 YmxpYzoKICAgICAgICAgcmV0dXJuIG1fbGF5ZXJJRDsKICAgICB9CiAKLSAgICBvcGVyYXRvciBH cmFwaGljc0xheWVyOjpQbGF0Zm9ybUxheWVySUQoKSBjb25zdAorICAgIGV4cGxpY2l0IG9wZXJh dG9yIEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCgpIGNvbnN0CiAgICAgewogICAgICAg ICBBU1NFUlQobV9yZXByZXNlbnRhdGlvbiAhPSBQbGF0Zm9ybUxheWVyUmVwcmVzZW50YXRpb24p OwogICAgICAgICByZXR1cm4gbV9sYXllcklEOwpAQCAtMTMwLDYgKzEzMCwyMiBAQCBwdWJsaWM6 CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAKKyAgICBleHBsaWNpdCBvcGVyYXRvciBi b29sKCkgY29uc3QKKyAgICB7CisgICAgICAgIHN3aXRjaCAobV9yZXByZXNlbnRhdGlvbikgewor ICAgICAgICBjYXNlIEVtcHR5UmVwcmVzZW50YXRpb246CisgICAgICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgICAgIGNhc2UgR3JhcGhpY3NMYXllclJlcHJlc2VudGF0aW9uOgorICAgICAgICAg ICAgcmV0dXJuICEhbV9ncmFwaGljc0xheWVyOworICAgICAgICBjYXNlIFBsYXRmb3JtTGF5ZXJS ZXByZXNlbnRhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiAhIW1fdHlwZWxlc3NQbGF0Zm9ybUxh eWVyOworICAgICAgICBjYXNlIFBsYXRmb3JtTGF5ZXJJRFJlcHJlc2VudGF0aW9uOgorICAgICAg ICAgICAgcmV0dXJuICEhbV9sYXllcklEOworICAgICAgICB9CisgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgYm9vbCBvcGVy YXRvcj09KGNvbnN0IExheWVyUmVwcmVzZW50YXRpb24mIG90aGVyKSBjb25zdAogICAgIHsKICAg ICAgICAgaWYgKG1fcmVwcmVzZW50YXRpb24gIT0gb3RoZXIubV9yZXByZXNlbnRhdGlvbikKQEAg LTE0Niw3ICsxNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICByZXR1cm4gbV9sYXllcklEID09 IG90aGVyLm1fbGF5ZXJJRDsKICAgICAgICAgfQogICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAg ICAgCiAgICAgTGF5ZXJSZXByZXNlbnRhdGlvbiB0b1JlcHJlc2VudGF0aW9uKFR5cGUgcmVwcmVz ZW50YXRpb24pIGNvbnN0CkBAIC0xNjIsNiArMTc4LDcgQEAgcHVibGljOgogICAgICAgICBjYXNl IFBsYXRmb3JtTGF5ZXJJRFJlcHJlc2VudGF0aW9uOgogICAgICAgICAgICAgcmV0dXJuIExheWVy UmVwcmVzZW50YXRpb24obV9sYXllcklEKTsKICAgICAgICAgfQorICAgICAgICBBU1NFUlRfTk9U X1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIExheWVyUmVwcmVzZW50YXRpb24oKTsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1Ry ZWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBkODYwMGU1MzkxZWQ5NTkzYjlmODRjNWFj MThlMTM2MDFlMWY2MGQ3Li44MTI1NmVlM2I0YTQ5OTYzYjZhZjQ2Yjk3NmM3NGY0ZDNkYzhhOTQ4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVl U2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Ny b2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0xMDIsMTAgKzEwMiwxMCBAQCB2b2lkIFNj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0 IFNjcm9sbGluZ1N0YXRlTgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgaWYgKHN0YXRlLmhh c0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRh aW5lckxheWVyKSkKLSAgICAgICAgbV9zY3JvbGxDb250YWluZXJMYXllciA9IHN0YXRlLnNjcm9s bENvbnRhaW5lckxheWVyKCk7CisgICAgICAgIG1fc2Nyb2xsQ29udGFpbmVyTGF5ZXIgPSBzdGF0 aWNfY2FzdDxDQUxheWVyKj4oc3RhdGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSk7CiAKICAgICBp ZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIg PSBzdGF0ZS5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKTsKKyAgICAgICAgbV9zY3JvbGxlZENvbnRl bnRzTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc3RhdGUuc2Nyb2xsZWRDb250ZW50c0xh eWVyKCkpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLm1tCmluZGV4IDhlNGFj MjMwMWE5OGM1ZTdkOGY4NTdmMTAzZjQ1NTdkZDJjNzkxMDEuLmUwZTcwZTg2OThkNDQ1MjQ1NGQw OTJlOGY2OTEyZmQxNGY5NDcyOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5vZGUubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZUZpeGVkTm9kZS5tbQpAQCAtNjIs NyArNjIsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGaXhlZE5vZGU6OmNvbW1pdFN0YXRlQmVmb3Jl Q2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2RlJgogICAgIGNvbnN0IFNjcm9sbGluZ1N0 YXRlRml4ZWROb2RlJiBmaXhlZFN0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRlRml4 ZWROb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKGZpeGVkU3RhdGVOb2RlLmhhc0NoYW5nZWRQ cm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OkxheWVyKSkKLSAgICAgICAgbV9sYXllciA9IGZp eGVkU3RhdGVOb2RlLmxheWVyKCk7CisgICAgICAgIG1fbGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxh eWVyKj4oZml4ZWRTdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGVOb2RlLmhhc0No YW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZpeGVkTm9kZTo6Vmlld3BvcnRDb25zdHJhaW50 cykpCiAgICAgICAgIG1fY29uc3RyYWludHMgPSBmaXhlZFN0YXRlTm9kZS52aWV3cG9ydENvbnN0 cmFpbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2Nv YS9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5v ZGUubW0KaW5kZXggOGI5OWUwNDIwM2FkOTdlZDkzYjQ4MjZlZTIxZjBiMzM1MDJkZjhjZS4uMzEy ZjBlOGJhMWM0YzY5NzUyY2JkMjg3YzQ0N2IwMWQ5MTE0NmIyOSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xs UHJveHlOb2RlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Nj cm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZS5tbQpAQCAtNTIsNyArNTIsNyBAQCB2 b2lkIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6Y29tbWl0U3RhdGVCZWZv cmVDaGlsZHJlbihjb25zdCBTY3JvbAogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dT Y3JvbGxQcm94eU5vZGUmIG92ZXJmbG93UHJveHlTdGF0ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxp bmdTdGF0ZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHN0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVOb2RlOjpMYXllcikpCi0g ICAgICAgIG1fbGF5ZXIgPSBzdGF0ZU5vZGUubGF5ZXIoKTsKKyAgICAgICAgbV9sYXllciA9IHN0 YXRpY19jYXN0PENBTGF5ZXIqPihzdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAob3ZlcmZs b3dQcm94eVN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVPdmVyZmxv d1Njcm9sbFByb3h5Tm9kZTo6T3ZlcmZsb3dTY3JvbGxpbmdOb2RlKSkKICAgICAgICAgbV9vdmVy Zmxvd1Njcm9sbGluZ05vZGVJRCA9IG92ZXJmbG93UHJveHlTdGF0ZU5vZGUub3ZlcmZsb3dTY3Jv bGxpbmdOb2RlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9j b2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUubW0KaW5kZXggMjM4 NTBkYmE3MTAyZDA2ZTE4NTMxOGFhZmFmNWFhNzBlMzc4MWY4Zi4uYTI1YTlkMDY2MDMwNDA2ZTU3 NmM0OWUxNThmODU1OGNiODUyMjYwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZVBvc2l0aW9uZWROb2RlLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVQb3NpdGlvbmVkTm9k ZS5tbQpAQCAtNTUsNyArNTUsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVQb3NpdGlvbmVkTm9kZTo6 Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZQogICAgIGNvbnN0 IFNjcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUmIHBvc2l0aW9uZWRTdGF0ZU5vZGUgPSBkb3du Y2FzdDxTY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYg KHBvc2l0aW9uZWRTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9k ZTo6TGF5ZXIpKQotICAgICAgICBtX2xheWVyID0gcG9zaXRpb25lZFN0YXRlTm9kZS5sYXllcigp OworICAgICAgICBtX2xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHBvc2l0aW9uZWRTdGF0 ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAocG9zaXRpb25lZFN0YXRlTm9kZS5oYXNDaGFuZ2Vk UHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVkTm9kZTo6UmVsYXRlZE92ZXJmbG93U2Ny b2xsaW5nTm9kZXMpKQogICAgICAgICBtX3JlbGF0ZWRPdmVyZmxvd1Njcm9sbGluZ05vZGVzID0g cG9zaXRpb25lZFN0YXRlTm9kZS5yZWxhdGVkT3ZlcmZsb3dTY3JvbGxpbmdOb2RlcygpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJl ZVN0aWNreU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3Jv bGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCBkMjg0MWI2YTY3ZGQwYzgyNTQ2MDEyYTlmY2Fi ZWI2YTkyNGY2YjI3Li4zZmY1ZDBkYjgwOWYwZWIwOGNlMjI4OWI2MWJjODFkZmYxNjczNDQ0IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdU cmVlU3RpY2t5Tm9kZS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2Nv YS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQpAQCAtNjEsNyArNjEsNyBAQCB2b2lkIFNjcm9s bGluZ1RyZWVTdGlja3lOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9s bGluZ1N0YXRlTm9kZQogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlU3RpY2t5Tm9kZSYgc3RpY2t5 U3RhdGVOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVTdGlja3lOb2RlPihzdGF0ZU5vZGUp OwogCiAgICAgaWYgKHN0aWNreVN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5n U3RhdGVOb2RlOjpMYXllcikpCi0gICAgICAgIG1fbGF5ZXIgPSBzdGlja3lTdGF0ZU5vZGUubGF5 ZXIoKTsKKyAgICAgICAgbV9sYXllciA9IHN0YXRpY19jYXN0PENBTGF5ZXIqPihzdGlja3lTdGF0 ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShT Y3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OlZpZXdwb3J0Q29uc3RyYWludHMpKQogICAgICAgICBt X2NvbnN0cmFpbnRzID0gc3RpY2t5U3RhdGVOb2RlLnZpZXdwb3J0Q29uc3RyYWludHMoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcv bWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KaW5kZXggYjUzYTY4NGZh MzBjODdmMzYxNWQ1MmI5ODg4MmEwZjYzN2IwMzcyOC4uMDhhZDQ4MmY3MTRhMjlhMjU3NDg1ZGZj YzQwNThkNDE5YTI3NmQyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWMubW0KQEAgLTg1LDIyICs4NSwyMiBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaQogICAg IGNvbnN0IGF1dG8mIHNjcm9sbGluZ1N0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRl RnJhbWVTY3JvbGxpbmdOb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRl Tm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6 OlJvb3RDb250ZW50c0xheWVyKSkKLSAgICAgICAgbV9yb290Q29udGVudHNMYXllciA9IHNjcm9s bGluZ1N0YXRlTm9kZS5yb290Q29udGVudHNMYXllcigpOworICAgICAgICBtX3Jvb3RDb250ZW50 c0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5yb290Q29u dGVudHNMYXllcigpKTsKIAogICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFBy b3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5n TGF5ZXIpKQotICAgICAgICBtX2NvdW50ZXJTY3JvbGxpbmdMYXllciA9IHNjcm9sbGluZ1N0YXRl Tm9kZS5jb3VudGVyU2Nyb2xsaW5nTGF5ZXIoKTsKKyAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5n TGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJT Y3JvbGxpbmdMYXllcigpKTsKIAogICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdl ZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpJbnNldENsaXBMYXll cikpCi0gICAgICAgIG1faW5zZXRDbGlwTGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRD bGlwTGF5ZXIoKTsKKyAgICAgICAgbV9pbnNldENsaXBMYXllciA9IHN0YXRpY19jYXN0PENBTGF5 ZXIqPihzY3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRDbGlwTGF5ZXIoKSk7CiAKICAgICBpZiAoc2Ny b2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZTo6Q29udGVudFNoYWRvd0xheWVyKSkKLSAgICAgICAgbV9jb250ZW50U2hhZG93 TGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuY29udGVudFNoYWRvd0xheWVyKCk7CisgICAgICAg IG1fY29udGVudFNoYWRvd0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0 YXRlTm9kZS5jb250ZW50U2hhZG93TGF5ZXIoKSk7CiAKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 SGVhZGVyTGF5ZXIpKQotICAgICAgICBtX2hlYWRlckxheWVyID0gc2Nyb2xsaW5nU3RhdGVOb2Rl LmhlYWRlckxheWVyKCk7CisgICAgICAgIG1faGVhZGVyTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxh eWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkpOwogCiAgICAgaWYgKHNjcm9s bGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9s bGluZ05vZGU6OkZvb3RlckxheWVyKSkKLSAgICAgICAgbV9mb290ZXJMYXllciA9IHNjcm9sbGlu Z1N0YXRlTm9kZS5mb290ZXJMYXllcigpOworICAgICAgICBtX2Zvb3RlckxheWVyID0gc3RhdGlj X2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpKTsKIAogICAg IGJvb2wgbG9nU2Nyb2xsaW5nTW9kZSA9ICFtX2hhZEZpcnN0VXBkYXRlOwogICAgIGlmIChzY3Jv bGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpSZWFzb25zRm9yU3luY2hyb25vdXNTY3JvbGxpbmcpKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJU cmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwCmluZGV4IDBhY2ViMDNhZmJj MDYwOTM1OWVmNjMyZTE0OTU0ODMxOTIzNGM1ZTAuLjQ4MjNmNzZhOTc3MmY5NzdjZDc2YzI1YzNk NWVhN2QzMmYxZGFjNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90 ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eS5jcHAKQEAgLTEwMiw5ICsxMDIsMTEgQEAgdm9pZCBSZW1vdGVTY3JvbGxpbmdD b29yZGluYXRvclByb3h5Ojpjb21taXRTY3JvbGxpbmdUcmVlU3RhdGUoY29uc3QgUmVtb3RlU2Ny b2wKIAogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVO b2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYgc3RhdGVUcmVlLCBjb25zdCBSZW1vdGVMYXll clRyZWVIb3N0JiBsYXllclRyZWVIb3N0KQogeworICAgIHVzaW5nIFBsYXRmb3JtTGF5ZXJJRCA9 IEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRDsKKwogICAgIGZvciAoYXV0byYgY3Vyck5v ZGUgOiBzdGF0ZVRyZWUubm9kZU1hcCgpLnZhbHVlcygpKSB7CiAgICAgICAgIGlmIChjdXJyTm9k ZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9kZTo6TGF5ZXIpKQotICAgICAg ICAgICAgY3Vyck5vZGUtPnNldExheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChjdXJyTm9k ZS0+bGF5ZXIoKSkpOworICAgICAgICAgICAgY3Vyck5vZGUtPnNldExheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBjdXJyTm9kZS0+bGF5ZXIoKSB9KSk7CiAK ICAgICAgICAgc3dpdGNoIChjdXJyTm9kZS0+bm9kZVR5cGUoKSkgewogICAgICAgICBjYXNlIFNj cm9sbGluZ05vZGVUeXBlOjpNYWluRnJhbWU6CkBAIC0xMTIsNTAgKzExNCw1MCBAQCB2b2lkIFJl bW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Ny b2xsaW5nU3RhdGVUcmVlJgogICAgICAgICAgICAgU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGlu Z05vZGUmIHNjcm9sbGluZ1N0YXRlTm9kZSA9IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlPigqY3Vyck5vZGUpOwogICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAo c2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9s bGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxp bmdTdGF0ZU5vZGUuc2V0U2Nyb2xsQ29udGFpbmVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZv cklEKHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWluZXJMYXllcigpKSk7CisgICAgICAg ICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbENvbnRhaW5lckxheWVyKGxheWVy VHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUu c2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSB9KSk7CiAKICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdT dGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6 U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5v ZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3Jv bGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkpKTsKKyAgICAgICAgICAgICAg ICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xs ZWRDb250ZW50c0xheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 Q291bnRlclNjcm9sbGluZ0xheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5v ZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3Jv bGxpbmdTdGF0ZU5vZGUuY291bnRlclNjcm9sbGluZ0xheWVyKCkpKTsKKyAgICAgICAgICAgICAg ICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGxheWVyVHJlZUhv c3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuY291bnRl clNjcm9sbGluZ0xheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6 SW5zZXRDbGlwTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRJ bnNldENsaXBMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2Rl Lmluc2V0Q2xpcExheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUu c2V0SW5zZXRDbGlwTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJ RCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5pbnNldENsaXBMYXllcigpIH0pKTsKIAogICAgICAgICAg ICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU6OkNvbnRlbnRTaGFkb3dMYXllcikpCi0gICAgICAgICAgICAg ICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvbnRlbnRTaGFkb3dMYXllcihsYXllclRyZWVIb3N0 LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmNvbnRlbnRTaGFkb3dMYXllcigpKSk7Cisg ICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvbnRlbnRTaGFkb3dMYXllcihs YXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVO b2RlLmNvbnRlbnRTaGFkb3dMYXllcigpIH0pKTsKIAogICAgICAgICAgICAgLy8gRklYTUU6IHdl IHNob3VsZCBuZXZlciBoYXZlIGhlYWRlciBhbmQgZm9vdGVyIGxheWVycyBjb21pbmcgZnJvbSB0 aGUgV2ViUHJvY2Vzcy4KICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hh bmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJMYXll cikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldEhlYWRlckxheWVyKGxh eWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaGVhZGVyTGF5ZXIoKSkp OworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIZWFkZXJMYXllcihsYXll clRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2Rl LmhlYWRlckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2Rl Lmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9v dGVyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRGb290ZXJM YXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmZvb3Rlckxh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Rm9vdGVyTGF5 ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0 YXRlTm9kZS5mb290ZXJMYXllcigpIH0pKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU6OlZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0 YXRlTm9kZS5zZXRWZXJ0aWNhbFNjcm9sbGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJ RChzY3JvbGxpbmdTdGF0ZU5vZGUudmVydGljYWxTY3JvbGxiYXJMYXllcigpKSk7CisgICAgICAg ICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIobGF5 ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9k ZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xs aW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xs aW5nTm9kZTo6SG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKSkKLSAgICAgICAgICAgICAgICBzY3Jv bGxpbmdTdGF0ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKGxheWVyVHJlZUhvc3Qu bGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKCkp KTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9s bGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3Jv bGxpbmdTdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKCkgfSkpOwogCiAgICAgICAg ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Um9vdENvbnRlbnRzTGF5ZXIpKQotICAgICAgICAgICAg ICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRSb290Q29udGVudHNMYXllcihsYXllclRyZWVIb3N0 LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLnJvb3RDb250ZW50c0xheWVyKCkpKTsKKyAg ICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Um9vdENvbnRlbnRzTGF5ZXIobGF5 ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9k ZS5yb290Q29udGVudHNMYXllcigpIH0pKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 CiAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93OiB7CiAgICAgICAgICAg ICBTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZSYgc2Nyb2xsaW5nU3RhdGVOb2Rl ID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU+KCpjdXJyTm9k ZSk7CiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAg ICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsQ29udGFpbmVyTGF5ZXIo bGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWlu ZXJMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9s bENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQg eyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSB9KSk7CiAKICAgICAg ICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGlu Z1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAgICAg ICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJl ZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVy KCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250 ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3Jv bGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkgfSkpOwogCiAgICAgICAgICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgICAg ICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJU cmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0VmVydGljYWxT Y3JvbGxiYXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsg c2Nyb2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSB9KSk7CiAKICAgICAg ICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGlu Z1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIpKQotICAg ICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5 ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFs U2Nyb2xsYmFyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5z ZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRm b3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIo KSB9KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogICAgICAgICBjYXNlIFNjcm9s bGluZ05vZGVUeXBlOjpPdmVyZmxvd1Byb3h5OgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclBy b3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9S ZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tCmluZGV4IDU0NTJlYmEyNTgyNmM1 YjcwM2Y0M2MzNjNmMWZiOGE0ZDQ0NDVmYjguLjU0ZTBlYWI2MzVmZjI5NTRkNGFjNmM4MmZlZTI2 Y2I4NWQ0MWJlNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxh eWVyVHJlZS9pb3MvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eUlPUy5tbQorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1JlbW90ZVNjcm9sbGlu Z0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KQEAgLTY2LDE5ICs2NiwyMSBAQCBVSVNjcm9sbFZpZXcg KlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OnNjcm9sbFZpZXdGb3JTY3JvbGxpbmdO b2RlSUQoV2ViQwogCiB2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5l Y3RTdGF0ZU5vZGVMYXllcnMoU2Nyb2xsaW5nU3RhdGVUcmVlJiBzdGF0ZVRyZWUsIGNvbnN0IFJl bW90ZUxheWVyVHJlZUhvc3QmIGxheWVyVHJlZUhvc3QpCiB7CisgICAgdXNpbmcgUGxhdGZvcm1M YXllcklEID0gR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklEOworCiAgICAgZm9yIChhdXRv JiBjdXJyTm9kZSA6IHN0YXRlVHJlZS5ub2RlTWFwKCkudmFsdWVzKCkpIHsKICAgICAgICAgaWYg KGN1cnJOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVOb2RlOjpMYXllcikp Ci0gICAgICAgICAgICBjdXJyTm9kZS0+c2V0TGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklE KGN1cnJOb2RlLT5sYXllcigpKSk7CisgICAgICAgICAgICBjdXJyTm9kZS0+c2V0TGF5ZXIobGF5 ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IGN1cnJOb2RlLT5sYXllcigp IH0pKTsKICAgICAgICAgCiAgICAgICAgIHN3aXRjaCAoY3Vyck5vZGUtPm5vZGVUeXBlKCkpIHsK ICAgICAgICAgY2FzZSBTY3JvbGxpbmdOb2RlVHlwZTo6T3ZlcmZsb3c6IHsKICAgICAgICAgICAg IFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUg PSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZT4oKmN1cnJOb2Rl KTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVy dHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxDb250YWluZXJMYXllcikpCi0g ICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbENvbnRhaW5lckxheWVy KGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFp bmVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRTY3Jv bGxDb250YWluZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklE IHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbENvbnRhaW5lckxheWVyKCkgfSkpOwogCiAgICAg ICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGVkQ29udGVudHNMYXllcikpCi0gICAgICAgICAg ICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbGVkQ29udGVudHNMYXllcihsYXllclRy ZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNMYXll cigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbGVkQ29u dGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Ny b2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNMYXllcigpIH0pKTsKICAgICAgICAgICAg IGJyZWFrOwogICAgICAgICB9OwogICAgICAgICBjYXNlIFNjcm9sbGluZ05vZGVUeXBlOjpNYWlu RnJhbWU6CkBAIC04NiwyMCArODgsMjAgQEAgdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRv clByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYKICAgICAg ICAgICAgIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5v ZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZT4oKmN1cnJOb2Rl KTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVy dHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpTY3JvbGxDb250YWluZXJMYXllcikpCi0g ICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbENvbnRhaW5lckxheWVy KGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFp bmVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRTY3Jv bGxDb250YWluZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklE IHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbENvbnRhaW5lckxheWVyKCkgfSkpOwogCiAgICAg ICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxp bmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGVkQ29udGVudHNMYXllcikpCi0gICAgICAgICAg ICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbGVkQ29udGVudHNMYXllcihsYXllclRy ZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNMYXll cigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbGVkQ29u dGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Ny b2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNMYXllcigpIH0pKTsKIAogICAgICAgICAg ICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU6OkNvdW50ZXJTY3JvbGxpbmdMYXllcikpCi0gICAgICAgICAg ICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvdW50ZXJTY3JvbGxpbmdMYXllcihsYXllclRy ZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJTY3JvbGxpbmdMYXll cigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvdW50ZXJTY3Jv bGxpbmdMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Ny b2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJTY3JvbGxpbmdMYXllcigpIH0pKTsKIAogICAgICAgICAg ICAgLy8gRklYTUU6IHdlIHNob3VsZCBuZXZlciBoYXZlIGhlYWRlciBhbmQgZm9vdGVyIGxheWVy cyBjb21pbmcgZnJvbSB0aGUgV2ViUHJvY2Vzcy4KICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdT dGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdO b2RlOjpIZWFkZXJMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNl dEhlYWRlckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUu aGVhZGVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRI ZWFkZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Ny b2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Ny b2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Ny b2xsaW5nTm9kZTo6Rm9vdGVyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRl Tm9kZS5zZXRGb290ZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3Rh dGVOb2RlLmZvb3RlckxheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5v ZGUuc2V0Rm9vdGVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJ RCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpIH0pKTsKICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93 UHJveHk6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVJT1MubW0gYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGVSZW1vdGVJT1MubW0KaW5kZXggYjg5MDY4MWU5ZTdhNTEzYmEzNDM2N2Nl ZjM5ODliZTNiMTlkOWNiNi4uMWJmNTYzYWY2NGZmMTNmZTAwOGMwZmU2MGIyYmJmMjBkZmI3Mjcw OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1l U2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5tbQpAQCAtNTcsMTMgKzU3LDEzIEBAIHZvaWQgU2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUzo6Y29tbWl0U3RhdGVCZWZvcmVDaGls ZHJlbihjb25zdCBTCiAgICAgY29uc3QgYXV0byYgc2Nyb2xsaW5nU3RhdGVOb2RlID0gZG93bmNh c3Q8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU+KHN0YXRlTm9kZSk7CiAKICAgICBp ZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZy YW1lU2Nyb2xsaW5nTm9kZTo6Q291bnRlclNjcm9sbGluZ0xheWVyKSkKLSAgICAgICAgbV9jb3Vu dGVyU2Nyb2xsaW5nTGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuY291bnRlclNjcm9sbGluZ0xh eWVyKCk7CisgICAgICAgIG1fY291bnRlclNjcm9sbGluZ0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FM YXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5jb3VudGVyU2Nyb2xsaW5nTGF5ZXIoKSk7CiAKICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6SGVhZGVyTGF5ZXIpKQotICAgICAgICBtX2hlYWRlckxheWVy ID0gc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCk7CisgICAgICAgIG1faGVhZGVyTGF5 ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVy KCkpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkZvb3RlckxheWVyKSkKLSAgICAgICAgbV9m b290ZXJMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpOworICAgICAgICBt X2Zvb3RlckxheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5m b290ZXJMYXllcigpKTsKIAogICAgIGlmIChzdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNj cm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsQ29udGFpbmVyTGF5ZXIpKSB7CiAgICAg ICAgIGlmIChzY3JvbGxDb250YWluZXJMYXllcigpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9k ZURlbGVnYXRlSU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVl L2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLm1tCmluZGV4IDdiM2Yx MWJmZDZiZDgzNzZhMmYxZmJjN2M1NjVhODdlNTM5ODcyNWMuLmU3Njg5ODM3NTgxYjlkOWI5NWJm ZWEwMzc2ZTFlNDkxY2VmMzlhNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlP Uy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Nj cm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1MubW0KQEAgLTIyOCw3ICsyMjgsNyBA QCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJT1M6OnJlc2V0U2Nyb2xs Vmlld0RlbGVnYXRlKCkKIHZvaWQgU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlP Uzo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGlu Z05vZGUmIHNjcm9sbGluZ1N0YXRlTm9kZSkKIHsKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2Rl Lmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENv bnRhaW5lckxheWVyKSkKLSAgICAgICAgbV9zY3JvbGxMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9k ZS5zY3JvbGxDb250YWluZXJMYXllcigpOworICAgICAgICBtX3Njcm9sbExheWVyID0gc3RhdGlj X2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWluZXJMYXllcigp KTsKIH0KIAogdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TOjpjb21t aXRTdGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlJiBz Y3JvbGxpbmdTdGF0ZU5vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9S ZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVN YWMuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3Jv bGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlTWFjLmNwcAppbmRleCAyMzNmZmQwMjFl NjM4YmYxODhmOGRjYWJkNzc5Yzc0NTI5NDM3Mjk3Li45YTA0OTA1ZWU4ZjY1MmMxYWJiN2Y0MDZj YmFlMThmYjUxMGFiNTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1v dGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9tYWMvU2Ny b2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZU1hYy5jcHAKQEAgLTU2LDEwICs1Niwx MCBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWM6OmNvbW1p dFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgUwogCiAgICAgLy8gRklYTUU6IFB1c2ggdG8gU2Ny b2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYz8KICAgICBpZiAoc2Nyb2xsaW5nU3Rh dGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9k ZTo6VmVydGljYWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgIG1fc2Nyb2xsZXJQYWlyLT52ZXJ0 aWNhbFNjcm9sbGVyKCkuc2V0SG9zdExheWVyKHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNj cm9sbGJhckxheWVyKCkpOworICAgICAgICBtX3Njcm9sbGVyUGFpci0+dmVydGljYWxTY3JvbGxl cigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2Rl LnZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSkpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9k ZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6Okhv cml6b250YWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgIG1fc2Nyb2xsZXJQYWlyLT5ob3Jpem9u dGFsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc2Nyb2xsaW5nU3RhdGVOb2RlLmhvcml6b250YWxT Y3JvbGxiYXJMYXllcigpKTsKKyAgICAgICAgbV9zY3JvbGxlclBhaXItPmhvcml6b250YWxTY3Jv bGxlcigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVO b2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigpKSk7CiAKICAgICBtX3Njcm9sbGVyUGFpci0+ dXBkYXRlVmFsdWVzKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9S ZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVSZW1v dGVNYWMuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9T Y3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2RlUmVtb3RlTWFjLmNwcAppbmRleCBiNmNh M2NiYmE4MDgwN2FmN2I5ZjY5OWJlOWIxYjJhYTljZGMxYzMyLi5mYTZjM2RhYmViYzBmOWE0YWE2 MzhlNTQyMzVkNjliYzE0MTg3MWMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVS ZW1vdGVNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9tYWMvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZVJlbW90ZU1hYy5jcHAKQEAg LTU2LDEwICs1NiwxMCBAQCB2b2lkIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVS ZW1vdGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29ucwogCiAgICAgLy8gRklYTUU6 IFB1c2ggdG8gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1hYz8KICAgICBpZiAo c2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU92ZXJm bG93U2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgIG1fc2Ny b2xsZXJQYWlyLT52ZXJ0aWNhbFNjcm9sbGVyKCkuc2V0SG9zdExheWVyKHNjcm9sbGluZ1N0YXRl Tm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpOworICAgICAgICBtX3Njcm9sbGVyUGFpci0+ dmVydGljYWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Ny b2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSkpOwogCiAgICAgaWYgKHNj cm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGU6Okhvcml6b250YWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAgIG1fc2Ny b2xsZXJQYWlyLT5ob3Jpem9udGFsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc2Nyb2xsaW5nU3Rh dGVOb2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigpKTsKKyAgICAgICAgbV9zY3JvbGxlclBh aXItPmhvcml6b250YWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxDQUxheWVy Kj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigpKSk7CiAKICAg ICBtX3Njcm9sbGVyUGFpci0+dXBkYXRlVmFsdWVzKCk7CiB9Cg== 379807 2019-09-29 02:13:55 -0700 2019-09-29 10:25:46 -0700 Patch bug-202344-20190929111353.patch text/plain 30385 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDg5ZWNjNGE3ZmYzYjU2 ODlhNTdhZWE0M2RlYjE2ZGM1MTMyMjU3OS4uMTkyNjMyMjYxODE2YTk4Y2ZkYzA2ZmVkMTI5ZWE4 N2ZjMjQyMDAyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDE5LTA5LTI5ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBUaWdodGVuIHVwIExh eWVyUmVwcmVzZW50YXRpb24gb3BlcmF0b3JzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIzNDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIHRoZSBvcGVyYXRvcnMgb24gdGhlIExheWVyUmVwcmVz ZW50YXRpb24gY2xhc3MgZXhwbGljaXQuCisgICAgICAgIEFkZGl0aW9uYWxseSwgdGhlIGJvb2wg b3BlcmF0b3IgaXMgYWRkZWQgdG8gdGhlIGNsYXNzLCBhbGxvd2luZyBvYmplY3RzCisgICAgICAg IG9mIHRoaXMgY2xhc3MgdG8gYmUgc2FmZWx5IHVzZWQgaW4gYm9vbGVhbiBjb250ZXh0cyBsaWtl IG51bGwgY2hlY2tzLgorICAgICAgICBCZWZvcmUsIHVzZSBpbiBzdWNoIGNvbnRleHRzIGZlbGwg YmFjayB0byB1c2luZyB0aGUKKyAgICAgICAgR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1MYXllcklE IG9wZXJhdG9yIHdoaWNoIGNhdXNlZCBhc3NlcnRzIHdoZW4gdGhlCisgICAgICAgIGludGVybmFs IHJlcHJlc2VudGF0aW9uIHdhcyBvZiBkaWZmZXJlbnQgdHlwZS4KKworICAgICAgICBXaGlsZSB0 aGUgZXhwbGljaXQgb3BlcmF0b3JzIHByZXZlbnQgbWlzdXNlLCB0aGV5IGRvIHJlcXVpcmUgYWRk aXRpb25hbAorICAgICAgICBjb252ZXJzaW9uIGNhc3RzIHRvIHJldHJpZXZlIHRoZSBpbnRlcm5h bCBMYXllclJlcHJlc2VudGF0aW9uIHZhbHVlLgorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcv U2Nyb2xsaW5nU3RhdGVOb2RlLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJlcHJlc2VudGF0 aW9uOjpvcGVyYXRvciBHcmFwaGljc0xheWVyKiBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpM YXllclJlcHJlc2VudGF0aW9uOjpvcGVyYXRvciBQbGF0Zm9ybUxheWVyKiBjb25zdCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXllclJlcHJlc2VudGF0aW9uOjpvcGVyYXRvciBHcmFwaGljc0xheWVy OjpQbGF0Zm9ybUxheWVySUQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJSZXByZXNl bnRhdGlvbjo6b3BlcmF0b3IgYm9vbCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXllclJl cHJlc2VudGF0aW9uOjp0b1JlcHJlc2VudGF0aW9uIGNvbnN0KToKKyAgICAgICAgQWRkIGEgbWlz c2luZyBBU1NFUlRfTk9UX1JFQUNIRUQoKSBpbnZvY2F0aW9uLgorICAgICAgICAqIHBhZ2Uvc2Ny b2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVuKToK KyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlRml4ZWROb2RlLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZpeGVkTm9kZTo6Y29tbWl0U3RhdGVC ZWZvcmVDaGlsZHJlbik6CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5n VHJlZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nVHJlZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVu KToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25l ZE5vZGUubW06CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGU6 OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL2Nv Y29hL1Njcm9sbGluZ1RyZWVTdGlja3lOb2RlLm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs aW5nVHJlZVN0aWNreU5vZGU6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4pOgorICAgICAgICAq IHBhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZU1hYzo6 Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbik6CisKIDIwMTktMDktMjcgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBQYWdlcyB1c2luZyBXZWJHTFJlbmRlcmluZ0Nv bnRleHQgZmFpbCB0byBlbnRlciB0aGUgYmFjay9mb3J3YXJkIGNhY2hlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUz MmI0NDIzZTQ2ZGYzZDZhMjVlYmYwNzNlODMxOWNmM2RlNTRiZWYuLjZmNzYyMWQ3ODRhMTkzNDc4 ZWU4ZjJkYWUwNWIyZTYyNzQ0NTdiYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTkt MDktMjkgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCisgICAgICAgIFRp Z2h0ZW4gdXAgTGF5ZXJSZXByZXNlbnRhdGlvbiBvcGVyYXRvcnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjM0NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpdGggTGF5ZXJSZXByZXNlbnRhdGlvbiBv cGVyYXRvcnMgbm93IGJlaW5nIGV4cGxpY2l0LCB3ZSByZXF1aXJlCisgICAgICAgIHRvIG1hbnVh bGx5IHNwZWNpZnkgY29udmVyc2lvbiB0byBDQUxheWVyIHBvaW50ZXJzIG9yCisgICAgICAgIEdy YXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRCB2YWx1ZXMuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb25uZWN0 U3RhdGVOb2RlTGF5ZXJzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lv cy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJz KToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpTY3JvbGxp bmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlSU9TOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxk cmVuKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdU cmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpTY3JvbGxp bmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TOjpjb21taXRTdGF0ZUJlZm9yZUNoaWxkcmVu KToKKyAgICAgICAgKiBVSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVl RnJhbWVTY3JvbGxpbmdOb2RlUmVtb3RlTWFjLmNwcDoKKyAgICAgICAgKFdlYktpdDo6U2Nyb2xs aW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZU1hYzo6Y29tbWl0U3RhdGVCZWZvcmVDaGls ZHJlbik6CisgICAgICAgICogVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9tYWMvU2Nyb2xsaW5n VHJlZU92ZXJmbG93U2Nyb2xsaW5nTm9kZVJlbW90ZU1hYy5jcHA6CisgICAgICAgIChXZWJLaXQ6 OlNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVSZW1vdGVNYWM6OmNvbW1pdFN0YXRl QmVmb3JlQ2hpbGRyZW4pOgorCiAyMDE5LTA5LTI3ICBBZHJpYW4gUGVyZXogZGUgQ2FzdHJvICA8 YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBGaXhlcyBmb3Igbm9uLXVu aWZpZWQgYnVpbGRzIGFmdGVyIHIyNDk3MTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1N0YXRlTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9z Y3JvbGxpbmcvU2Nyb2xsaW5nU3RhdGVOb2RlLmgKaW5kZXggZGYyOGY0MjkxNzFhMWNlODYyZjkw NGVmNmU5M2Y4MTVjNTBhYWJmYS4uZjFmYTNiZDBhOTE4MDI4MDRlNTFkMDE2MWYwMmE5YjcxNmI0 ZWZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVOb2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n U3RhdGVOb2RlLmgKQEAgLTk0LDEzICs5NCwxMyBAQCBwdWJsaWM6CiAgICAgICAgICAgICByZWxl YXNlUGxhdGZvcm1MYXllcihtX3R5cGVsZXNzUGxhdGZvcm1MYXllcik7CiAgICAgfQogCi0gICAg b3BlcmF0b3IgR3JhcGhpY3NMYXllciooKSBjb25zdAorICAgIGV4cGxpY2l0IG9wZXJhdG9yIEdy YXBoaWNzTGF5ZXIqKCkgY29uc3QKICAgICB7CiAgICAgICAgIEFTU0VSVChtX3JlcHJlc2VudGF0 aW9uID09IEdyYXBoaWNzTGF5ZXJSZXByZXNlbnRhdGlvbik7CiAgICAgICAgIHJldHVybiBtX2dy YXBoaWNzTGF5ZXIuZ2V0KCk7CiAgICAgfQogCi0gICAgb3BlcmF0b3IgUGxhdGZvcm1MYXllcioo KSBjb25zdAorICAgIGV4cGxpY2l0IG9wZXJhdG9yIFBsYXRmb3JtTGF5ZXIqKCkgY29uc3QKICAg ICB7CiAgICAgICAgIEFTU0VSVChtX3JlcHJlc2VudGF0aW9uID09IFBsYXRmb3JtTGF5ZXJSZXBy ZXNlbnRhdGlvbik7CiAgICAgICAgIHJldHVybiBtYWtlUGxhdGZvcm1MYXllclR5cGVkKG1fdHlw ZWxlc3NQbGF0Zm9ybUxheWVyKTsKQEAgLTExMSw3ICsxMTEsNyBAQCBwdWJsaWM6CiAgICAgICAg IHJldHVybiBtX2xheWVySUQ7CiAgICAgfQogCi0gICAgb3BlcmF0b3IgR3JhcGhpY3NMYXllcjo6 UGxhdGZvcm1MYXllcklEKCkgY29uc3QKKyAgICBleHBsaWNpdCBvcGVyYXRvciBHcmFwaGljc0xh eWVyOjpQbGF0Zm9ybUxheWVySUQoKSBjb25zdAogICAgIHsKICAgICAgICAgQVNTRVJUKG1fcmVw cmVzZW50YXRpb24gIT0gUGxhdGZvcm1MYXllclJlcHJlc2VudGF0aW9uKTsKICAgICAgICAgcmV0 dXJuIG1fbGF5ZXJJRDsKQEAgLTEzMCw2ICsxMzAsMjIgQEAgcHVibGljOgogICAgICAgICByZXR1 cm4gKnRoaXM7CiAgICAgfQogCisgICAgZXhwbGljaXQgb3BlcmF0b3IgYm9vbCgpIGNvbnN0Cisg ICAgeworICAgICAgICBzd2l0Y2ggKG1fcmVwcmVzZW50YXRpb24pIHsKKyAgICAgICAgY2FzZSBF bXB0eVJlcHJlc2VudGF0aW9uOgorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBj YXNlIEdyYXBoaWNzTGF5ZXJSZXByZXNlbnRhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiAhIW1f Z3JhcGhpY3NMYXllcjsKKyAgICAgICAgY2FzZSBQbGF0Zm9ybUxheWVyUmVwcmVzZW50YXRpb246 CisgICAgICAgICAgICByZXR1cm4gISFtX3R5cGVsZXNzUGxhdGZvcm1MYXllcjsKKyAgICAgICAg Y2FzZSBQbGF0Zm9ybUxheWVySURSZXByZXNlbnRhdGlvbjoKKyAgICAgICAgICAgIHJldHVybiAh IW1fbGF5ZXJJRDsKKyAgICAgICAgfQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKwogICAgIGJvb2wgb3BlcmF0b3I9PShjb25zdCBM YXllclJlcHJlc2VudGF0aW9uJiBvdGhlcikgY29uc3QKICAgICB7CiAgICAgICAgIGlmIChtX3Jl cHJlc2VudGF0aW9uICE9IG90aGVyLm1fcmVwcmVzZW50YXRpb24pCkBAIC0xNjIsNiArMTc4LDcg QEAgcHVibGljOgogICAgICAgICBjYXNlIFBsYXRmb3JtTGF5ZXJJRFJlcHJlc2VudGF0aW9uOgog ICAgICAgICAgICAgcmV0dXJuIExheWVyUmVwcmVzZW50YXRpb24obV9sYXllcklEKTsKICAgICAg ICAgfQorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgcmV0dXJuIExheWVy UmVwcmVzZW50YXRpb24oKTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlLmNwcAppbmRleCBk ODYwMGU1MzkxZWQ5NTkzYjlmODRjNWFjMThlMTM2MDFlMWY2MGQ3Li44MTI1NmVlM2I0YTQ5OTYz YjZhZjQ2Yjk3NmM3NGY0ZDNkYzhhOTQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGUuY3BwCkBAIC0x MDIsMTAgKzEwMiwxMCBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlOjpjb21taXRT dGF0ZUJlZm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTgogCiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgaWYgKHN0YXRlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNj cm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAgICAgICAgbV9zY3JvbGxDb250 YWluZXJMYXllciA9IHN0YXRlLnNjcm9sbENvbnRhaW5lckxheWVyKCk7CisgICAgICAgIG1fc2Ny b2xsQ29udGFpbmVyTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc3RhdGUuc2Nyb2xsQ29u dGFpbmVyTGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAg bV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIgPSBzdGF0ZS5zY3JvbGxlZENvbnRlbnRzTGF5ZXIoKTsK KyAgICAgICAgbV9zY3JvbGxlZENvbnRlbnRzTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4o c3RhdGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5v ZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVl Rml4ZWROb2RlLm1tCmluZGV4IDhlNGFjMjMwMWE5OGM1ZTdkOGY4NTdmMTAzZjQ1NTdkZDJjNzkx MDEuLmUwZTcwZTg2OThkNDQ1MjQ1NGQwOTJlOGY2OTEyZmQxNGY5NDcyOTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVGaXhlZE5v ZGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5n VHJlZUZpeGVkTm9kZS5tbQpAQCAtNjIsNyArNjIsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGaXhl ZE5vZGU6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgU2Nyb2xsaW5nU3RhdGVOb2Rl JgogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlJiBmaXhlZFN0YXRlTm9kZSA9IGRv d25jYXN0PFNjcm9sbGluZ1N0YXRlRml4ZWROb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKGZp eGVkU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZU5vZGU6OkxheWVy KSkKLSAgICAgICAgbV9sYXllciA9IGZpeGVkU3RhdGVOb2RlLmxheWVyKCk7CisgICAgICAgIG1f bGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oZml4ZWRTdGF0ZU5vZGUubGF5ZXIoKSk7CiAK ICAgICBpZiAoc3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZpeGVk Tm9kZTo6Vmlld3BvcnRDb25zdHJhaW50cykpCiAgICAgICAgIG1fY29uc3RyYWludHMgPSBmaXhl ZFN0YXRlTm9kZS52aWV3cG9ydENvbnN0cmFpbnRzKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxQcm94 eU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdU cmVlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUubW0KaW5kZXggOGI5OWUwNDIwM2FkOTdlZDkzYjQ4 MjZlZTIxZjBiMzM1MDJkZjhjZS4uMzEyZjBlOGJhMWM0YzY5NzUyY2JkMjg3YzQ0N2IwMWQ5MTE0 NmIyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Ny b2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Njcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFByb3h5Tm9k ZS5tbQpAQCAtNTIsNyArNTIsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVPdmVyZmxvd1Njcm9sbFBy b3h5Tm9kZTo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTY3JvbAogICAgIGNvbnN0 IFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxQcm94eU5vZGUmIG92ZXJmbG93UHJveHlTdGF0 ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsUHJveHlOb2RlPihz dGF0ZU5vZGUpOwogCiAgICAgaWYgKHN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xs aW5nU3RhdGVOb2RlOjpMYXllcikpCi0gICAgICAgIG1fbGF5ZXIgPSBzdGF0ZU5vZGUubGF5ZXIo KTsKKyAgICAgICAgbV9sYXllciA9IHN0YXRpY19jYXN0PENBTGF5ZXIqPihzdGF0ZU5vZGUubGF5 ZXIoKSk7CiAKICAgICBpZiAob3ZlcmZsb3dQcm94eVN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVy dHkoU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbFByb3h5Tm9kZTo6T3ZlcmZsb3dTY3JvbGxp bmdOb2RlKSkKICAgICAgICAgbV9vdmVyZmxvd1Njcm9sbGluZ05vZGVJRCA9IG92ZXJmbG93UHJv eHlTdGF0ZU5vZGUub3ZlcmZsb3dTY3JvbGxpbmdOb2RlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlUG9zaXRpb25lZE5vZGUu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlUG9z aXRpb25lZE5vZGUubW0KaW5kZXggMjM4NTBkYmE3MTAyZDA2ZTE4NTMxOGFhZmFmNWFhNzBlMzc4 MWY4Zi4uYTI1YTlkMDY2MDMwNDA2ZTU3NmM0OWUxNThmODU1OGNiODUyMjYwMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZVBvc2l0 aW9uZWROb2RlLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL2NvY29hL1Nj cm9sbGluZ1RyZWVQb3NpdGlvbmVkTm9kZS5tbQpAQCAtNTUsNyArNTUsNyBAQCB2b2lkIFNjcm9s bGluZ1RyZWVQb3NpdGlvbmVkTm9kZTo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBT Y3JvbGxpbmdTdGF0ZQogICAgIGNvbnN0IFNjcm9sbGluZ1N0YXRlUG9zaXRpb25lZE5vZGUmIHBv c2l0aW9uZWRTdGF0ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZVBvc2l0aW9uZWROb2Rl PihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHBvc2l0aW9uZWRTdGF0ZU5vZGUuaGFzQ2hhbmdlZFBy b3BlcnR5KFNjcm9sbGluZ1N0YXRlTm9kZTo6TGF5ZXIpKQotICAgICAgICBtX2xheWVyID0gcG9z aXRpb25lZFN0YXRlTm9kZS5sYXllcigpOworICAgICAgICBtX2xheWVyID0gc3RhdGljX2Nhc3Q8 Q0FMYXllcio+KHBvc2l0aW9uZWRTdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAocG9zaXRp b25lZFN0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVQb3NpdGlvbmVk Tm9kZTo6UmVsYXRlZE92ZXJmbG93U2Nyb2xsaW5nTm9kZXMpKQogICAgICAgICBtX3JlbGF0ZWRP dmVyZmxvd1Njcm9sbGluZ05vZGVzID0gcG9zaXRpb25lZFN0YXRlTm9kZS5yZWxhdGVkT3ZlcmZs b3dTY3JvbGxpbmdOb2RlcygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9zY3Jv bGxpbmcvY29jb2EvU2Nyb2xsaW5nVHJlZVN0aWNreU5vZGUubW0gYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQppbmRleCBkMjg0 MWI2YTY3ZGQwYzgyNTQ2MDEyYTlmY2FiZWI2YTkyNGY2YjI3Li4zZmY1ZDBkYjgwOWYwZWIwOGNl MjI4OWI2MWJjODFkZmYxNjczNDQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL3Njcm9sbGluZy9jb2NvYS9TY3JvbGxpbmdUcmVlU3RpY2t5Tm9kZS5tbQpAQCAt NjEsNyArNjEsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTdGlja3lOb2RlOjpjb21taXRTdGF0ZUJl Zm9yZUNoaWxkcmVuKGNvbnN0IFNjcm9sbGluZ1N0YXRlTm9kZQogICAgIGNvbnN0IFNjcm9sbGlu Z1N0YXRlU3RpY2t5Tm9kZSYgc3RpY2t5U3RhdGVOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3Rh dGVTdGlja3lOb2RlPihzdGF0ZU5vZGUpOwogCiAgICAgaWYgKHN0aWNreVN0YXRlTm9kZS5oYXND aGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVOb2RlOjpMYXllcikpCi0gICAgICAgIG1fbGF5 ZXIgPSBzdGlja3lTdGF0ZU5vZGUubGF5ZXIoKTsKKyAgICAgICAgbV9sYXllciA9IHN0YXRpY19j YXN0PENBTGF5ZXIqPihzdGlja3lTdGF0ZU5vZGUubGF5ZXIoKSk7CiAKICAgICBpZiAoc3RhdGVO b2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVN0aWNreU5vZGU6OlZpZXdwb3J0 Q29uc3RyYWludHMpKQogICAgICAgICBtX2NvbnN0cmFpbnRzID0gc3RpY2t5U3RhdGVOb2RlLnZp ZXdwb3J0Q29uc3RyYWludHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Ny b2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlTWFjLm1tIGIvU291cmNl L1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05v ZGVNYWMubW0KaW5kZXggYjUzYTY4NGZhMzBjODdmMzYxNWQ1MmI5ODg4MmEwZjYzN2IwMzcyOC4u MDhhZDQ4MmY3MTRhMjlhMjU3NDg1ZGZjYzQwNThkNDE5YTI3NmQyZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGVNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvbWFjL1Njcm9s bGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWMubW0KQEAgLTg1LDIyICs4NSwyMiBAQCB2b2lk IFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hp bGRyZW4oY29uc3QgU2Nyb2xsaQogICAgIGNvbnN0IGF1dG8mIHNjcm9sbGluZ1N0YXRlTm9kZSA9 IGRvd25jYXN0PFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPihzdGF0ZU5vZGUpOwog CiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5n U3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlJvb3RDb250ZW50c0xheWVyKSkKLSAgICAgICAgbV9y b290Q29udGVudHNMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5yb290Q29udGVudHNMYXllcigp OworICAgICAgICBtX3Jvb3RDb250ZW50c0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNj cm9sbGluZ1N0YXRlTm9kZS5yb290Q29udGVudHNMYXllcigpKTsKIAogICAgIGlmIChzY3JvbGxp bmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlOjpDb3VudGVyU2Nyb2xsaW5nTGF5ZXIpKQotICAgICAgICBtX2NvdW50ZXJTY3JvbGxp bmdMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5jb3VudGVyU2Nyb2xsaW5nTGF5ZXIoKTsKKyAg ICAgICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Ny b2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJTY3JvbGxpbmdMYXllcigpKTsKIAogICAgIGlmIChzY3Jv bGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3Jv bGxpbmdOb2RlOjpJbnNldENsaXBMYXllcikpCi0gICAgICAgIG1faW5zZXRDbGlwTGF5ZXIgPSBz Y3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRDbGlwTGF5ZXIoKTsKKyAgICAgICAgbV9pbnNldENsaXBM YXllciA9IHN0YXRpY19jYXN0PENBTGF5ZXIqPihzY3JvbGxpbmdTdGF0ZU5vZGUuaW5zZXRDbGlw TGF5ZXIoKSk7CiAKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Q29udGVudFNoYWRvd0xheWVyKSkK LSAgICAgICAgbV9jb250ZW50U2hhZG93TGF5ZXIgPSBzY3JvbGxpbmdTdGF0ZU5vZGUuY29udGVu dFNoYWRvd0xheWVyKCk7CisgICAgICAgIG1fY29udGVudFNoYWRvd0xheWVyID0gc3RhdGljX2Nh c3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5jb250ZW50U2hhZG93TGF5ZXIoKSk7CiAK ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6SGVhZGVyTGF5ZXIpKQotICAgICAgICBtX2hlYWRlckxh eWVyID0gc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCk7CisgICAgICAgIG1faGVhZGVy TGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxh eWVyKCkpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHko U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkZvb3RlckxheWVyKSkKLSAgICAgICAg bV9mb290ZXJMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpOworICAgICAg ICBtX2Zvb3RlckxheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9k ZS5mb290ZXJMYXllcigpKTsKIAogICAgIGJvb2wgbG9nU2Nyb2xsaW5nTW9kZSA9ICFtX2hhZEZp cnN0VXBkYXRlOwogICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5 KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpSZWFzb25zRm9yU3luY2hyb25vdXNT Y3JvbGxpbmcpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJv eHkuY3BwCmluZGV4IDBhY2ViMDNhZmJjMDYwOTM1OWVmNjMyZTE0OTU0ODMxOTIzNGM1ZTAuLjQ4 MjNmNzZhOTc3MmY5NzdjZDc2YzI1YzNkNWVhN2QzMmYxZGFjNjYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvUmVtb3RlU2Nyb2xsaW5nQ29vcmRpbmF0b3JQcm94eS5jcHAKQEAgLTEwMiw5ICsxMDIsMTEg QEAgdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb21taXRTY3JvbGxpbmdU cmVlU3RhdGUoY29uc3QgUmVtb3RlU2Nyb2wKIAogdm9pZCBSZW1vdGVTY3JvbGxpbmdDb29yZGlu YXRvclByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNjcm9sbGluZ1N0YXRlVHJlZSYgc3Rh dGVUcmVlLCBjb25zdCBSZW1vdGVMYXllclRyZWVIb3N0JiBsYXllclRyZWVIb3N0KQogeworICAg IHVzaW5nIFBsYXRmb3JtTGF5ZXJJRCA9IEdyYXBoaWNzTGF5ZXI6OlBsYXRmb3JtTGF5ZXJJRDsK KwogICAgIGZvciAoYXV0byYgY3Vyck5vZGUgOiBzdGF0ZVRyZWUubm9kZU1hcCgpLnZhbHVlcygp KSB7CiAgICAgICAgIGlmIChjdXJyTm9kZS0+aGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0 YXRlTm9kZTo6TGF5ZXIpKQotICAgICAgICAgICAgY3Vyck5vZGUtPnNldExheWVyKGxheWVyVHJl ZUhvc3QubGF5ZXJGb3JJRChjdXJyTm9kZS0+bGF5ZXIoKSkpOworICAgICAgICAgICAgY3Vyck5v ZGUtPnNldExheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBj dXJyTm9kZS0+bGF5ZXIoKSB9KSk7CiAKICAgICAgICAgc3dpdGNoIChjdXJyTm9kZS0+bm9kZVR5 cGUoKSkgewogICAgICAgICBjYXNlIFNjcm9sbGluZ05vZGVUeXBlOjpNYWluRnJhbWU6CkBAIC0x MTIsNTAgKzExNCw1MCBAQCB2b2lkIFJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6OmNv bm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Nyb2xsaW5nU3RhdGVUcmVlJgogICAgICAgICAgICAgU2Ny b2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGUmIHNjcm9sbGluZ1N0YXRlTm9kZSA9IGRvd25j YXN0PFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlPigqY3Vyck5vZGUpOwogICAgICAg ICAgICAgCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9w ZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkK LSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsQ29udGFpbmVyTGF5 ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250 YWluZXJMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNj cm9sbENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVy SUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSB9KSk7CiAKICAg ICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9s bGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsZWRDb250ZW50c0xheWVyKSkKLSAgICAgICAg ICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVy VHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xsZWRD b250ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBz Y3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkgfSkpOwogCiAgICAgICAg ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Q291bnRlclNjcm9sbGluZ0xheWVyKSkKLSAgICAgICAg ICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Q291bnRlclNjcm9sbGluZ0xheWVyKGxheWVy VHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuY291bnRlclNjcm9sbGluZ0xh eWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Q291bnRlclNj cm9sbGluZ0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBz Y3JvbGxpbmdTdGF0ZU5vZGUuY291bnRlclNjcm9sbGluZ0xheWVyKCkgfSkpOwogCiAgICAgICAg ICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdT dGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6SW5zZXRDbGlwTGF5ZXIpKQotICAgICAgICAgICAgICAg IHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRJbnNldENsaXBMYXllcihsYXllclRyZWVIb3N0LmxheWVy Rm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmluc2V0Q2xpcExheWVyKCkpKTsKKyAgICAgICAgICAg ICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0SW5zZXRDbGlwTGF5ZXIobGF5ZXJUcmVlSG9zdC5s YXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5pbnNldENsaXBM YXllcigpIH0pKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFu Z2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkNvbnRlbnRTaGFk b3dMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvbnRlbnRT aGFkb3dMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmNv bnRlbnRTaGFkb3dMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2Rl LnNldENvbnRlbnRTaGFkb3dMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1M YXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLmNvbnRlbnRTaGFkb3dMYXllcigpIH0pKTsKIAog ICAgICAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBuZXZlciBoYXZlIGhlYWRlciBhbmQgZm9v dGVyIGxheWVycyBjb21pbmcgZnJvbSB0aGUgV2ViUHJvY2Vzcy4KICAgICAgICAgICAgIGlmIChz Y3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVT Y3JvbGxpbmdOb2RlOjpIZWFkZXJMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3Rh dGVOb2RlLnNldEhlYWRlckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdT dGF0ZU5vZGUuaGVhZGVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRl Tm9kZS5zZXRIZWFkZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoUGxhdGZvcm1MYXll cklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkgfSkpOwogCiAgICAgICAgICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9vdGVyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9s bGluZ1N0YXRlTm9kZS5zZXRGb290ZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Ny b2xsaW5nU3RhdGVOb2RlLmZvb3RlckxheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxp bmdTdGF0ZU5vZGUuc2V0Rm9vdGVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRm b3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpIH0pKTsKIAogICAg ICAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xs aW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OlZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIpKQotICAg ICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRWZXJ0aWNhbFNjcm9sbGJhckxheWVy KGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUudmVydGljYWxTY3Jv bGxiYXJMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZl cnRpY2FsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5 ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkgfSkpOwog CiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShT Y3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6SG9yaXpvbnRhbFNjcm9sbGJhckxheWVy KSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9s bGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaG9y aXpvbnRhbFNjcm9sbGJhckxheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0 ZU5vZGUuc2V0SG9yaXpvbnRhbFNjcm9sbGJhckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJ RChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuaG9yaXpvbnRhbFNjcm9sbGJh ckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0No YW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Um9vdENvbnRl bnRzTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRSb290Q29u dGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLnJv b3RDb250ZW50c0xheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUu c2V0Um9vdENvbnRlbnRzTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5 ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5yb290Q29udGVudHNMYXllcigpIH0pKTsKICAgICAg ICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgU2Nyb2xsaW5nTm9kZVR5cGU6 Ok92ZXJmbG93OiB7CiAgICAgICAgICAgICBTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5n Tm9kZSYgc2Nyb2xsaW5nU3RhdGVOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVPdmVyZmxv d1Njcm9sbGluZ05vZGU+KCpjdXJyTm9kZSk7CiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3Rh dGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNj cm9sbENvbnRhaW5lckxheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUu c2V0U2Nyb2xsQ29udGFpbmVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGlu Z1N0YXRlTm9kZS5zY3JvbGxDb250YWluZXJMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Ny b2xsaW5nU3RhdGVOb2RlLnNldFNjcm9sbENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5 ZXJGb3JJRChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFp bmVyTGF5ZXIoKSB9KSk7CiAKICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFz Q2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xsZWRDb250 ZW50c0xheWVyKSkKLSAgICAgICAgICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0U2Nyb2xs ZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxpbmdTdGF0ZU5v ZGUuc2Nyb2xsZWRDb250ZW50c0xheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxpbmdT dGF0ZU5vZGUuc2V0U2Nyb2xsZWRDb250ZW50c0xheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJ RChQbGF0Zm9ybUxheWVySUQgeyBzY3JvbGxpbmdTdGF0ZU5vZGUuc2Nyb2xsZWRDb250ZW50c0xh eWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5n ZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3Jv bGxiYXJMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFZlcnRp Y2FsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9sbGluZ1N0YXRl Tm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpKTsKKyAgICAgICAgICAgICAgICBzY3JvbGxp bmdTdGF0ZU5vZGUuc2V0VmVydGljYWxTY3JvbGxiYXJMYXllcihsYXllclRyZWVIb3N0LmxheWVy Rm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xs YmFyTGF5ZXIoKSB9KSk7CiAKICAgICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFz Q2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIb3Jpem9u dGFsU2Nyb2xsYmFyTGF5ZXIpKQotICAgICAgICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5z ZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKHNjcm9s bGluZ1N0YXRlTm9kZS5ob3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIoKSkpOworICAgICAgICAgICAg ICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIobGF5ZXJU cmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5o b3Jpem9udGFsU2Nyb2xsYmFyTGF5ZXIoKSB9KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQogICAgICAgICBjYXNlIFNjcm9sbGluZ05vZGVUeXBlOjpPdmVyZmxvd1Byb3h5OgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1v dGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9SZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5SU9T Lm1tCmluZGV4IDU0NTJlYmEyNTgyNmM1YjcwM2Y0M2MzNjNmMWZiOGE0ZDQ0NDVmYjguLjU0ZTBl YWI2MzVmZjI5NTRkNGFjNmM4MmZlZTI2Y2I4NWQ0MWJlNDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvUmVtb3RlU2Nyb2xsaW5nQ29vcmRp bmF0b3JQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXll clRyZWUvaW9zL1JlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHlJT1MubW0KQEAgLTY2LDE5 ICs2NiwyMSBAQCBVSVNjcm9sbFZpZXcgKlJlbW90ZVNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHk6 OnNjcm9sbFZpZXdGb3JTY3JvbGxpbmdOb2RlSUQoV2ViQwogCiB2b2lkIFJlbW90ZVNjcm9sbGlu Z0Nvb3JkaW5hdG9yUHJveHk6OmNvbm5lY3RTdGF0ZU5vZGVMYXllcnMoU2Nyb2xsaW5nU3RhdGVU cmVlJiBzdGF0ZVRyZWUsIGNvbnN0IFJlbW90ZUxheWVyVHJlZUhvc3QmIGxheWVyVHJlZUhvc3Qp CiB7CisgICAgdXNpbmcgUGxhdGZvcm1MYXllcklEID0gR3JhcGhpY3NMYXllcjo6UGxhdGZvcm1M YXllcklEOworCiAgICAgZm9yIChhdXRvJiBjdXJyTm9kZSA6IHN0YXRlVHJlZS5ub2RlTWFwKCku dmFsdWVzKCkpIHsKICAgICAgICAgaWYgKGN1cnJOb2RlLT5oYXNDaGFuZ2VkUHJvcGVydHkoU2Ny b2xsaW5nU3RhdGVOb2RlOjpMYXllcikpCi0gICAgICAgICAgICBjdXJyTm9kZS0+c2V0TGF5ZXIo bGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKGN1cnJOb2RlLT5sYXllcigpKSk7CisgICAgICAgICAg ICBjdXJyTm9kZS0+c2V0TGF5ZXIobGF5ZXJUcmVlSG9zdC5sYXllckZvcklEKFBsYXRmb3JtTGF5 ZXJJRCB7IGN1cnJOb2RlLT5sYXllcigpIH0pKTsKICAgICAgICAgCiAgICAgICAgIHN3aXRjaCAo Y3Vyck5vZGUtPm5vZGVUeXBlKCkpIHsKICAgICAgICAgY2FzZSBTY3JvbGxpbmdOb2RlVHlwZTo6 T3ZlcmZsb3c6IHsKICAgICAgICAgICAgIFNjcm9sbGluZ1N0YXRlT3ZlcmZsb3dTY3JvbGxpbmdO b2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZU92ZXJmbG93 U2Nyb2xsaW5nTm9kZT4oKmN1cnJOb2RlKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpT Y3JvbGxDb250YWluZXJMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2Rl LnNldFNjcm9sbENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxp bmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNj cm9sbGluZ1N0YXRlTm9kZS5zZXRTY3JvbGxDb250YWluZXJMYXllcihsYXllclRyZWVIb3N0Lmxh eWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbENvbnRh aW5lckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhh c0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGVkQ29u dGVudHNMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9s bGVkQ29udGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVO b2RlLnNjcm9sbGVkQ29udGVudHNMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5n U3RhdGVOb2RlLnNldFNjcm9sbGVkQ29udGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9y SUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNM YXllcigpIH0pKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9OwogICAgICAgICBjYXNl IFNjcm9sbGluZ05vZGVUeXBlOjpNYWluRnJhbWU6CkBAIC04NiwyMCArODgsMjAgQEAgdm9pZCBS ZW1vdGVTY3JvbGxpbmdDb29yZGluYXRvclByb3h5Ojpjb25uZWN0U3RhdGVOb2RlTGF5ZXJzKFNj cm9sbGluZ1N0YXRlVHJlZSYKICAgICAgICAgICAgIFNjcm9sbGluZ1N0YXRlRnJhbWVTY3JvbGxp bmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUgPSBkb3duY2FzdDxTY3JvbGxpbmdTdGF0ZUZyYW1l U2Nyb2xsaW5nTm9kZT4oKmN1cnJOb2RlKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0 YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVTY3JvbGxpbmdOb2RlOjpT Y3JvbGxDb250YWluZXJMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2Rl LnNldFNjcm9sbENvbnRhaW5lckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJGb3JJRChzY3JvbGxp bmdTdGF0ZU5vZGUuc2Nyb2xsQ29udGFpbmVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAgIHNj cm9sbGluZ1N0YXRlTm9kZS5zZXRTY3JvbGxDb250YWluZXJMYXllcihsYXllclRyZWVIb3N0Lmxh eWVyRm9ySUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbENvbnRh aW5lckxheWVyKCkgfSkpOwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhh c0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGU6OlNjcm9sbGVkQ29u dGVudHNMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldFNjcm9s bGVkQ29udGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVO b2RlLnNjcm9sbGVkQ29udGVudHNMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5n U3RhdGVOb2RlLnNldFNjcm9sbGVkQ29udGVudHNMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9y SUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLnNjcm9sbGVkQ29udGVudHNM YXllcigpIH0pKTsKIAogICAgICAgICAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFu Z2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkNvdW50ZXJTY3Jv bGxpbmdMYXllcikpCi0gICAgICAgICAgICAgICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldENvdW50 ZXJTY3JvbGxpbmdMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVO b2RlLmNvdW50ZXJTY3JvbGxpbmdMYXllcigpKSk7CisgICAgICAgICAgICAgICAgc2Nyb2xsaW5n U3RhdGVOb2RlLnNldENvdW50ZXJTY3JvbGxpbmdMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9y SUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLmNvdW50ZXJTY3JvbGxpbmdM YXllcigpIH0pKTsKIAogICAgICAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBuZXZlciBoYXZl IGhlYWRlciBhbmQgZm9vdGVyIGxheWVycyBjb21pbmcgZnJvbSB0aGUgV2ViUHJvY2Vzcy4KICAg ICAgICAgICAgIGlmIChzY3JvbGxpbmdTdGF0ZU5vZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9s bGluZ1N0YXRlRnJhbWVTY3JvbGxpbmdOb2RlOjpIZWFkZXJMYXllcikpCi0gICAgICAgICAgICAg ICAgc2Nyb2xsaW5nU3RhdGVOb2RlLnNldEhlYWRlckxheWVyKGxheWVyVHJlZUhvc3QubGF5ZXJG b3JJRChzY3JvbGxpbmdTdGF0ZU5vZGUuaGVhZGVyTGF5ZXIoKSkpOworICAgICAgICAgICAgICAg IHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRIZWFkZXJMYXllcihsYXllclRyZWVIb3N0LmxheWVyRm9y SUQoUGxhdGZvcm1MYXllcklEIHsgc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkgfSkp OwogCiAgICAgICAgICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0 eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Rm9vdGVyTGF5ZXIpKQotICAgICAg ICAgICAgICAgIHNjcm9sbGluZ1N0YXRlTm9kZS5zZXRGb290ZXJMYXllcihsYXllclRyZWVIb3N0 LmxheWVyRm9ySUQoc2Nyb2xsaW5nU3RhdGVOb2RlLmZvb3RlckxheWVyKCkpKTsKKyAgICAgICAg ICAgICAgICBzY3JvbGxpbmdTdGF0ZU5vZGUuc2V0Rm9vdGVyTGF5ZXIobGF5ZXJUcmVlSG9zdC5s YXllckZvcklEKFBsYXRmb3JtTGF5ZXJJRCB7IHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXll cigpIH0pKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNhc2UgU2Ny b2xsaW5nTm9kZVR5cGU6Ok92ZXJmbG93UHJveHk6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGlu Z05vZGVSZW1vdGVJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRy ZWUvaW9zL1Njcm9sbGluZ1RyZWVGcmFtZVNjcm9sbGluZ05vZGVSZW1vdGVJT1MubW0KaW5kZXgg Yjg5MDY4MWU5ZTdhNTEzYmEzNDM2N2NlZjM5ODliZTNiMTlkOWNiNi4uMWJmNTYzYWY2NGZmMTNm ZTAwOGMwZmU2MGIyYmJmMjBkZmI3MjcwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2Rl UmVtb3RlSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJl ZS9pb3MvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlPUy5tbQpAQCAtNTcs MTMgKzU3LDEzIEBAIHZvaWQgU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90ZUlP Uzo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25zdCBTCiAgICAgY29uc3QgYXV0byYgc2Ny b2xsaW5nU3RhdGVOb2RlID0gZG93bmNhc3Q8U2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05v ZGU+KHN0YXRlTm9kZSk7CiAKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQ cm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6Q291bnRlclNjcm9sbGlu Z0xheWVyKSkKLSAgICAgICAgbV9jb3VudGVyU2Nyb2xsaW5nTGF5ZXIgPSBzY3JvbGxpbmdTdGF0 ZU5vZGUuY291bnRlclNjcm9sbGluZ0xheWVyKCk7CisgICAgICAgIG1fY291bnRlclNjcm9sbGlu Z0xheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9kZS5jb3VudGVy U2Nyb2xsaW5nTGF5ZXIoKSk7CiAKICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5n ZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6SGVhZGVyTGF5ZXIp KQotICAgICAgICBtX2hlYWRlckxheWVyID0gc2Nyb2xsaW5nU3RhdGVOb2RlLmhlYWRlckxheWVy KCk7CisgICAgICAgIG1faGVhZGVyTGF5ZXIgPSBzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xs aW5nU3RhdGVOb2RlLmhlYWRlckxheWVyKCkpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9k ZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3RhdGVGcmFtZVNjcm9sbGluZ05vZGU6OkZv b3RlckxheWVyKSkKLSAgICAgICAgbV9mb290ZXJMYXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5m b290ZXJMYXllcigpOworICAgICAgICBtX2Zvb3RlckxheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXll cio+KHNjcm9sbGluZ1N0YXRlTm9kZS5mb290ZXJMYXllcigpKTsKIAogICAgIGlmIChzdGF0ZU5v ZGUuaGFzQ2hhbmdlZFByb3BlcnR5KFNjcm9sbGluZ1N0YXRlU2Nyb2xsaW5nTm9kZTo6U2Nyb2xs Q29udGFpbmVyTGF5ZXIpKSB7CiAgICAgICAgIGlmIChzY3JvbGxDb250YWluZXJMYXllcigpKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9T Y3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURlbGVnYXRlSU9TLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvUmVtb3RlTGF5ZXJUcmVlL2lvcy9TY3JvbGxpbmdUcmVlU2Nyb2xsaW5nTm9kZURl bGVnYXRlSU9TLm1tCmluZGV4IDdiM2YxMWJmZDZiZDgzNzZhMmYxZmJjN2M1NjVhODdlNTM5ODcy NWMuLmU3Njg5ODM3NTgxYjlkOWI5NWJmZWEwMzc2ZTFlNDkxY2VmMzlhNDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9pb3MvU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9SZW1vdGVMYXllclRyZWUvaW9zL1Njcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2RlRGVsZWdhdGVJ T1MubW0KQEAgLTIyOCw3ICsyMjgsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVTY3JvbGxpbmdOb2Rl RGVsZWdhdGVJT1M6OnJlc2V0U2Nyb2xsVmlld0RlbGVnYXRlKCkKIHZvaWQgU2Nyb2xsaW5nVHJl ZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZUlPUzo6Y29tbWl0U3RhdGVCZWZvcmVDaGlsZHJlbihjb25z dCBTY3JvbGxpbmdTdGF0ZVNjcm9sbGluZ05vZGUmIHNjcm9sbGluZ1N0YXRlTm9kZSkKIHsKICAg ICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxpbmdTdGF0 ZVNjcm9sbGluZ05vZGU6OlNjcm9sbENvbnRhaW5lckxheWVyKSkKLSAgICAgICAgbV9zY3JvbGxM YXllciA9IHNjcm9sbGluZ1N0YXRlTm9kZS5zY3JvbGxDb250YWluZXJMYXllcigpOworICAgICAg ICBtX3Njcm9sbExheWVyID0gc3RhdGljX2Nhc3Q8Q0FMYXllcio+KHNjcm9sbGluZ1N0YXRlTm9k ZS5zY3JvbGxDb250YWluZXJMYXllcigpKTsKIH0KIAogdm9pZCBTY3JvbGxpbmdUcmVlU2Nyb2xs aW5nTm9kZURlbGVnYXRlSU9TOjpjb21taXRTdGF0ZUFmdGVyQ2hpbGRyZW4oY29uc3QgU2Nyb2xs aW5nU3RhdGVTY3JvbGxpbmdOb2RlJiBzY3JvbGxpbmdTdGF0ZU5vZGUpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVG cmFtZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv UmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlRnJhbWVTY3JvbGxpbmdOb2RlUmVtb3Rl TWFjLmNwcAppbmRleCAyMzNmZmQwMjFlNjM4YmYxODhmOGRjYWJkNzc5Yzc0NTI5NDM3Mjk3Li45 YTA0OTA1ZWU4ZjY1MmMxYWJiN2Y0MDZjYmFlMThmYjUxMGFiNTNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVGcmFt ZVNjcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1JlbW90ZUxheWVyVHJlZS9tYWMvU2Nyb2xsaW5nVHJlZUZyYW1lU2Nyb2xsaW5nTm9kZVJlbW90 ZU1hYy5jcHAKQEAgLTU2LDEwICs1NiwxMCBAQCB2b2lkIFNjcm9sbGluZ1RyZWVGcmFtZVNjcm9s bGluZ05vZGVSZW1vdGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRyZW4oY29uc3QgUwogCiAg ICAgLy8gRklYTUU6IFB1c2ggdG8gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05vZGVEZWxlZ2F0ZU1h Yz8KICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9wZXJ0eShTY3JvbGxp bmdTdGF0ZUZyYW1lU2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxiYXJMYXllcikpCi0gICAg ICAgIG1fc2Nyb2xsZXJQYWlyLT52ZXJ0aWNhbFNjcm9sbGVyKCkuc2V0SG9zdExheWVyKHNjcm9s bGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpOworICAgICAgICBtX3Njcm9s bGVyUGFpci0+dmVydGljYWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxDQUxh eWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xsYmFyTGF5ZXIoKSkpOwogCiAg ICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVydHkoU2Nyb2xsaW5nU3Rh dGVGcmFtZVNjcm9sbGluZ05vZGU6Okhvcml6b250YWxTY3JvbGxiYXJMYXllcikpCi0gICAgICAg IG1fc2Nyb2xsZXJQYWlyLT5ob3Jpem9udGFsU2Nyb2xsZXIoKS5zZXRIb3N0TGF5ZXIoc2Nyb2xs aW5nU3RhdGVOb2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigpKTsKKyAgICAgICAgbV9zY3Jv bGxlclBhaXItPmhvcml6b250YWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihzdGF0aWNfY2FzdDxD QUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigpKSk7 CiAKICAgICBtX3Njcm9sbGVyUGFpci0+dXBkYXRlVmFsdWVzKCk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1RyZWVP dmVyZmxvd1Njcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvUmVtb3RlTGF5ZXJUcmVlL21hYy9TY3JvbGxpbmdUcmVlT3ZlcmZsb3dTY3JvbGxpbmdOb2Rl UmVtb3RlTWFjLmNwcAppbmRleCBiNmNhM2NiYmE4MDgwN2FmN2I5ZjY5OWJlOWIxYjJhYTljZGMx YzMyLi5mYTZjM2RhYmViYzBmOWE0YWE2MzhlNTQyMzVkNjliYzE0MTg3MWMxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9SZW1vdGVMYXllclRyZWUvbWFjL1Njcm9sbGluZ1Ry ZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVSZW1vdGVNYWMuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1JlbW90ZUxheWVyVHJlZS9tYWMvU2Nyb2xsaW5nVHJlZU92ZXJmbG93U2Nyb2xs aW5nTm9kZVJlbW90ZU1hYy5jcHAKQEAgLTU2LDEwICs1NiwxMCBAQCB2b2lkIFNjcm9sbGluZ1Ry ZWVPdmVyZmxvd1Njcm9sbGluZ05vZGVSZW1vdGVNYWM6OmNvbW1pdFN0YXRlQmVmb3JlQ2hpbGRy ZW4oY29ucwogCiAgICAgLy8gRklYTUU6IFB1c2ggdG8gU2Nyb2xsaW5nVHJlZVNjcm9sbGluZ05v ZGVEZWxlZ2F0ZU1hYz8KICAgICBpZiAoc2Nyb2xsaW5nU3RhdGVOb2RlLmhhc0NoYW5nZWRQcm9w ZXJ0eShTY3JvbGxpbmdTdGF0ZU92ZXJmbG93U2Nyb2xsaW5nTm9kZTo6VmVydGljYWxTY3JvbGxi YXJMYXllcikpCi0gICAgICAgIG1fc2Nyb2xsZXJQYWlyLT52ZXJ0aWNhbFNjcm9sbGVyKCkuc2V0 SG9zdExheWVyKHNjcm9sbGluZ1N0YXRlTm9kZS52ZXJ0aWNhbFNjcm9sbGJhckxheWVyKCkpOwor ICAgICAgICBtX3Njcm9sbGVyUGFpci0+dmVydGljYWxTY3JvbGxlcigpLnNldEhvc3RMYXllcihz dGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLnZlcnRpY2FsU2Nyb2xsYmFy TGF5ZXIoKSkpOwogCiAgICAgaWYgKHNjcm9sbGluZ1N0YXRlTm9kZS5oYXNDaGFuZ2VkUHJvcGVy dHkoU2Nyb2xsaW5nU3RhdGVPdmVyZmxvd1Njcm9sbGluZ05vZGU6Okhvcml6b250YWxTY3JvbGxi YXJMYXllcikpCi0gICAgICAgIG1fc2Nyb2xsZXJQYWlyLT5ob3Jpem9udGFsU2Nyb2xsZXIoKS5z ZXRIb3N0TGF5ZXIoc2Nyb2xsaW5nU3RhdGVOb2RlLmhvcml6b250YWxTY3JvbGxiYXJMYXllcigp KTsKKyAgICAgICAgbV9zY3JvbGxlclBhaXItPmhvcml6b250YWxTY3JvbGxlcigpLnNldEhvc3RM YXllcihzdGF0aWNfY2FzdDxDQUxheWVyKj4oc2Nyb2xsaW5nU3RhdGVOb2RlLmhvcml6b250YWxT Y3JvbGxiYXJMYXllcigpKSk7CiAKICAgICBtX3Njcm9sbGVyUGFpci0+dXBkYXRlVmFsdWVzKCk7 CiB9Cg==