237913 2022-03-15 12:20:41 -0700 Make it clearer in the loading logging when it is for the main frame or not 2022-03-15 16:18:33 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen esprehn+autocc ews-watchlist ggaren japhet kangil.han kkinnunen simon.fraser webkit-bug-importer youennf oldest_to_newest 1851429 0 cdumez 2022-03-15 12:20:41 -0700 Make it clearer in the loading logging when it is for the main frame or not. 1851430 1 454740 cdumez 2022-03-15 12:21:53 -0700 Created attachment 454740 Patch 1851484 2 454740 achristensen 2022-03-15 13:49:46 -0700 Comment on attachment 454740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=454740&action=review > Source/WebCore/page/FrameView.cpp:147 > +#define FRAMEVIEW_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - [pageID=%" PRIu64 ", frameID=%" PRIu64 ", isFrameFrame=%d] FrameView::" fmt, this, PAGE_ID, FRAME_ID, frame().isMainFrame(), ##__VA_ARGS__) isFrameFrame 1851486 3 cdumez 2022-03-15 13:51:31 -0700 (In reply to Alex Christensen from comment #2) > Comment on attachment 454740 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=454740&action=review > > > Source/WebCore/page/FrameView.cpp:147 > > +#define FRAMEVIEW_RELEASE_LOG(channel, fmt, ...) RELEASE_LOG(channel, "%p - [pageID=%" PRIu64 ", frameID=%" PRIu64 ", isFrameFrame=%d] FrameView::" fmt, this, PAGE_ID, FRAME_ID, frame().isMainFrame(), ##__VA_ARGS__) > > isFrameFrame LOL, oops. thanks for catching. 1851487 4 454754 cdumez 2022-03-15 13:51:42 -0700 Created attachment 454754 Patch 1851559 5 ews-feeder 2022-03-15 16:17:12 -0700 Committed r291320 (248459@main): <https://commits.webkit.org/248459@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454754. 1851562 6 webkit-bug-importer 2022-03-15 16:18:33 -0700 <rdar://problem/90336857> 454740 2022-03-15 12:21:53 -0700 2022-03-15 13:51:39 -0700 Patch bug-237913-20220315122152.patch text/plain 21838 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTg0ZDVmNzQwYzc3Njc5 MGRlMjRmM2ExNTg1ZGNmNjFiZDBkMTRhYS4uYjYyOGZjYmM1YTA5ZjQ5Mjg2MzljZjFkNmNmZjI2 YzJmMGQ1Yzg1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpdCBjbGVhcmVyIGlu IHRoZSBsb2FkaW5nIGxvZ2dpbmcgd2hlbiBpdCBpcyBmb3IgdGhlIG1haW4gZnJhbWUgb3Igbm90 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc5MTMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGRvbS9E b2N1bWVudC5jcHA6CisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAg ICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKwogMjAyMi0wMy0xNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIFN0b3AgdXNpbmcgRFlMRF9JTlRFUlBPU0UKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOGE4 N2U1YzA2MDgwMjJhMGVjOTI3NTY2YTc2N2IwNjZlM2M2YzI0Mi4uNTZjOTQyZmNjNmJkZDQ5MjFk MTYwNGJmNmEyZWRkNWRhZmNhYTYzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAyMi0w My0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgorCisgICAgICAgIE1ha2UgaXQg Y2xlYXJlciBpbiB0aGUgbG9hZGluZyBsb2dnaW5nIHdoZW4gaXQgaXMgZm9yIHRoZSBtYWluIGZy YW1lIG9yIG5vdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM3OTEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFn ZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbik6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0 Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lU2hhcmVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMb2Fk Rm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3Vt ZW50TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGaW5p c2hMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZhaWxM b2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFNhbWVEb2N1 bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKToKKwogMjAyMi0wMy0xNSAg UGVyIEFybmUgVm9sbGFuICA8cHZvbGxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW21hY09TXVtX UF0gQWRkIHJlcXVpcmVkIHN5c2NhbGwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDBmYTcx OGU2YzBlOTA0ZTEwY2YwY2E1MzQ1MWQ4NGYwZjZhY2ZiNmUuLmUwOWRmNDdlZDJmYjgyN2JiZDA1 NmVmYjEyMGRiMjY4ZjNjMmRhZjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtMzU1LDgg KzM1NSw4IEBACiAjaW5jbHVkZSAiSFRNTFZpZGVvRWxlbWVudC5oIgogI2VuZGlmCiAKLSNkZWZp bmUgRE9DVU1FTlRfUkVMRUFTRV9MT0coY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HKGNo YW5uZWwsICIlcCAtIFtwYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1h aW49JWRdIERvY3VtZW50OjoiIGZtdCwgdGhpcywgdmFsdWVPckRlZmF1bHQocGFnZUlEKCkpLnRv VUludDY0KCksIHZhbHVlT3JEZWZhdWx0KGZyYW1lSUQoKSkudG9VSW50NjQoKSwgdGhpcyA9PSAm dG9wRG9jdW1lbnQoKSwgIyNfX1ZBX0FSR1NfXykKLSNkZWZpbmUgRE9DVU1FTlRfUkVMRUFTRV9M T0dfRVJST1IoY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsICIl cCAtIFtwYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1haW49JWRdIERv Y3VtZW50OjoiIGZtdCwgdGhpcywgdmFsdWVPckRlZmF1bHQocGFnZUlEKCkpLnRvVUludDY0KCks IHZhbHVlT3JEZWZhdWx0KGZyYW1lSUQoKSkudG9VSW50NjQoKSwgdGhpcyA9PSAmdG9wRG9jdW1l bnQoKSwgIyNfX1ZBX0FSR1NfXykKKyNkZWZpbmUgRE9DVU1FTlRfUkVMRUFTRV9MT0coY2hhbm5l bCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFtwYWdlSUQ9JSIgUFJJdTY0 ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlzRnJhbWVGcmFtZT0lZF0gRG9jdW1lbnQ6OiIgZm10 LCB0aGlzLCB2YWx1ZU9yRGVmYXVsdChwYWdlSUQoKSkudG9VSW50NjQoKSwgdmFsdWVPckRlZmF1 bHQoZnJhbWVJRCgpKS50b1VJbnQ2NCgpLCB0aGlzID09ICZ0b3BEb2N1bWVudCgpLCAjI19fVkFf QVJHU19fKQorI2RlZmluZSBET0NVTUVOVF9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQs IC4uLikgUkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQg IiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNGcmFtZUZyYW1lPSVkXSBEb2N1bWVudDo6IiBmbXQs IHRoaXMsIHZhbHVlT3JEZWZhdWx0KHBhZ2VJRCgpKS50b1VJbnQ2NCgpLCB2YWx1ZU9yRGVmYXVs dChmcmFtZUlEKCkpLnRvVUludDY0KCksIHRoaXMgPT0gJnRvcERvY3VtZW50KCksICMjX19WQV9B UkdTX18pCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1 bWVudExvYWRlci5jcHAKaW5kZXggZjE4ZGI4Njk1YjM5N2MxYjJhM2JkMzAzMTExZGViOWU1NWU0 OTQ0Mi4uNDlhNzNlODdjZTllMjU2NWZjODQ2YTFiYjFiZWVlYjE4NjBlMGQ4ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCkBAIC0xMzAsNyArMTMwLDcgQEAKICNk ZWZpbmUgUEFHRV9JRCAoKG1fZnJhbWUgPyB2YWx1ZU9yRGVmYXVsdChtX2ZyYW1lLT5wYWdlSUQo KSkgOiBQYWdlSWRlbnRpZmllcigpKS50b1VJbnQ2NCgpKQogI2RlZmluZSBGUkFNRV9JRCAoKG1f ZnJhbWUgPyB2YWx1ZU9yRGVmYXVsdChtX2ZyYW1lLT5mcmFtZUlEKCkpIDogRnJhbWVJZGVudGlm aWVyKCkpLnRvVUludDY0KCkpCiAjZGVmaW5lIElTX01BSU5fRlJBTUUgKG1fZnJhbWUgPyBtX2Zy YW1lLT5pc01haW5GcmFtZSgpIDogZmFsc2UpCi0jZGVmaW5lIERPQ1VNRU5UTE9BREVSX1JFTEVB U0VfTE9HKGZtdCwgLi4uKSBSRUxFQVNFX0xPRyhOZXR3b3JrLCAiJXAgLSBbcGFnZUlEPSUiIFBS SXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWluPSVkXSBEb2N1bWVudExvYWRlcjo6IiBm bXQsIHRoaXMsIFBBR0VfSUQsIEZSQU1FX0lELCBJU19NQUlOX0ZSQU1FLCAjI19fVkFfQVJHU19f KQorI2RlZmluZSBET0NVTUVOVExPQURFUl9SRUxFQVNFX0xPRyhmbXQsIC4uLikgUkVMRUFTRV9M T0coTmV0d29yaywgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQg IiwgaXNGcmFtZUZyYW1lPSVkXSBEb2N1bWVudExvYWRlcjo6IiBmbXQsIHRoaXMsIFBBR0VfSUQs IEZSQU1FX0lELCBJU19NQUlOX0ZSQU1FLCAjI19fVkFfQVJHU19fKQogCiAjaWYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykKICNpbmNsdWRlIDxXZWJLaXRBZGRpdGlvbnMvRG9jdW1lbnRMb2FkZXJB ZGRpdGlvbnMuY3BwPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggZjhh YjQ1ZGU5YWYzZWUwYzAzNDY0Y2YzYzk4OGE4ODhhNGY0YWQ4NS4uNDk2ZjIzZjlmMDdjZWYxMjI5 N2IxM2YzNWE3NzQ5N2MyNWU1Y2I1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIu Y3BwCkBAIC0xNTUsOCArMTU1LDggQEAKIAogI2RlZmluZSBQQUdFX0lEICh2YWx1ZU9yRGVmYXVs dChwYWdlSUQoKSkudG9VSW50NjQoKSkKICNkZWZpbmUgRlJBTUVfSUQgKHZhbHVlT3JEZWZhdWx0 KGZyYW1lSUQoKSkudG9VSW50NjQoKSkKLSNkZWZpbmUgRlJBTUVMT0FERVJfUkVMRUFTRV9MT0co Y2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFtwYWdlSUQ9JSIg UFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1haW49JWRdIEZyYW1lTG9hZGVyOjoiIGZt dCwgdGhpcywgUEFHRV9JRCwgRlJBTUVfSUQsIG1fZnJhbWUuaXNNYWluRnJhbWUoKSwgIyNfX1ZB X0FSR1NfXykKLSNkZWZpbmUgRlJBTUVMT0FERVJfUkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwg Zm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsICIlcCAtIFtwYWdlSUQ9JSIgUFJJ dTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1haW49JWRdIEZyYW1lTG9hZGVyOjoiIGZtdCwg dGhpcywgUEFHRV9JRCwgRlJBTUVfSUQsIG1fZnJhbWUuaXNNYWluRnJhbWUoKSwgIyNfX1ZBX0FS R1NfXykKKyNkZWZpbmUgRlJBTUVMT0FERVJfUkVMRUFTRV9MT0coY2hhbm5lbCwgZm10LCAuLi4p IFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFtwYWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9 JSIgUFJJdTY0ICIsIGlzRnJhbWVGcmFtZT0lZF0gRnJhbWVMb2FkZXI6OiIgZm10LCB0aGlzLCBQ QUdFX0lELCBGUkFNRV9JRCwgbV9mcmFtZS5pc01haW5GcmFtZSgpLCAjI19fVkFfQVJHU19fKQor I2RlZmluZSBGUkFNRUxPQURFUl9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQsIC4uLikg UkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQgIiwgZnJh bWVJRD0lIiBQUkl1NjQgIiwgaXNGcmFtZUZyYW1lPSVkXSBGcmFtZUxvYWRlcjo6IiBmbXQsIHRo aXMsIFBBR0VfSUQsIEZSQU1FX0lELCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksICMjX19WQV9BUkdT X18pCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCmlu ZGV4IGI1ODhmNmZhNGExMWQ3NzBjM2M4NDk5OTY3MmQ3ZDdlZmY0MzJjNGYuLjc1MDlhMTI2ODRl MTY5MmY5MDkxNGNlYjk5Nzk3ZjFhODJmNjEyNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5j cHAKQEAgLTE0NCw3ICsxNDQsNyBAQAogCiAjZGVmaW5lIFBBR0VfSUQgdmFsdWVPckRlZmF1bHQo ZnJhbWUoKS5wYWdlSUQoKSkudG9VSW50NjQoKQogI2RlZmluZSBGUkFNRV9JRCB2YWx1ZU9yRGVm YXVsdChmcmFtZSgpLmZyYW1lSUQoKSkudG9VSW50NjQoKQotI2RlZmluZSBGUkFNRVZJRVdfUkVM RUFTRV9MT0coY2hhbm5lbCwgZm10LCAuLi4pIFJFTEVBU0VfTE9HKGNoYW5uZWwsICIlcCAtIFtw YWdlSUQ9JSIgUFJJdTY0ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1haW49JWRdIEZyYW1lVmll dzo6IiBmbXQsIHRoaXMsIFBBR0VfSUQsIEZSQU1FX0lELCBmcmFtZSgpLmlzTWFpbkZyYW1lKCks ICMjX19WQV9BUkdTX18pCisjZGVmaW5lIEZSQU1FVklFV19SRUxFQVNFX0xPRyhjaGFubmVsLCBm bXQsIC4uLikgUkVMRUFTRV9MT0coY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQgIiwg ZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNGcmFtZUZyYW1lPSVkXSBGcmFtZVZpZXc6OiIgZm10LCB0 aGlzLCBQQUdFX0lELCBGUkFNRV9JRCwgZnJhbWUoKS5pc01haW5GcmFtZSgpLCAjI19fVkFfQVJH U19fKQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IGEyN2ZkNDMzYzZlYWQzNWE5MGVlOWNmM2NiMGIwNmZmYjI1YjI3 ZTQuLjZmZDEzMmQ3MTczZjViOGM1ODUwZjQxOWU0ZmJhNWUxNzg0NmIzOGUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMzQyNCw3ICszNDI0LDcgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmNsZWFyU2VydmljZVdvcmtlckVudGl0bGVtZW50T3ZlcnJpZGUoQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgKIAogdm9pZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkTmF2aWdh dGlvblBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24sIEFQSTo6TmF2aWdh dGlvbiogbmF2aWdhdGlvbiwgUmVmPEFQSTo6TmF2aWdhdGlvbkFjdGlvbj4mJiBuYXZpZ2F0aW9u QWN0aW9uLCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQsIFdlYkZyYW1lUHJveHkmIGZyYW1lLCBjb25zdCBGcmFtZUluZm9EYXRhJiBmcmFt ZUluZm8sIFJlZlB0cjxBUEk6OldlYnNpdGVQb2xpY2llcz4mJiBwb2xpY2llcywgUmVmPFBvbGlj eURlY2lzaW9uU2VuZGVyPiYmIHNlbmRlcikKIHsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9M T0coTG9hZGluZywgInJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uOiBmcmFtZUlEPSVs bHUsIG5hdmlnYXRpb25JRD0lbGx1LCBwb2xpY3lBY3Rpb249JXUiLCBmcmFtZS5mcmFtZUlEKCku dG9VSW50NjQoKSwgbmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwg KHVuc2lnbmVkKXBvbGljeUFjdGlvbik7CisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExv YWRpbmcsICJyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbjogZnJhbWVJRD0lbGx1LCBp c01haW5GcmFtZT0lZCwgbmF2aWdhdGlvbklEPSVsbHUsIHBvbGljeUFjdGlvbj0ldSIsIGZyYW1l LmZyYW1lSUQoKS50b1VJbnQ2NCgpLCBmcmFtZS5pc01haW5GcmFtZSgpLCBuYXZpZ2F0aW9uID8g bmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCAodW5zaWduZWQpcG9saWN5QWN0aW9uKTsK IAogICAgIFJlZjxXZWJzaXRlRGF0YVN0b3JlPiB3ZWJzaXRlRGF0YVN0b3JlID0gbV93ZWJzaXRl RGF0YVN0b3JlLmNvcHlSZWYoKTsKICAgICBpZiAocG9saWNpZXMpIHsKQEAgLTQ2NzUsNyArNDY3 NSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1l U2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYKICAgICAgICAgbmF2aWdhdGlvbiA9IG5hdmln YXRpb25TdGF0ZSgpLm5hdmlnYXRpb24obmF2aWdhdGlvbklEKTsKIAogICAgIExPRyhMb2FkaW5n LCAiV2ViUGFnZVByb3h5ICUiIFBSSXU2NCAiIGluIHByb2Nlc3MgcGlkICVpIGRpZFN0YXJ0UHJv dmlzaW9uYWxMb2FkRm9yRnJhbWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklE ICUiIFBSSXU2NCAiLCB1cmwgJXMiLCBtX2lkZW50aWZpZXIudG9VSW50NjQoKSwgcHJvY2Vzcy0+ cHJvY2Vzc0lkZW50aWZpZXIoKSwgZnJhbWVJRC50b1VJbnQ2NCgpLCBuYXZpZ2F0aW9uSUQsIHVy bC5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0co TG9hZGluZywgImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJ dTY0LCBmcmFtZUlELnRvVUludDY0KCkpOworICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhM b2FkaW5nLCAiZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1 NjQgIiwgaXNNYWluRnJhbWU9JWQiLCBmcmFtZUlELnRvVUludDY0KCksIGZyYW1lLT5pc01haW5G cmFtZSgpKTsKIAogICAgIGF1dG8gdHJhbnNhY3Rpb24gPSBtX3BhZ2VMb2FkU3RhdGUudHJhbnNh Y3Rpb24oKTsKICAgICBtX3BhZ2VMb2FkU3RhdGUuY2xlYXJQZW5kaW5nQVBJUmVxdWVzdCh0cmFu c2FjdGlvbik7CkBAIC00NzM3LDcgKzQ3MzcsNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoRnJhbWVJZGVudAog dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFs TG9hZEZvckZyYW1lU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgRnJhbWVJ ZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgUmVzb3VyY2VSZXF1ZXN0 JiYgcmVxdWVzdCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIExPRyhMb2FkaW5n LCAiV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExv YWRGb3JGcmFtZSB0byBmcmFtZUlEICUiIFBSSXU2NCAiLCBuYXZpZ2F0aW9uSUQgJSIgUFJJdTY0 ICIsIHVybCAlcyIsIGZyYW1lSUQudG9VSW50NjQoKSwgbmF2aWdhdGlvbklELCByZXF1ZXN0LnVy bCgpLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwotICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xP RyhMb2FkaW5nLCAiZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9y RnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0LCBmcmFtZUlELnRvVUludDY0KCkpOwogCiAgICAgUGFn ZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIApAQCAtNDc0NSw2ICs0 NzQ0LDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjwKICAgICBNRVNTQUdFX0NIRUNLKHByb2Nl c3MsIGZyYW1lKTsKICAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCByZXF1ZXN0LnVybCgp KTsKIAorICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkUmVjZWl2ZVNl cnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0 ICIsIGlzTWFpbkZyYW1lPSVkIiwgZnJhbWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJh bWUoKSk7CisKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZp Z2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNv bWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgYmFjay9mb3J3YXJkIGNhY2hlLgogICAgIFJlZlB0 cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uSUQgPyBuYXZpZ2F0aW9u U3RhdGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCkgOiBudWxscHRyOwogICAgIGlmIChuYXZp Z2F0aW9uKQpAQCAtNDc2NiwyNiArNDc2NywyNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQoUmVmPAog CiB2b2lkIFdlYlBhZ2VQcm94eTo6d2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lKEZy YW1lSWRlbnRpZmllciBmcmFtZUlELCBjb25zdCBTdHJpbmcmIHVybCwgZG91YmxlIGRlbGF5LCBX ZWJDb3JlOjpMb2NrQmFja0ZvcndhcmRMaXN0KQogewotICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNF X0xPRyhMb2FkaW5nLCAid2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lOiBmcmFtZUlE PSUiIFBSSXU2NCwgZnJhbWVJRC50b1VJbnQ2NCgpKTsKLQogICAgIFBhZ2VDbGllbnRQcm90ZWN0 b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9 IG1fcHJvY2Vzcy0+d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nl c3MsIGZyYW1lKTsKIAorICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAid2ls bFBlcmZvcm1DbGllbnRSZWRpcmVjdEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01h aW5GcmFtZT0lZCIsIGZyYW1lSUQudG9VSW50NjQoKSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOwor CiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQogICAgICAgICBtX25hdmlnYXRpb25DbGll bnQtPndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3QoKnRoaXMsIHVybCwgZGVsYXkpOwogfQogCiB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RGb3JGcmFtZShGcmFtZUlk ZW50aWZpZXIgZnJhbWVJRCkKIHsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGlu ZywgImRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0LCBm cmFtZUlELnRvVUludDY0KCkpOwotCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3Io cGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53 ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2VzcywgZnJhbWUpOwog CisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkaWRDYW5jZWxDbGllbnRS ZWRpcmVjdEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01haW5GcmFtZT0lZCIsIGZy YW1lSUQudG9VSW50NjQoKSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOworCiAgICAgaWYgKGZyYW1l LT5pc01haW5GcmFtZSgpKQogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZENhbmNlbENs aWVudFJlZGlyZWN0KCp0aGlzKTsKIH0KQEAgLTQ4MzAsNyArNDgzMSw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZy YW1lSUQsIEZyYW1lCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lU2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgV2ViRnJhbWVQcm94 eSYgZnJhbWUsIEZyYW1lSW5mb0RhdGEmJiBmcmFtZUluZm8sIFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYmIHJlcXVlc3QsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBwcm92 aXNpb25hbFVSTCwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IsIFdpbGxDb250aW51ZUxvYWRp bmcgd2lsbENvbnRpbnVlTG9hZGluZywgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAg IExPRyhMb2FkaW5nLCAiKExvYWRpbmcpIFdlYlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBpbiB3ZWIg cHJvY2VzcyBwaWQgJWkgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lIHRvIHByb3Zpc2lv bmFsVVJMICVzIiwgbV9pZGVudGlmaWVyLnRvVUludDY0KCksIHByb2Nlc3MtPnByb2Nlc3NJZGVu dGlmaWVyKCksIHByb3Zpc2lvbmFsVVJMLnV0ZjgoKS5kYXRhKCkpOwotICAgIFdFQlBBR0VQUk9Y WV9SRUxFQVNFX0xPR19FUlJPUihQcm9jZXNzLCAiZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZy YW1lOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBkb21haW49JXMsIGNvZGU9JWQsIGlzTWFpbkZyYW1l PSVkIiwgZnJhbWUuZnJhbWVJRCgpLnRvVUludDY0KCksIGVycm9yLmRvbWFpbigpLnV0ZjgoKS5k YXRhKCksIGVycm9yLmVycm9yQ29kZSgpLCBmcmFtZS5pc01haW5GcmFtZSgpKTsKKyAgICBXRUJQ QUdFUFJPWFlfUkVMRUFTRV9MT0dfRVJST1IoUHJvY2VzcywgImRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9JWQsIGRvbWFpbj0l cywgY29kZT0lZCwgaXNNYWluRnJhbWU9JWQiLCBmcmFtZS5mcmFtZUlEKCkudG9VSW50NjQoKSwg ZnJhbWUuaXNNYWluRnJhbWUoKSwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3Iu ZXJyb3JDb2RlKCksIGZyYW1lLmlzTWFpbkZyYW1lKCkpOwogCiAgICAgUGFnZUNsaWVudFByb3Rl Y3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIApAQCAtNDkxOSwxMyArNDkyMCwxNCBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBm cmFtZUlELCBGcmFtZUluZm9EYXRhJgogewogICAgIExPRyhMb2FkaW5nLCAiKExvYWRpbmcpIFdl YlBhZ2VQcm94eSAlIiBQUkl1NjQgIiBkaWRDb21taXRMb2FkRm9yRnJhbWUgaW4gbmF2aWdhdGlv biAlIiBQUkl1NjQsIG1faWRlbnRpZmllci50b1VJbnQ2NCgpLCBuYXZpZ2F0aW9uSUQpOwogICAg IExPRyhCYWNrRm9yd2FyZCwgIihCYWNrL0ZvcndhcmQpIEFmdGVyIGxvYWQgY29tbWl0LCBiYWNr L2ZvcndhcmQgbGlzdCBpcyBub3c6JXMiLCBtX2JhY2tGb3J3YXJkTGlzdC0+bG9nZ2luZ1N0cmlu ZygpKTsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRpZENvbW1pdExv YWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQsIGZyYW1lSUQudG9VSW50NjQoKSk7CiAKICAg ICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2Vi RnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1F U1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CiAKKyAgICBXRUJQQUdFUFJPWFlfUkVMRUFT RV9MT0coTG9hZGluZywgImRpZENvbW1pdExvYWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQg IiwgaXNNYWluRnJhbWU9JWQiLCBmcmFtZUlELnRvVUludDY0KCksIGZyYW1lLT5pc01haW5GcmFt ZSgpKTsKKwogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVjayB0aGF0IG5hdmln YXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkgemVybyBmb3Igc29t ZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUuCiAgICAgUmVmUHRy PEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkgJiYgbmF2aWdhdGlvbklEICYmIChuYXZpZ2F0aW9uID0gbmF2aWdhdGlvblN0YXRlKCkubmF2 aWdhdGlvbihuYXZpZ2F0aW9uSUQpKSkgewpAQCAtNTA0MCwxMyArNTA0MiwxMyBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBmcmFtZUlE LCBGcmFtZUluZm9EYXRhJgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoRG9jdW1lbnRM b2FkRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewotICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNF X0xPRyhMb2FkaW5nLCAiZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIg UFJJdTY0LCBmcmFtZUlELnRvVUludDY0KCkpOwotCiAgICAgUGFnZUNsaWVudFByb3RlY3RvciBw cm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJveHkqIGZyYW1lID0gbV9w cm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NIRUNLKG1fcHJvY2Vzcywg ZnJhbWUpOwogCisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkaWRGaW5p c2hEb2N1bWVudExvYWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9 JWQiLCBmcmFtZUlELnRvVUludDY0KCksIGZyYW1lLT5pc01haW5GcmFtZSgpKTsKKwogICAgIGlm IChtX2NvbnRyb2xsZWRCeUF1dG9tYXRpb24pIHsKICAgICAgICAgaWYgKGF1dG8qIGF1dG9tYXRp b25TZXNzaW9uID0gcHJvY2VzcygpLnByb2Nlc3NQb29sKCkuYXV0b21hdGlvblNlc3Npb24oKSkK ICAgICAgICAgICAgIGF1dG9tYXRpb25TZXNzaW9uLT5kb2N1bWVudExvYWRlZEZvckZyYW1lKCpm cmFtZSk7CkBAIC01MDY4LDEzICs1MDcwLDE0IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGaW5p c2hEb2N1bWVudExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgdWludDY0CiB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBm cmFtZUlELCBGcmFtZUluZm9EYXRhJiYgZnJhbWVJbmZvLCBSZXNvdXJjZVJlcXVlc3QmJiByZXF1 ZXN0LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsK ICAgICBMT0coTG9hZGluZywgIldlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lIC0g V2ViUGFnZVByb3h5ICVwIHdpdGggbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiIGRpZEZpbmlzaExv YWQiLCB0aGlzLCBuYXZpZ2F0aW9uSUQpOwotICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhM b2FkaW5nLCAiZGlkRmluaXNoTG9hZEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCwgZnJhbWVJ RC50b1VJbnQ2NCgpKTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VD bGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJh bWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MsIGZyYW1lKTsKIAorICAg IFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkRmluaXNoTG9hZEZvckZyYW1l OiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01haW5GcmFtZT0lZCIsIGZyYW1lSUQudG9VSW50NjQo KSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOworCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNz YWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1 cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIGJhY2svZm9yd2Fy ZCBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlm IChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQgJiYgbmF2aWdhdGlvblN0YXRl KCkuaGFzTmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpKQpAQCAtNTEyMiwxMyArNTEyNSwxMyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBm cmFtZUlELCBGcmFtZUluZm9EYXRhJgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbExvYWRG b3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgRnJhbWVJbmZvRGF0YSYmIGZyYW1lSW5m bywgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgdWludDY0X3QgbmF2aWdhdGlvbklELCBjb25z dCBSZXNvdXJjZUVycm9yJiBlcnJvciwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewotICAg IFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPR19FUlJPUihMb2FkaW5nLCAiZGlkRmFpbExvYWRGb3JG cmFtZTogZnJhbWVJRD0lIiBQUkl1NjQgIiwgZG9tYWluPSVzLCBjb2RlPSVkIiwgZnJhbWVJRC50 b1VJbnQ2NCgpLCBlcnJvci5kb21haW4oKS51dGY4KCkuZGF0YSgpLCBlcnJvci5lcnJvckNvZGUo KSk7Ci0KICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwog CiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQp OwogICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CiAKKyAgICBXRUJQQUdFUFJP WFlfUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgImRpZEZhaWxMb2FkRm9yRnJhbWU6IGZyYW1l SUQ9JSIgUFJJdTY0ICIsIGlzTWFpbkZyYW1lPSVkLCBkb21haW49JXMsIGNvZGU9JWQiLCBmcmFt ZUlELnRvVUludDY0KCksIGZyYW1lLT5pc01haW5GcmFtZSgpLCBlcnJvci5kb21haW4oKS51dGY4 KCkuZGF0YSgpLCBlcnJvci5lcnJvckNvZGUoKSk7CisKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9uSUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0 J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2aWdhdGlvbnMgdGhyb3VnaCB0aGUgYmFjay9m b3J3YXJkIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CiAg ICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5hdmlnYXRpb25JRCkKQEAgLTUxNjksMTQg KzUxNzIsMTQgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUoRnJhbWVJ ZGVudGlmaWVyIGZyYW1lSUQsIEZyYW1lSW5mb0RhdGEmJgogCiB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIHVpbnQzMl90IG9wYXF1ZVNhbWVEb2N1bWVudE5hdmln YXRpb25UeXBlLCBVUkwmJiB1cmwsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBX RUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRpZFNhbWVEb2N1bWVudE5hdmlnYXRp b25Gb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQsIGZyYW1lSUQudG9VSW50NjQoKSk7Ci0KICAg ICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2Vi RnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1F U1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CiAgICAgTUVTU0FHRV9DSEVDS19VUkwobV9w cm9jZXNzLCB1cmwpOwogCisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJk aWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlz TWFpbkZyYW1lPSVkIiwgZnJhbWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSk7 CisKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9u SUQgaXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2 aWdhdGlvbnMgdGhyb3VnaCB0aGUgYmFjay9mb3J3YXJkIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6 Ok5hdmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYm IG5hdmlnYXRpb25JRCkKQEAgLTUzNzcsNyArNTM4MCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpk ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJv Y2VzCiAgICAgTmF2aWdhdGlvbkFjdGlvbkRhdGEmJiBuYXZpZ2F0aW9uQWN0aW9uRGF0YSwgRnJh bWVJbmZvRGF0YSYmIG9yaWdpbmF0aW5nRnJhbWVJbmZvRGF0YSwgc3RkOjpvcHRpb25hbDxXZWJQ YWdlUHJveHlJZGVudGlmaWVyPiBvcmlnaW5hdGluZ1BhZ2VJRCwgY29uc3QgV2ViQ29yZTo6UmVz b3VyY2VSZXF1ZXN0JiBvcmlnaW5hbFJlcXVlc3QsIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYm IHJlcXVlc3QsCiAgICAgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYmIHJlcXVlc3RCb2R5LCBXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlJiYgcmVkaXJlY3RSZXNwb25zZSwgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhLCBSZWY8UG9saWN5RGVjaXNpb25TZW5kZXI+JiYgc2VuZGVyKQogewotICAgIFdF QlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbjogZnJhbWVJRD0lbGx1LCBuYXZpZ2F0aW9uSUQ9JWxsdSIsIGZyYW1lLmZyYW1lSUQo KS50b1VJbnQ2NCgpLCBuYXZpZ2F0aW9uSUQpOworICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xP RyhMb2FkaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjogZnJhbWVJRD0lbGx1 LCBpc01haW5GcmFtZT0lZCwgbmF2aWdhdGlvbklEPSVsbHUiLCBmcmFtZS5mcmFtZUlEKCkudG9V SW50NjQoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbmF2aWdhdGlvbklEKTsKIAogICAgIExPRyhM b2FkaW5nLCAiV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uIC0g T3JpZ2luYWwgVVJMICVzLCBjdXJyZW50IHRhcmdldCBVUkwgJXMiLCBvcmlnaW5hbFJlcXVlc3Qu dXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS51dGY4 KCkuZGF0YSgpKTsKIApAQCAtNTQ4OCw3ICs1NDkxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQcm94eT4mJiBwcm9j ZXMKICNlbmRpZgogCiAgICAgUmVmIGxpc3RlbmVyID0gZnJhbWUuc2V0VXBQb2xpY3lMaXN0ZW5l clByb3h5KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gUmVmIHsgKnRoaXMgfSwgZnJhbWUgPSBSZWYg eyBmcmFtZSB9LCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIG5hdmlnYXRpb24sIG5hdmlnYXRp b25BY3Rpb24sIGZyYW1lSW5mbywgdXNlckRhdGFPYmplY3QgPSBwcm9jZXNzLT50cmFuc2Zvcm1I YW5kbGVzVG9PYmplY3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKV0gKFBvbGljeUFjdGlvbiBw b2xpY3lBY3Rpb24sIEFQSTo6V2Vic2l0ZVBvbGljaWVzKiBwb2xpY2llcywgUHJvY2Vzc1N3YXBS ZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBSZWZQdHI8U2Fm ZUJyb3dzaW5nV2FybmluZz4mJiBzYWZlQnJvd3NpbmdXYXJuaW5nLCBzdGQ6Om9wdGlvbmFsPE5h dmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluPiBpc0FwcEJvdW5kRG9tYWluKSBtdXRhYmxlIHsKLSAg ICAgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkZWNpZGVQb2xpY3lGb3JO YXZpZ2F0aW9uQWN0aW9uOiBsaXN0ZW5lciBjYWxsZWQ6IGZyYW1lSUQ9JWxsdSwgbmF2aWdhdGlv bklEPSVsbHUsIHBvbGljeUFjdGlvbj0ldSwgc2FmZUJyb3dzaW5nV2FybmluZz0lZCwgaXNBcHBC b3VuZERvbWFpbj0lZCIsIGZyYW1lLT5mcmFtZUlEKCkudG9VSW50NjQoKSwgbmF2aWdhdGlvbiA/ IG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpIDogMCwgKHVuc2lnbmVkKXBvbGljeUFjdGlvbiwg ISFzYWZlQnJvd3NpbmdXYXJuaW5nLCAhIWlzQXBwQm91bmREb21haW4pOworICAgICAgICBXRUJQ QUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25B Y3Rpb246IGxpc3RlbmVyIGNhbGxlZDogZnJhbWVJRD0lbGx1LCBpc01haW5GcmFtZT0lZCwgbmF2 aWdhdGlvbklEPSVsbHUsIHBvbGljeUFjdGlvbj0ldSwgc2FmZUJyb3dzaW5nV2FybmluZz0lZCwg aXNBcHBCb3VuZERvbWFpbj0lZCIsIGZyYW1lLT5mcmFtZUlEKCkudG9VSW50NjQoKSwgZnJhbWUt PmlzTWFpbkZyYW1lKCksIG5hdmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6 IDAsICh1bnNpZ25lZClwb2xpY3lBY3Rpb24sICEhc2FmZUJyb3dzaW5nV2FybmluZywgISFpc0Fw cEJvdW5kRG9tYWluKTsKIAogICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyID0gW3RoaXMs IHByb3RlY3RlZFRoaXMsIGZyYW1lLCBmcmFtZUluZm8sIHNlbmRlciA9IFdURk1vdmUoc2VuZGVy KSwgbmF2aWdhdGlvbiwgbmF2aWdhdGlvbkFjdGlvbiA9IFdURk1vdmUobmF2aWdhdGlvbkFjdGlv biksIHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQsIHBvbGljaWVzID0gUmVmUHRyIHsgcG9s aWNpZXMgfV0gKFBvbGljeUFjdGlvbiBwb2xpY3lBY3Rpb24pIG11dGFibGUgewogICAgICAgICAg ICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKSB7CkBAIC01ODI4LDggKzU4MzEsNiBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KGNvbnN0IFN0cmluZyYgc291 cmNlVVJMU3RyaW5nLCBjb25zdAogCiB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVu dFJlZGlyZWN0U2hhcmVkKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcywgY29uc3QgU3Ry aW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZGVzdGluYXRpb25VUkxTdHJpbmcs IEZyYW1lSWRlbnRpZmllciBmcmFtZUlEKQogewotICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xP RyhMb2FkaW5nLCAiZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkOiBmcmFtZUlEPSUiIFBS SXU2NCwgZnJhbWVJRC50b1VJbnQ2NCgpKTsKLQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJv dGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKICAgICBpZiAoc291cmNlVVJMU3RyaW5nLmlzRW1wdHko KSB8fCBkZXN0aW5hdGlvblVSTFN0cmluZy5pc0VtcHR5KCkpCkBAIC01ODQxLDYgKzU4NDIsOCBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkKFJlZjxX ZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzcwogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHByb2Nlc3Ms IHNvdXJjZVVSTFN0cmluZyk7CiAgICAgTUVTU0FHRV9DSEVDS19VUkwocHJvY2VzcywgZGVzdGlu YXRpb25VUkxTdHJpbmcpOwogCisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcs ICJkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3RTaGFyZWQ6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlz TWFpbkZyYW1lPSVkIiwgZnJhbWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSk7 CisKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1lKCkpIHsKICAgICAgICAgbV9oaXN0b3J5Q2xp ZW50LT5kaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVz dGluYXRpb25VUkxTdHJpbmcpOwogICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFBlcmZv cm1DbGllbnRSZWRpcmVjdCgqdGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0 cmluZyk7Cg== 454754 2022-03-15 13:51:42 -0700 2022-03-15 16:17:14 -0700 Patch bug-237913-20220315135141.patch text/plain 21887 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjkxMzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc5M2M5NDg4ZTRiOWMx MDQ3NDM2MTM5ZTA4YzAzODQzZDhmMWNmNy4uMWJiNDIwZGNjZjU3MjZkYTc4MmJkZTBlZmM3NWFk M2RjMDEwZjNiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTE1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBpdCBjbGVhcmVyIGlu IHRoZSBsb2FkaW5nIGxvZ2dpbmcgd2hlbiBpdCBpcyBmb3IgdGhlIG1haW4gZnJhbWUgb3Igbm90 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzc5MTMK KworICAgICAgICBSZXZpZXdlZCBieSBBbGV4IENocmlzdGVuc2VuLgorCisgICAgICAgICogZG9t L0RvY3VtZW50LmNwcDoKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwOgorICAg ICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcu Y3BwOgorCiAyMDIyLTAzLTE1ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29t PgogCiAgICAgICAgIEFkZCBpbml0aWFsIGltcGxlbWVudGF0aW9uIG9mIEZldGNoIE1ldGFkYXRh CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nCmluZGV4IDUwMTQyMDY3NmU0NjRkZjIyOTA3NmQ5MGQwYzY5M2U3M2QyNGY5OTYuLjZl MTk0MjhhNzBmZTEzZmIwY2Y1MzBlMGJmNTljYzAwZjRkODE3YWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjUgQEAKKzIwMjItMDMtMTUgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKwor ICAgICAgICBNYWtlIGl0IGNsZWFyZXIgaW4gdGhlIGxvYWRpbmcgbG9nZ2luZyB3aGVuIGl0IGlz IGZvciB0aGUgbWFpbiBmcmFtZSBvciBub3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIzNzkxMworCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hy aXN0ZW5zZW4uCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lv bik6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExv YWRGb3JGcmFtZVNoYXJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVj ZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWVTaGFyZWQpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JG cmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkQ2FuY2VsQ2xpZW50UmVk aXJlY3RGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmFpbFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpkaWRDb21taXRMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJv eHk6OmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0U2hhcmVk KToKKwogMjAyMi0wMy0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAg ICAgIEZpeCBsb2dnaW5nIGluIEdQVVByb2Nlc3NQcm94eTo6ZGlkQ3JlYXRlQ29udGV4dEZvclZp c2liaWxpdHlQcm9wYWdhdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCAwZmE3MThl NmMwZTkwNGUxMGNmMGNhNTM0NTFkODRmMGY2YWNmYjZlLi45NThhMDg1NGNjNDhhZWUwNDgyNTQ2 ZTc3MzliNTUwNWY4YzBmMjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTM1NSw4ICsz NTUsOCBAQAogI2luY2x1ZGUgIkhUTUxWaWRlb0VsZW1lbnQuaCIKICNlbmRpZgogCi0jZGVmaW5l IERPQ1VNRU5UX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPRyhjaGFu bmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWlu PSVkXSBEb2N1bWVudDo6IiBmbXQsIHRoaXMsIHZhbHVlT3JEZWZhdWx0KHBhZ2VJRCgpKS50b1VJ bnQ2NCgpLCB2YWx1ZU9yRGVmYXVsdChmcmFtZUlEKCkpLnRvVUludDY0KCksIHRoaXMgPT0gJnRv cERvY3VtZW50KCksICMjX19WQV9BUkdTX18pCi0jZGVmaW5lIERPQ1VNRU5UX1JFTEVBU0VfTE9H X0VSUk9SKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCAiJXAg LSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWluPSVkXSBEb2N1 bWVudDo6IiBmbXQsIHRoaXMsIHZhbHVlT3JEZWZhdWx0KHBhZ2VJRCgpKS50b1VJbnQ2NCgpLCB2 YWx1ZU9yRGVmYXVsdChmcmFtZUlEKCkpLnRvVUludDY0KCksIHRoaXMgPT0gJnRvcERvY3VtZW50 KCksICMjX19WQV9BUkdTX18pCisjZGVmaW5lIERPQ1VNRU5UX1JFTEVBU0VfTE9HKGNoYW5uZWws IGZtdCwgLi4uKSBSRUxFQVNFX0xPRyhjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAi LCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01haW5GcmFtZT0lZF0gRG9jdW1lbnQ6OiIgZm10LCB0 aGlzLCB2YWx1ZU9yRGVmYXVsdChwYWdlSUQoKSkudG9VSW50NjQoKSwgdmFsdWVPckRlZmF1bHQo ZnJhbWVJRCgpKS50b1VJbnQ2NCgpLCB0aGlzID09ICZ0b3BEb2N1bWVudCgpLCAjI19fVkFfQVJH U19fKQorI2RlZmluZSBET0NVTUVOVF9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQsIC4u LikgUkVMRUFTRV9MT0dfRVJST1IoY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQgIiwg ZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9JWRdIERvY3VtZW50OjoiIGZtdCwgdGhp cywgdmFsdWVPckRlZmF1bHQocGFnZUlEKCkpLnRvVUludDY0KCksIHZhbHVlT3JEZWZhdWx0KGZy YW1lSUQoKSkudG9VSW50NjQoKSwgdGhpcyA9PSAmdG9wRG9jdW1lbnQoKSwgIyNfX1ZBX0FSR1Nf XykKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50 TG9hZGVyLmNwcAppbmRleCBmMThkYjg2OTViMzk3YzFiMmEzYmQzMDMxMTFkZWI5ZTU1ZTQ5NDQy Li4zNmM3MDkxNjc4ZmY3NjRlYTRmZTRlN2E3ZTU5MDc1NTY2YTFmMzYxIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5jcHAKQEAgLTEzMCw3ICsxMzAsNyBAQAogI2RlZmlu ZSBQQUdFX0lEICgobV9mcmFtZSA/IHZhbHVlT3JEZWZhdWx0KG1fZnJhbWUtPnBhZ2VJRCgpKSA6 IFBhZ2VJZGVudGlmaWVyKCkpLnRvVUludDY0KCkpCiAjZGVmaW5lIEZSQU1FX0lEICgobV9mcmFt ZSA/IHZhbHVlT3JEZWZhdWx0KG1fZnJhbWUtPmZyYW1lSUQoKSkgOiBGcmFtZUlkZW50aWZpZXIo KSkudG9VSW50NjQoKSkKICNkZWZpbmUgSVNfTUFJTl9GUkFNRSAobV9mcmFtZSA/IG1fZnJhbWUt PmlzTWFpbkZyYW1lKCkgOiBmYWxzZSkKLSNkZWZpbmUgRE9DVU1FTlRMT0FERVJfUkVMRUFTRV9M T0coZm10LCAuLi4pIFJFTEVBU0VfTE9HKE5ldHdvcmssICIlcCAtIFtwYWdlSUQ9JSIgUFJJdTY0 ICIsIGZyYW1lSUQ9JSIgUFJJdTY0ICIsIG1haW49JWRdIERvY3VtZW50TG9hZGVyOjoiIGZtdCwg dGhpcywgUEFHRV9JRCwgRlJBTUVfSUQsIElTX01BSU5fRlJBTUUsICMjX19WQV9BUkdTX18pCisj ZGVmaW5lIERPQ1VNRU5UTE9BREVSX1JFTEVBU0VfTE9HKGZtdCwgLi4uKSBSRUxFQVNFX0xPRyhO ZXR3b3JrLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBp c01haW5GcmFtZT0lZF0gRG9jdW1lbnRMb2FkZXI6OiIgZm10LCB0aGlzLCBQQUdFX0lELCBGUkFN RV9JRCwgSVNfTUFJTl9GUkFNRSwgIyNfX1ZBX0FSR1NfXykKIAogI2lmIFVTRShBUFBMRV9JTlRF Uk5BTF9TREspCiAjaW5jbHVkZSA8V2ViS2l0QWRkaXRpb25zL0RvY3VtZW50TG9hZGVyQWRkaXRp b25zLmNwcD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IGY4YWI0NWRl OWFmM2VlMGMwMzQ2NGNmM2M5ODhhODg4YTRmNGFkODUuLjYwZjliMGI1YmM4NDY5ZTIwNjZhNDc3 YTAzODdjOTk4ZjE5NDkyYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApA QCAtMTU1LDggKzE1NSw4IEBACiAKICNkZWZpbmUgUEFHRV9JRCAodmFsdWVPckRlZmF1bHQocGFn ZUlEKCkpLnRvVUludDY0KCkpCiAjZGVmaW5lIEZSQU1FX0lEICh2YWx1ZU9yRGVmYXVsdChmcmFt ZUlEKCkpLnRvVUludDY0KCkpCi0jZGVmaW5lIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HKGNoYW5u ZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPRyhjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2 NCAiLCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWluPSVkXSBGcmFtZUxvYWRlcjo6IiBmbXQsIHRo aXMsIFBBR0VfSUQsIEZSQU1FX0lELCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksICMjX19WQV9BUkdT X18pCi0jZGVmaW5lIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HX0VSUk9SKGNoYW5uZWwsIGZtdCwg Li4uKSBSRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAi LCBmcmFtZUlEPSUiIFBSSXU2NCAiLCBtYWluPSVkXSBGcmFtZUxvYWRlcjo6IiBmbXQsIHRoaXMs IFBBR0VfSUQsIEZSQU1FX0lELCBtX2ZyYW1lLmlzTWFpbkZyYW1lKCksICMjX19WQV9BUkdTX18p CisjZGVmaW5lIEZSQU1FTE9BREVSX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4uKSBSRUxF QVNFX0xPRyhjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlEPSUiIFBS SXU2NCAiLCBpc01haW5GcmFtZT0lZF0gRnJhbWVMb2FkZXI6OiIgZm10LCB0aGlzLCBQQUdFX0lE LCBGUkFNRV9JRCwgbV9mcmFtZS5pc01haW5GcmFtZSgpLCAjI19fVkFfQVJHU19fKQorI2RlZmlu ZSBGUkFNRUxPQURFUl9SRUxFQVNFX0xPR19FUlJPUihjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFT RV9MT0dfRVJST1IoY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0lIiBQUkl1NjQgIiwgZnJhbWVJRD0l IiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9JWRdIEZyYW1lTG9hZGVyOjoiIGZtdCwgdGhpcywgUEFH RV9JRCwgRlJBTUVfSUQsIG1fZnJhbWUuaXNNYWluRnJhbWUoKSwgIyNfX1ZBX0FSR1NfXykKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKaW5kZXggYjU4 OGY2ZmE0YTExZDc3MGMzYzg0OTk5NjcyZDdkN2VmZjQzMmM0Zi4uYzlmNWQ0OGRjYjQ2YzgyNGM4 MWUyODY2NjNhZmI3MWE0YTU1MmRiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9G cmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAt MTQ0LDcgKzE0NCw3IEBACiAKICNkZWZpbmUgUEFHRV9JRCB2YWx1ZU9yRGVmYXVsdChmcmFtZSgp LnBhZ2VJRCgpKS50b1VJbnQ2NCgpCiAjZGVmaW5lIEZSQU1FX0lEIHZhbHVlT3JEZWZhdWx0KGZy YW1lKCkuZnJhbWVJRCgpKS50b1VJbnQ2NCgpCi0jZGVmaW5lIEZSQU1FVklFV19SRUxFQVNFX0xP RyhjaGFubmVsLCBmbXQsIC4uLikgUkVMRUFTRV9MT0coY2hhbm5lbCwgIiVwIC0gW3BhZ2VJRD0l IiBQUkl1NjQgIiwgZnJhbWVJRD0lIiBQUkl1NjQgIiwgbWFpbj0lZF0gRnJhbWVWaWV3OjoiIGZt dCwgdGhpcywgUEFHRV9JRCwgRlJBTUVfSUQsIGZyYW1lKCkuaXNNYWluRnJhbWUoKSwgIyNfX1ZB X0FSR1NfXykKKyNkZWZpbmUgRlJBTUVWSUVXX1JFTEVBU0VfTE9HKGNoYW5uZWwsIGZtdCwgLi4u KSBSRUxFQVNFX0xPRyhjaGFubmVsLCAiJXAgLSBbcGFnZUlEPSUiIFBSSXU2NCAiLCBmcmFtZUlE PSUiIFBSSXU2NCAiLCBpc01haW5GcmFtZT0lZF0gRnJhbWVWaWV3OjoiIGZtdCwgdGhpcywgUEFH RV9JRCwgRlJBTUVfSUQsIGZyYW1lKCkuaXNNYWluRnJhbWUoKSwgIyNfX1ZBX0FSR1NfXykKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmNwcAppbmRleCBhMjdmZDQzM2M2ZWFkMzVhOTBlZTljZjNjYjBiMDZmZmIyNWIyN2U0Li42ZmQx MzJkNzE3M2Y1YjhjNTg1MGY0MTllNGZiYTVlMTc4NDZiMzhlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTM0MjQsNyArMzQyNCw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpjbGVhclNlcnZpY2VXb3JrZXJFbnRpdGxlbWVudE92ZXJyaWRlKENvbXBsZXRpb25I YW5kbGVyPHZvaWQoCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpyZWNlaXZlZE5hdmlnYXRpb25Qb2xp Y3lEZWNpc2lvbihQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uLCBBUEk6Ok5hdmlnYXRpb24qIG5h dmlnYXRpb24sIFJlZjxBUEk6Ok5hdmlnYXRpb25BY3Rpb24+JiYgbmF2aWdhdGlvbkFjdGlvbiwg UHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCBwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50 LCBXZWJGcmFtZVByb3h5JiBmcmFtZSwgY29uc3QgRnJhbWVJbmZvRGF0YSYgZnJhbWVJbmZvLCBS ZWZQdHI8QVBJOjpXZWJzaXRlUG9saWNpZXM+JiYgcG9saWNpZXMsIFJlZjxQb2xpY3lEZWNpc2lv blNlbmRlcj4mJiBzZW5kZXIpCiB7Ci0gICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRp bmcsICJyZWNlaXZlZE5hdmlnYXRpb25Qb2xpY3lEZWNpc2lvbjogZnJhbWVJRD0lbGx1LCBuYXZp Z2F0aW9uSUQ9JWxsdSwgcG9saWN5QWN0aW9uPSV1IiwgZnJhbWUuZnJhbWVJRCgpLnRvVUludDY0 KCksIG5hdmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsICh1bnNpZ25l ZClwb2xpY3lBY3Rpb24pOworICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAi cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb246IGZyYW1lSUQ9JWxsdSwgaXNNYWluRnJh bWU9JWQsIG5hdmlnYXRpb25JRD0lbGx1LCBwb2xpY3lBY3Rpb249JXUiLCBmcmFtZS5mcmFtZUlE KCkudG9VSW50NjQoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSwgbmF2aWdhdGlvbiA/IG5hdmlnYXRp b24tPm5hdmlnYXRpb25JRCgpIDogMCwgKHVuc2lnbmVkKXBvbGljeUFjdGlvbik7CiAKICAgICBS ZWY8V2Vic2l0ZURhdGFTdG9yZT4gd2Vic2l0ZURhdGFTdG9yZSA9IG1fd2Vic2l0ZURhdGFTdG9y ZS5jb3B5UmVmKCk7CiAgICAgaWYgKHBvbGljaWVzKSB7CkBAIC00Njc1LDcgKzQ2NzUsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZVNoYXJlZChS ZWY8V2ViUHJvY2Vzc1Byb3h5PiYmCiAgICAgICAgIG5hdmlnYXRpb24gPSBuYXZpZ2F0aW9uU3Rh dGUoKS5uYXZpZ2F0aW9uKG5hdmlnYXRpb25JRCk7CiAKICAgICBMT0coTG9hZGluZywgIldlYlBh Z2VQcm94eSAlIiBQUkl1NjQgIiBpbiBwcm9jZXNzIHBpZCAlaSBkaWRTdGFydFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lIHRvIGZyYW1lSUQgJSIgUFJJdTY0ICIsIG5hdmlnYXRpb25JRCAlIiBQUkl1 NjQgIiwgdXJsICVzIiwgbV9pZGVudGlmaWVyLnRvVUludDY0KCksIHByb2Nlc3MtPnByb2Nlc3NJ ZGVudGlmaWVyKCksIGZyYW1lSUQudG9VSW50NjQoKSwgbmF2aWdhdGlvbklELCB1cmwuc3RyaW5n KCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcs ICJkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCwgZnJh bWVJRC50b1VJbnQ2NCgpKTsKKyAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywg ImRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlz TWFpbkZyYW1lPSVkIiwgZnJhbWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSk7 CiAKICAgICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7 CiAgICAgbV9wYWdlTG9hZFN0YXRlLmNsZWFyUGVuZGluZ0FQSVJlcXVlc3QodHJhbnNhY3Rpb24p OwpAQCAtNDczNyw3ICs0NzM3LDYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2 ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKEZyYW1lSWRlbnQKIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25hbExvYWRGb3JG cmFtZVNoYXJlZChSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIEZyYW1lSWRlbnRpZmll ciBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFJlc291cmNlUmVxdWVzdCYmIHJlcXVl c3QsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKICAgICBMT0coTG9hZGluZywgIldlYlBh Z2VQcm94eTo6ZGlkUmVjZWl2ZVNlcnZlclJlZGlyZWN0Rm9yUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUgdG8gZnJhbWVJRCAlIiBQUkl1NjQgIiwgbmF2aWdhdGlvbklEICUiIFBSSXU2NCAiLCB1cmwg JXMiLCBmcmFtZUlELnRvVUludDY0KCksIG5hdmlnYXRpb25JRCwgcmVxdWVzdC51cmwoKS5zdHJp bmcoKS51dGY4KCkuZGF0YSgpKTsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGlu ZywgImRpZFJlY2VpdmVTZXJ2ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBm cmFtZUlEPSUiIFBSSXU2NCwgZnJhbWVJRC50b1VJbnQ2NCgpKTsKIAogICAgIFBhZ2VDbGllbnRQ cm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKQEAgLTQ3NDUsNiArNDc0NCw4IEBA IHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlU2VydmVyUmVkaXJlY3RGb3JQcm92aXNpb25h bExvYWRGb3JGcmFtZVNoYXJlZChSZWY8CiAgICAgTUVTU0FHRV9DSEVDSyhwcm9jZXNzLCBmcmFt ZSk7CiAgICAgTUVTU0FHRV9DSEVDS19VUkwocHJvY2VzcywgcmVxdWVzdC51cmwoKSk7CiAKKyAg ICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRpZFJlY2VpdmVTZXJ2ZXJSZWRp cmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01h aW5GcmFtZT0lZCIsIGZyYW1lSUQudG9VSW50NjQoKSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOwor CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklE IGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmln YXRpb25zIHRocm91Z2ggdGhlIGJhY2svZm9yd2FyZCBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpO YXZpZ2F0aW9uPiBuYXZpZ2F0aW9uID0gbmF2aWdhdGlvbklEID8gbmF2aWdhdGlvblN0YXRlKCku bmF2aWdhdGlvbihuYXZpZ2F0aW9uSUQpIDogbnVsbHB0cjsKICAgICBpZiAobmF2aWdhdGlvbikK QEAgLTQ3NjYsMjYgKzQ3NjcsMjYgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVTZXJ2 ZXJSZWRpcmVjdEZvclByb3Zpc2lvbmFsTG9hZEZvckZyYW1lU2hhcmVkKFJlZjwKIAogdm9pZCBX ZWJQYWdlUHJveHk6OndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZShGcmFtZUlkZW50 aWZpZXIgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGRvdWJsZSBkZWxheSwgV2ViQ29yZTo6 TG9ja0JhY2tGb3J3YXJkTGlzdCkKIHsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9h ZGluZywgIndpbGxQZXJmb3JtQ2xpZW50UmVkaXJlY3RGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1 NjQsIGZyYW1lSUQudG9VSW50NjQoKSk7Ci0KICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3Rl Y3RvcihwYWdlQ2xpZW50KCkpOwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nl c3MtPndlYkZyYW1lKGZyYW1lSUQpOwogICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFt ZSk7CiAKKyAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgIndpbGxQZXJmb3Jt Q2xpZW50UmVkaXJlY3RGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9 JWQiLCBmcmFtZUlELnRvVUludDY0KCksIGZyYW1lLT5pc01haW5GcmFtZSgpKTsKKwogICAgIGlm IChmcmFtZS0+aXNNYWluRnJhbWUoKSkKICAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT53aWxs UGVyZm9ybUNsaWVudFJlZGlyZWN0KCp0aGlzLCB1cmwsIGRlbGF5KTsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OmRpZENhbmNlbENsaWVudFJlZGlyZWN0Rm9yRnJhbWUoRnJhbWVJZGVudGlmaWVy IGZyYW1lSUQpCiB7Ci0gICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkaWRD YW5jZWxDbGllbnRSZWRpcmVjdEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCwgZnJhbWVJRC50 b1VJbnQ2NCgpKTsKLQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9yKHBhZ2VDbGll bnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+d2ViRnJhbWUo ZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MsIGZyYW1lKTsKIAorICAgIFdF QlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkQ2FuY2VsQ2xpZW50UmVkaXJlY3RG b3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9JWQiLCBmcmFtZUlELnRv VUludDY0KCksIGZyYW1lLT5pc01haW5GcmFtZSgpKTsKKwogICAgIGlmIChmcmFtZS0+aXNNYWlu RnJhbWUoKSkKICAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRDYW5jZWxDbGllbnRSZWRp cmVjdCgqdGhpcyk7CiB9CkBAIC00ODMwLDcgKzQ4MzEsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6 ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCBG cmFtZQogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZVNo YXJlZChSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIFdlYkZyYW1lUHJveHkmIGZyYW1l LCBGcmFtZUluZm9EYXRhJiYgZnJhbWVJbmZvLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiBy ZXF1ZXN0LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYgcHJvdmlzaW9uYWxV UkwsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yLCBXaWxsQ29udGludWVMb2FkaW5nIHdpbGxD b250aW51ZUxvYWRpbmcsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKICAgICBMT0coTG9h ZGluZywgIihMb2FkaW5nKSBXZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgaW4gd2ViIHByb2Nlc3Mg cGlkICVpIGRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZSB0byBwcm92aXNpb25hbFVSTCAl cyIsIG1faWRlbnRpZmllci50b1VJbnQ2NCgpLCBwcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigp LCBwcm92aXNpb25hbFVSTC51dGY4KCkuZGF0YSgpKTsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFT RV9MT0dfRVJST1IoUHJvY2VzcywgImRpZEZhaWxQcm92aXNpb25hbExvYWRGb3JGcmFtZTogZnJh bWVJRD0lIiBQUkl1NjQgIiwgZG9tYWluPSVzLCBjb2RlPSVkLCBpc01haW5GcmFtZT0lZCIsIGZy YW1lLmZyYW1lSUQoKS50b1VJbnQ2NCgpLCBlcnJvci5kb21haW4oKS51dGY4KCkuZGF0YSgpLCBl cnJvci5lcnJvckNvZGUoKSwgZnJhbWUuaXNNYWluRnJhbWUoKSk7CisgICAgV0VCUEFHRVBST1hZ X1JFTEVBU0VfTE9HX0VSUk9SKFByb2Nlc3MsICJkaWRGYWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJh bWU6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlzTWFpbkZyYW1lPSVkLCBkb21haW49JXMsIGNvZGU9 JWQsIGlzTWFpbkZyYW1lPSVkIiwgZnJhbWUuZnJhbWVJRCgpLnRvVUludDY0KCksIGZyYW1lLmlz TWFpbkZyYW1lKCksIGVycm9yLmRvbWFpbigpLnV0ZjgoKS5kYXRhKCksIGVycm9yLmVycm9yQ29k ZSgpLCBmcmFtZS5pc01haW5GcmFtZSgpKTsKIAogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJv dGVjdG9yKHBhZ2VDbGllbnQoKSk7CiAKQEAgLTQ5MTksMTMgKzQ5MjAsMTQgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwg RnJhbWVJbmZvRGF0YSYKIHsKICAgICBMT0coTG9hZGluZywgIihMb2FkaW5nKSBXZWJQYWdlUHJv eHkgJSIgUFJJdTY0ICIgZGlkQ29tbWl0TG9hZEZvckZyYW1lIGluIG5hdmlnYXRpb24gJSIgUFJJ dTY0LCBtX2lkZW50aWZpZXIudG9VSW50NjQoKSwgbmF2aWdhdGlvbklEKTsKICAgICBMT0coQmFj a0ZvcndhcmQsICIoQmFjay9Gb3J3YXJkKSBBZnRlciBsb2FkIGNvbW1pdCwgYmFjay9mb3J3YXJk IGxpc3QgaXMgbm93OiVzIiwgbV9iYWNrRm9yd2FyZExpc3QtPmxvZ2dpbmdTdHJpbmcoKSk7Ci0g ICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkaWRDb21taXRMb2FkRm9yRnJh bWU6IGZyYW1lSUQ9JSIgUFJJdTY0LCBmcmFtZUlELnRvVUludDY0KCkpOwogCiAgICAgUGFnZUNs aWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NI RUNLKG1fcHJvY2VzcywgZnJhbWUpOwogCisgICAgV0VCUEFHRVBST1hZX1JFTEVBU0VfTE9HKExv YWRpbmcsICJkaWRDb21taXRMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlzTWFp bkZyYW1lPSVkIiwgZnJhbWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSk7CisK ICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIG1lc3NhZ2UgY2hlY2sgdGhhdCBuYXZpZ2F0aW9uSUQg aXMgbm90IHplcm8gaGVyZSwgYnV0IGl0J3MgY3VycmVudGx5IHplcm8gZm9yIHNvbWUgbmF2aWdh dGlvbnMgdGhyb3VnaCB0aGUgYmFjay9mb3J3YXJkIGNhY2hlLgogICAgIFJlZlB0cjxBUEk6Ok5h dmlnYXRpb24+IG5hdmlnYXRpb247CiAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpICYmIG5h dmlnYXRpb25JRCAmJiAobmF2aWdhdGlvbiA9IG5hdmlnYXRpb25TdGF0ZSgpLm5hdmlnYXRpb24o bmF2aWdhdGlvbklEKSkpIHsKQEAgLTUwNDAsMTMgKzUwNDIsMTMgQEAgdm9pZCBXZWJQYWdlUHJv eHk6OmRpZENvbW1pdExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgRnJhbWVJ bmZvRGF0YSYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZy YW1lKEZyYW1lSWRlbnRpZmllciBmcmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0 IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9h ZGluZywgImRpZEZpbmlzaERvY3VtZW50TG9hZEZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCwg ZnJhbWVJRC50b1VJbnQ2NCgpKTsKLQogICAgIFBhZ2VDbGllbnRQcm90ZWN0b3IgcHJvdGVjdG9y KHBhZ2VDbGllbnQoKSk7CiAKICAgICBXZWJGcmFtZVByb3h5KiBmcmFtZSA9IG1fcHJvY2Vzcy0+ d2ViRnJhbWUoZnJhbWVJRCk7CiAgICAgTUVTU0FHRV9DSEVDSyhtX3Byb2Nlc3MsIGZyYW1lKTsK IAorICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWU6IGZyYW1lSUQ9JSIgUFJJdTY0ICIsIGlzTWFpbkZyYW1lPSVkIiwgZnJh bWVJRC50b1VJbnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSk7CisKICAgICBpZiAobV9jb250 cm9sbGVkQnlBdXRvbWF0aW9uKSB7CiAgICAgICAgIGlmIChhdXRvKiBhdXRvbWF0aW9uU2Vzc2lv biA9IHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmF1dG9tYXRpb25TZXNzaW9uKCkpCiAgICAgICAg ICAgICBhdXRvbWF0aW9uU2Vzc2lvbi0+ZG9jdW1lbnRMb2FkZWRGb3JGcmFtZSgqZnJhbWUpOwpA QCAtNTA2OCwxMyArNTA3MCwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmluaXNoRG9jdW1l bnRMb2FkRm9yRnJhbWUoRnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIHVpbnQ2NAogdm9pZCBXZWJQ YWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwg RnJhbWVJbmZvRGF0YSYmIGZyYW1lSW5mbywgUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgdWlu dDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7CiAgICAgTE9H KExvYWRpbmcsICJXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZSAtIFdlYlBhZ2VQ cm94eSAlcCB3aXRoIG5hdmlnYXRpb25JRCAlIiBQUkl1NjQgIiBkaWRGaW5pc2hMb2FkIiwgdGhp cywgbmF2aWdhdGlvbklEKTsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywg ImRpZEZpbmlzaExvYWRGb3JGcmFtZTogZnJhbWVJRD0lIiBQUkl1NjQsIGZyYW1lSUQudG9VSW50 NjQoKSk7CiAKICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3RvcihwYWdlQ2xpZW50KCkp OwogCiAgICAgV2ViRnJhbWVQcm94eSogZnJhbWUgPSBtX3Byb2Nlc3MtPndlYkZyYW1lKGZyYW1l SUQpOwogICAgIE1FU1NBR0VfQ0hFQ0sobV9wcm9jZXNzLCBmcmFtZSk7CiAKKyAgICBXRUJQQUdF UFJPWFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRpZEZpbmlzaExvYWRGb3JGcmFtZTogZnJhbWVJ RD0lIiBQUkl1NjQgIiwgaXNNYWluRnJhbWU9JWQiLCBmcmFtZUlELnRvVUludDY0KCksIGZyYW1l LT5pc01haW5GcmFtZSgpKTsKKwogICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbWVzc2FnZSBjaGVj ayB0aGF0IG5hdmlnYXRpb25JRCBpcyBub3QgemVybyBoZXJlLCBidXQgaXQncyBjdXJyZW50bHkg emVybyBmb3Igc29tZSBuYXZpZ2F0aW9ucyB0aHJvdWdoIHRoZSBiYWNrL2ZvcndhcmQgY2FjaGUu CiAgICAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gbmF2aWdhdGlvbjsKICAgICBpZiAoZnJhbWUt PmlzTWFpbkZyYW1lKCkgJiYgbmF2aWdhdGlvbklEICYmIG5hdmlnYXRpb25TdGF0ZSgpLmhhc05h dmlnYXRpb24obmF2aWdhdGlvbklEKSkKQEAgLTUxMjIsMTMgKzUxMjUsMTMgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwg RnJhbWVJbmZvRGF0YSYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxMb2FkRm9yRnJhbWUo RnJhbWVJZGVudGlmaWVyIGZyYW1lSUQsIEZyYW1lSW5mb0RhdGEmJiBmcmFtZUluZm8sIFJlc291 cmNlUmVxdWVzdCYmIHJlcXVlc3QsIHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgUmVzb3Vy Y2VFcnJvciYgZXJyb3IsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsKLSAgICBXRUJQQUdF UFJPWFlfUkVMRUFTRV9MT0dfRVJST1IoTG9hZGluZywgImRpZEZhaWxMb2FkRm9yRnJhbWU6IGZy YW1lSUQ9JSIgUFJJdTY0ICIsIGRvbWFpbj0lcywgY29kZT0lZCIsIGZyYW1lSUQudG9VSW50NjQo KSwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3IuZXJyb3JDb2RlKCkpOwotCiAg ICAgUGFnZUNsaWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdl YkZyYW1lUHJveHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBN RVNTQUdFX0NIRUNLKG1fcHJvY2VzcywgZnJhbWUpOwogCisgICAgV0VCUEFHRVBST1hZX1JFTEVB U0VfTE9HX0VSUk9SKExvYWRpbmcsICJkaWRGYWlsTG9hZEZvckZyYW1lOiBmcmFtZUlEPSUiIFBS SXU2NCAiLCBpc01haW5GcmFtZT0lZCwgZG9tYWluPSVzLCBjb2RlPSVkIiwgZnJhbWVJRC50b1VJ bnQ2NCgpLCBmcmFtZS0+aXNNYWluRnJhbWUoKSwgZXJyb3IuZG9tYWluKCkudXRmOCgpLmRhdGEo KSwgZXJyb3IuZXJyb3JDb2RlKCkpOworCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdl IGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5vdCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJl bnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25zIHRocm91Z2ggdGhlIGJhY2svZm9yd2FyZCBj YWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChm cmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0aW9uSUQpCkBAIC01MTY5LDE0ICs1MTcyLDE0 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRGYWlsTG9hZEZvckZyYW1lKEZyYW1lSWRlbnRpZmll ciBmcmFtZUlELCBGcmFtZUluZm9EYXRhJiYKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFNhbWVE b2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZShGcmFtZUlkZW50aWZpZXIgZnJhbWVJRCwgdWludDY0 X3QgbmF2aWdhdGlvbklELCB1aW50MzJfdCBvcGFxdWVTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlw ZSwgVVJMJiYgdXJsLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7Ci0gICAgV0VCUEFHRVBS T1hZX1JFTEVBU0VfTE9HKExvYWRpbmcsICJkaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJh bWU6IGZyYW1lSUQ9JSIgUFJJdTY0LCBmcmFtZUlELnRvVUludDY0KCkpOwotCiAgICAgUGFnZUNs aWVudFByb3RlY3RvciBwcm90ZWN0b3IocGFnZUNsaWVudCgpKTsKIAogICAgIFdlYkZyYW1lUHJv eHkqIGZyYW1lID0gbV9wcm9jZXNzLT53ZWJGcmFtZShmcmFtZUlEKTsKICAgICBNRVNTQUdFX0NI RUNLKG1fcHJvY2VzcywgZnJhbWUpOwogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKG1fcHJvY2Vzcywg dXJsKTsKIAorICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkU2FtZURv Y3VtZW50TmF2aWdhdGlvbkZvckZyYW1lOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01haW5GcmFt ZT0lZCIsIGZyYW1lSUQudG9VSW50NjQoKSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOworCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBtZXNzYWdlIGNoZWNrIHRoYXQgbmF2aWdhdGlvbklEIGlzIG5v dCB6ZXJvIGhlcmUsIGJ1dCBpdCdzIGN1cnJlbnRseSB6ZXJvIGZvciBzb21lIG5hdmlnYXRpb25z IHRocm91Z2ggdGhlIGJhY2svZm9yd2FyZCBjYWNoZS4KICAgICBSZWZQdHI8QVBJOjpOYXZpZ2F0 aW9uPiBuYXZpZ2F0aW9uOwogICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBuYXZpZ2F0 aW9uSUQpCkBAIC01Mzc3LDcgKzUzODAsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9s aWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2NlcwogICAg IE5hdmlnYXRpb25BY3Rpb25EYXRhJiYgbmF2aWdhdGlvbkFjdGlvbkRhdGEsIEZyYW1lSW5mb0Rh dGEmJiBvcmlnaW5hdGluZ0ZyYW1lSW5mb0RhdGEsIHN0ZDo6b3B0aW9uYWw8V2ViUGFnZVByb3h5 SWRlbnRpZmllcj4gb3JpZ2luYXRpbmdQYWdlSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVx dWVzdCYgb3JpZ2luYWxSZXF1ZXN0LCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0 LAogICAgIElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmJiByZXF1ZXN0Qm9keSwgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSYmIHJlZGlyZWN0UmVzcG9uc2UsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0 YSwgUmVmPFBvbGljeURlY2lzaW9uU2VuZGVyPiYmIHNlbmRlcikKIHsKLSAgICBXRUJQQUdFUFJP WFlfUkVMRUFTRV9MT0coTG9hZGluZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246 IGZyYW1lSUQ9JWxsdSwgbmF2aWdhdGlvbklEPSVsbHUiLCBmcmFtZS5mcmFtZUlEKCkudG9VSW50 NjQoKSwgbmF2aWdhdGlvbklEKTsKKyAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGlu ZywgImRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246IGZyYW1lSUQ9JWxsdSwgaXNNYWlu RnJhbWU9JWQsIG5hdmlnYXRpb25JRD0lbGx1IiwgZnJhbWUuZnJhbWVJRCgpLnRvVUludDY0KCks IGZyYW1lLmlzTWFpbkZyYW1lKCksIG5hdmlnYXRpb25JRCk7CiAKICAgICBMT0coTG9hZGluZywg IldlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiAtIE9yaWdpbmFs IFVSTCAlcywgY3VycmVudCB0YXJnZXQgVVJMICVzIiwgb3JpZ2luYWxSZXF1ZXN0LnVybCgpLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCksIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkudXRmOCgpLmRhdGEo KSk7CiAKQEAgLTU0ODgsNyArNTQ5MSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkZWNpZGVQb2xp Y3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFJlZjxXZWJQcm9jZXNzUHJveHk+JiYgcHJvY2VzCiAjZW5k aWYKIAogICAgIFJlZiBsaXN0ZW5lciA9IGZyYW1lLnNldFVwUG9saWN5TGlzdGVuZXJQcm94eShb dGhpcywgcHJvdGVjdGVkVGhpcyA9IFJlZiB7ICp0aGlzIH0sIGZyYW1lID0gUmVmIHsgZnJhbWUg fSwgc2VuZGVyID0gV1RGTW92ZShzZW5kZXIpLCBuYXZpZ2F0aW9uLCBuYXZpZ2F0aW9uQWN0aW9u LCBmcmFtZUluZm8sIHVzZXJEYXRhT2JqZWN0ID0gcHJvY2Vzcy0+dHJhbnNmb3JtSGFuZGxlc1Rv T2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCldIChQb2xpY3lBY3Rpb24gcG9saWN5QWN0 aW9uLCBBUEk6OldlYnNpdGVQb2xpY2llcyogcG9saWNpZXMsIFByb2Nlc3NTd2FwUmVxdWVzdGVk QnlDbGllbnQgcHJvY2Vzc1N3YXBSZXF1ZXN0ZWRCeUNsaWVudCwgUmVmUHRyPFNhZmVCcm93c2lu Z1dhcm5pbmc+JiYgc2FmZUJyb3dzaW5nV2FybmluZywgc3RkOjpvcHRpb25hbDxOYXZpZ2F0aW5n VG9BcHBCb3VuZERvbWFpbj4gaXNBcHBCb3VuZERvbWFpbikgbXV0YWJsZSB7Ci0gICAgICAgIFdF QlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbjogbGlzdGVuZXIgY2FsbGVkOiBmcmFtZUlEPSVsbHUsIG5hdmlnYXRpb25JRD0lbGx1 LCBwb2xpY3lBY3Rpb249JXUsIHNhZmVCcm93c2luZ1dhcm5pbmc9JWQsIGlzQXBwQm91bmREb21h aW49JWQiLCBmcmFtZS0+ZnJhbWVJRCgpLnRvVUludDY0KCksIG5hdmlnYXRpb24gPyBuYXZpZ2F0 aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsICh1bnNpZ25lZClwb2xpY3lBY3Rpb24sICEhc2FmZUJy b3dzaW5nV2FybmluZywgISFpc0FwcEJvdW5kRG9tYWluKTsKKyAgICAgICAgV0VCUEFHRVBST1hZ X1JFTEVBU0VfTE9HKExvYWRpbmcsICJkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOiBs aXN0ZW5lciBjYWxsZWQ6IGZyYW1lSUQ9JWxsdSwgaXNNYWluRnJhbWU9JWQsIG5hdmlnYXRpb25J RD0lbGx1LCBwb2xpY3lBY3Rpb249JXUsIHNhZmVCcm93c2luZ1dhcm5pbmc9JWQsIGlzQXBwQm91 bmREb21haW49JWQiLCBmcmFtZS0+ZnJhbWVJRCgpLnRvVUludDY0KCksIGZyYW1lLT5pc01haW5G cmFtZSgpLCBuYXZpZ2F0aW9uID8gbmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCkgOiAwLCAodW5z aWduZWQpcG9saWN5QWN0aW9uLCAhIXNhZmVCcm93c2luZ1dhcm5pbmcsICEhaXNBcHBCb3VuZERv bWFpbik7CiAKICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlciA9IFt0aGlzLCBwcm90ZWN0 ZWRUaGlzLCBmcmFtZSwgZnJhbWVJbmZvLCBzZW5kZXIgPSBXVEZNb3ZlKHNlbmRlciksIG5hdmln YXRpb24sIG5hdmlnYXRpb25BY3Rpb24gPSBXVEZNb3ZlKG5hdmlnYXRpb25BY3Rpb24pLCBwcm9j ZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50LCBwb2xpY2llcyA9IFJlZlB0ciB7IHBvbGljaWVzIH1d IChQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKSBtdXRhYmxlIHsKICAgICAgICAgICAgIGlmIChm cmFtZS0+aXNNYWluRnJhbWUoKSkgewpAQCAtNTgyOCw4ICs1ODMxLDYgQEAgdm9pZCBXZWJQYWdl UHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdChjb25zdCBTdHJpbmcmIHNvdXJjZVVSTFN0 cmluZywgY29uc3QKIAogdm9pZCBXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVj dFNoYXJlZChSZWY8V2ViUHJvY2Vzc1Byb3h5PiYmIHByb2Nlc3MsIGNvbnN0IFN0cmluZyYgc291 cmNlVVJMU3RyaW5nLCBjb25zdCBTdHJpbmcmIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCBGcmFtZUlk ZW50aWZpZXIgZnJhbWVJRCkKIHsKLSAgICBXRUJQQUdFUFJPWFlfUkVMRUFTRV9MT0coTG9hZGlu ZywgImRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdFNoYXJlZDogZnJhbWVJRD0lIiBQUkl1NjQsIGZy YW1lSUQudG9VSW50NjQoKSk7Ci0KICAgICBQYWdlQ2xpZW50UHJvdGVjdG9yIHByb3RlY3Rvcihw YWdlQ2xpZW50KCkpOwogCiAgICAgaWYgKHNvdXJjZVVSTFN0cmluZy5pc0VtcHR5KCkgfHwgZGVz dGluYXRpb25VUkxTdHJpbmcuaXNFbXB0eSgpKQpAQCAtNTg0MSw2ICs1ODQyLDggQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdFNoYXJlZChSZWY8V2ViUHJvY2Vz c1Byb3h5PiYmIHByb2Nlc3MKICAgICBNRVNTQUdFX0NIRUNLX1VSTChwcm9jZXNzLCBzb3VyY2VV UkxTdHJpbmcpOwogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHByb2Nlc3MsIGRlc3RpbmF0aW9uVVJM U3RyaW5nKTsKIAorICAgIFdFQlBBR0VQUk9YWV9SRUxFQVNFX0xPRyhMb2FkaW5nLCAiZGlkUGVy Zm9ybUNsaWVudFJlZGlyZWN0U2hhcmVkOiBmcmFtZUlEPSUiIFBSSXU2NCAiLCBpc01haW5GcmFt ZT0lZCIsIGZyYW1lSUQudG9VSW50NjQoKSwgZnJhbWUtPmlzTWFpbkZyYW1lKCkpOworCiAgICAg aWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKSB7CiAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlk UGVyZm9ybUNsaWVudFJlZGlyZWN0KCp0aGlzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9u VVJMU3RyaW5nKTsKICAgICAgICAgbV9uYXZpZ2F0aW9uQ2xpZW50LT5kaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcpOwo=