235510 2022-01-24 06:15:49 -0800 Cherry-pick WebRTC 235826 change 2022-01-24 13:41:31 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer youennf oldest_to_newest 1833273 0 youennf 2022-01-24 06:15:49 -0800 Cherry-pick WebRTC 235826 change 1833274 1 youennf 2022-01-24 06:16:03 -0800 <rdar://87884184> 1833276 2 449806 youennf 2022-01-24 06:20:04 -0800 Created attachment 449806 Patch 1833316 3 449806 youennf 2022-01-24 07:57:13 -0800 Comment on attachment 449806 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=449806&action=review > Source/ThirdParty/libwebrtc/Source/webrtc/modules/rtp_rtcp/source/rtp_header_extension_map.cc:1 > + /* Unnecessary change 1833348 4 449806 eric.carlson 2022-01-24 08:49:15 -0800 Comment on attachment 449806 Patch rs=me 1833417 5 449839 youennf 2022-01-24 11:51:11 -0800 Created attachment 449839 Patch for landing 1833454 6 ews-feeder 2022-01-24 13:41:27 -0800 Committed r288464 (246350@main): <https://commits.webkit.org/246350@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 449839. 449806 2022-01-24 06:20:04 -0800 2022-01-24 11:51:05 -0800 Patch bug-235510-20220124152002.patch text/plain 21556 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA4MzUxMzY0NjViMzFlN2I3NzhjNzFhNzFhZDExOTVhMDhhOTYwMGE4Li4wZDhh ZTU1ZTEwOGE3ZDFiMTg5ZjhkODVlNjk0YWQ5MjkxOWVlNTNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMi0wMS0yNCAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hlcnJ5LXBpY2sgV2ViUlRDIDIz NTgyNiBjaGFuZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNTUxMAorICAgICAgICA8cmRhcjovLzg3ODg0MTg0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZXJyeS1waWNraW5nIGFib3ZlIGZpeGlu ZyBmb3IgY29tcGxpYW5jZS4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5l L3dlYnJ0Y19tZWRpYV9lbmdpbmUuY2M6CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9tZWRpYS9l bmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZS5oOgorICAgICAgICAqIFNvdXJjZS93ZWJydGMvbWVk aWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmVfdW5pdHRlc3QuY2M6CisgICAgICAgICogU291 cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZpZGVvX2VuZ2luZS5jYzoKKyAgICAgICAg KiBTb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdmlkZW9fZW5naW5lLmg6CisgICAg ICAgICogU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZvaWNlX2VuZ2luZS5jYzoK KyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL21vZHVsZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFk ZXJfZXh0ZW5zaW9uX21hcC5jYzoKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL21vZHVsZXMvcnRw X3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF91bml0dGVzdC5jYzoKKwogMjAy Mi0wMS0yMSAgTWljaGFlbCBTYWJvZmYgIDxtc2Fib2ZmQGFwcGxlLmNvbT4KIAogICAgICAgICBX ZWJLaXQgZmFpbHMgdG8gYnVpbGQgLSBlcnJvcjogJ3dlYnJ0Yy9ydGNfYmFzZS9uZXR3b3JrLmgn IGZpbGUgbm90IGZvdW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv U291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZS5jYyBiL1NvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNf bWVkaWFfZW5naW5lLmNjCmluZGV4IDZjZTUyZTRjOGUyMmE5M2Q0YTI4M2I1NWZkMjNmOTA0YWUw YTM0NjUuLmYwODNiOWM5Y2E5ZDNhYTEwYmUwMzA3MzFkNmUzZmVjMGFkNGU5OGQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2lu ZS93ZWJydGNfbWVkaWFfZW5naW5lLmNjCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lLmNjCkBAIC0x MCw2ICsxMCw3IEBACiAKICNpbmNsdWRlICJtZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2lu ZS5oIgogCisjaW5jbHVkZSA8bWFwPgogI2luY2x1ZGUgPG1lbW9yeT4KICNpbmNsdWRlIDx1dGls aXR5PgogCkBAIC03NCw3ICs3NSw4IEBAIHZvaWQgRGlzY2FyZFJlZHVuZGFudEV4dGVuc2lvbnMo CiB9ICAvLyBuYW1lc3BhY2UKIAogYm9vbCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoCi0gICAgY29u c3Qgc3RkOjp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+JiBleHRlbnNpb25zKSB7CisgICAg cnRjOjpBcnJheVZpZXc8Y29uc3Qgd2VicnRjOjpSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMsCisg ICAgcnRjOjpBcnJheVZpZXc8Y29uc3Qgd2VicnRjOjpSdHBFeHRlbnNpb24+IG9sZF9leHRlbnNp b25zKSB7CiAgIGJvb2wgaWRfdXNlZFsxICsgd2VicnRjOjpSdHBFeHRlbnNpb246OmtNYXhJZF0g PSB7ZmFsc2V9OwogICBmb3IgKGNvbnN0IGF1dG8mIGV4dGVuc2lvbiA6IGV4dGVuc2lvbnMpIHsK ICAgICBpZiAoZXh0ZW5zaW9uLmlkIDwgd2VicnRjOjpSdHBFeHRlbnNpb246OmtNaW5JZCB8fApA QCAtODksNiArOTEsNDUgQEAgYm9vbCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoCiAgICAgfQogICAg IGlkX3VzZWRbZXh0ZW5zaW9uLmlkXSA9IHRydWU7CiAgIH0KKyAgLy8gVmFsaWRhdGUgdGhlIGV4 dGVuc2lvbiBsaXN0IGFnYWluc3QgdGhlIGFscmVhZHkgbmVnb3RpYXRlZCBleHRlbnNpb25zLgor ICAvLyBSZS1yZWdpc3RlcmluZyBpcyBPSywgcmUtbWFwcGluZyAoZWl0aGVyIHNhbWUgVVJMIGF0 IG5ldyBJRCBvciBzYW1lCisgIC8vIElEIHVzZWQgd2l0aCBuZXcgVVJMKSBpcyBhbiBpbGxlZ2Fs IHJlbWFwLgorCisgIC8vIFRoaXMgaXMgcmVxdWlyZWQgaW4gb3JkZXIgdG8gYXZvaWQgYSBjcmFz aCB3aGVuIHJlZ2lzdGVyaW5nIGFuCisgIC8vIGV4dGVuc2lvbi4gQSBiZXR0ZXIgc3RydWN0dXJl IHdvdWxkIHVzZSB0aGUgcmVnaXN0ZXJlZCBleHRlbnNpb25zCisgIC8vIGluIHRoZSBSVFBTZW5k ZXIuIFRoaXMgcmVxdWlyZXMgc3Bpbm5pbmcgdGhyb3VnaDoKKyAgLy8KKyAgLy8gV2ViUnRjVm9p Y2VNZWRpYUNoYW5uZWw6Ojo6V2ViUnRjQXVkaW9TZW5kU3RyZWFtOjpzdHJlYW1fIChwb2ludGVy KQorICAvLyBBdWRpb1NlbmRTdHJlYW06OnJ0cF9ydGNwX21vZHVsZV8gKHBvaW50ZXIpCisgIC8v IE1vZHVsZVJ0cFJ0Y3BJbXBsMjo6cnRwX3NlbmRlcl8gKHBvaW50ZXIpCisgIC8vIFJ0cFNlbmRl ckNvbnRleHQ6OnBhY2tldF9nZW5lcmF0b3IgKHN0cnVjdCBtZW1iZXIpCisgIC8vIFJUUFNlbmRl cjo6cnRwX2hlYWRlcl9leHRlbnNpb25fbWFwXyAoY2xhc3MgbWVtYmVyKQorICAvLworICAvLyBH ZXR0aW5nIGF0IHRoaXMgc2VlbXMgbGlrZSBhIGhhcmQgc2xvZy4KKyAgaWYgKCFvbGRfZXh0ZW5z aW9ucy5lbXB0eSgpKSB7CisgICAgYWJzbDo6c3RyaW5nX3ZpZXcgdXJpbWFwWzEgKyB3ZWJydGM6 OlJ0cEV4dGVuc2lvbjo6a01heElkXTsKKyAgICBzdGQ6Om1hcDxhYnNsOjpzdHJpbmdfdmlldywg aW50PiBpZG1hcDsKKyAgICBmb3IgKGNvbnN0IGF1dG8mIG9sZF9leHRlbnNpb24gOiBvbGRfZXh0 ZW5zaW9ucykgeworICAgICAgdXJpbWFwW29sZF9leHRlbnNpb24uaWRdID0gb2xkX2V4dGVuc2lv bi51cmk7CisgICAgICBpZG1hcFtvbGRfZXh0ZW5zaW9uLnVyaV0gPSBvbGRfZXh0ZW5zaW9uLmlk OworICAgIH0KKyAgICBmb3IgKGNvbnN0IGF1dG8mIGV4dGVuc2lvbiA6IGV4dGVuc2lvbnMpIHsK KyAgICAgIGlmICghdXJpbWFwW2V4dGVuc2lvbi5pZF0uZW1wdHkoKSAmJgorICAgICAgICAgIHVy aW1hcFtleHRlbnNpb24uaWRdICE9IGV4dGVuc2lvbi51cmkpIHsKKyAgICAgICAgUlRDX0xPRyhM U19FUlJPUikgPDwgIkV4dGVuc2lvbiBuZWdvdGlhdGlvbiBmYWlsdXJlOiAiIDw8IGV4dGVuc2lv bi5pZAorICAgICAgICAgICAgICAgICAgICAgICAgICA8PCAiIHdhcyBtYXBwZWQgdG8gIiA8PCB1 cmltYXBbZXh0ZW5zaW9uLmlkXQorICAgICAgICAgICAgICAgICAgICAgICAgICA8PCAiIGJ1dCBp cyBwcm9wb3NlZCBjaGFuZ2VkIHRvICIgPDwgZXh0ZW5zaW9uLnVyaTsKKyAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgfQorICAgICAgY29uc3QgYXV0byYgaXQgPSBpZG1hcC5maW5kKGV4dGVu c2lvbi51cmkpOworICAgICAgaWYgKGl0ICE9IGlkbWFwLmVuZCgpICYmIGl0LT5zZWNvbmQgIT0g ZXh0ZW5zaW9uLmlkKSB7CisgICAgICAgIFJUQ19MT0coTFNfRVJST1IpIDw8ICJFeHRlbnNpb24g bmVnb3RhdGlvbiBmYWlsdXJlOiAiIDw8IGV4dGVuc2lvbi51cmkKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgPDwgIiB3YXMgaWRlbnRpZmllZCBieSAiIDw8IGl0LT5zZWNvbmQKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgPDwgIiBidXQgaXMgcHJvcG9zZWQgY2hhbmdlZCB0byAiIDw8IGV4 dGVuc2lvbi5pZDsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgfQorICAgIH0KKyAgfQog ICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtOTcsNyArMTM4LDggQEAgc3RkOjp2ZWN0b3I8d2VicnRj OjpSdHBFeHRlbnNpb24+IEZpbHRlclJ0cEV4dGVuc2lvbnMoCiAgICAgYm9vbCAoKnN1cHBvcnRl ZCkoYWJzbDo6c3RyaW5nX3ZpZXcpLAogICAgIGJvb2wgZmlsdGVyX3JlZHVuZGFudF9leHRlbnNp b25zLAogICAgIGNvbnN0IHdlYnJ0Yzo6V2ViUnRjS2V5VmFsdWVDb25maWcmIHRyaWFscykgewot ICBSVENfRENIRUNLKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zKSk7CisgIC8vIERv bid0IGNoZWNrIGFnYWluc3Qgb2xkIHBhcmFtZXRlcnM7IHRoaXMgc2hvdWxkIGhhdmUgYmVlbiBk b25lIGVhcmxpZXIuCisgIFJUQ19EQ0hFQ0soVmFsaWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lv bnMsIHt9KSk7CiAgIFJUQ19EQ0hFQ0soc3VwcG9ydGVkKTsKICAgc3RkOjp2ZWN0b3I8d2VicnRj OjpSdHBFeHRlbnNpb24+IHJlc3VsdDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkv bGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUu aCBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2lu ZS93ZWJydGNfbWVkaWFfZW5naW5lLmgKaW5kZXggMzRlYzRjZGM5YzQzMThiMDMyN2E4YTAzODI5 ZjViMGMyMTlmNmY2OC4uZmY5Nzc2MDliMmFiM2FlMGQzM2YxYTBkNTk5MTc0MWIxOWE0YTRlMSAx MDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVk aWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9s aWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZS5o CkBAIC02Myw4ICs2MywxMSBAQCBSVENfRVhQT1JUIHN0ZDo6dW5pcXVlX3B0cjxNZWRpYUVuZ2lu ZUludGVyZmFjZT4gQ3JlYXRlTWVkaWFFbmdpbmUoCiAgICAgTWVkaWFFbmdpbmVEZXBlbmRlbmNp ZXMgZGVwZW5kZW5jaWVzKTsKIAogLy8gVmVyaWZ5IHRoYXQgZXh0ZW5zaW9uIElEcyBhcmUgd2l0 aGluIDEtYnl0ZSBleHRlbnNpb24gcmFuZ2UgYW5kIGFyZSBub3QKLS8vIG92ZXJsYXBwaW5nLgot Ym9vbCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoY29uc3Qgc3RkOjp2ZWN0b3I8d2VicnRjOjpSdHBF eHRlbnNpb24+JiBleHRlbnNpb25zKTsKKy8vIG92ZXJsYXBwaW5nLCBhbmQgdGhhdCB0aGV5IGZv cm0gYSBsZWdhbCBjaGFuZ2UgZnJvbSBwcmV2aW91c2x5IHJlZ2lzdGVyZAorLy8gZXh0ZW5zaW9u cyAoaWYgYW55KS4KK2Jvb2wgVmFsaWRhdGVSdHBFeHRlbnNpb25zKAorICAgIHJ0Yzo6QXJyYXlW aWV3PGNvbnN0IHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiBleHRlbm5zaW9ucywKKyAgICBydGM6OkFy cmF5Vmlldzxjb25zdCB3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gb2xkX2V4dGVuc2lvbnMpOwogCiAv LyBEaXNjYXJkIGFueSBleHRlbnNpb25zIG5vdCB2YWxpZGF0ZWQgYnkgdGhlICdzdXBwb3J0ZWQn IHByZWRpY2F0ZS4gRHVwbGljYXRlCiAvLyBleHRlbnNpb25zIGFyZSByZW1vdmVkIGlmICdmaWx0 ZXJfcmVkdW5kYW50X2V4dGVuc2lvbnMnIGlzIHNldCwgYW5kIGFsc28gYW55CmRpZmYgLS1naXQg YS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUv d2VicnRjX21lZGlhX2VuZ2luZV91bml0dGVzdC5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndl YnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lX3VuaXR0 ZXN0LmNjCmluZGV4IDc4ZDEzZmMyOTdjZTM5NTRjN2Q2Y2U2MGUwYTc5ZGE3YjA3NDViZTMuLjgx OTgyZmFlMmIxNTMxY2MxZjE0MzE3ZTIyN2Q3MGM3NWFmMTQzNGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNf bWVkaWFfZW5naW5lX3VuaXR0ZXN0LmNjCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lX3VuaXR0ZXN0 LmNjCkBAIC02Niw0MSArNjYsNjggQEAgYm9vbCBJc1NvcnRlZChjb25zdCBzdGQ6OnZlY3Rvcjx3 ZWJydGM6OlJ0cEV4dGVuc2lvbj4mIGV4dGVuc2lvbnMpIHsKIH0KIH0gIC8vIG5hbWVzcGFjZQog Ci1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zX0VtcHR5 TGlzdCkgeworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9u c0VtcHR5TGlzdCkgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7Ci0g IEVYUEVDVF9UUlVFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zKSk7CisgIEVYUEVD VF9UUlVFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7fSkpOwogfQogCi1URVNU KFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zX0FsbEdvb2QpIHsK K1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNBbGxHb29k KSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVF eHRlbnNpb25zKCk7Ci0gIEVYUEVDVF9UUlVFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNp b25zKSk7CisgIEVYUEVDVF9UUlVFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7 fSkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNp b25zX091dE9mUmFuZ2VJZF9Mb3cpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxp ZGF0ZVJ0cEV4dGVuc2lvbnNPdXRPZlJhbmdlSWRfTG93KSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4 dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25zKCk7CiAgIGV4dGVuc2lv bnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lvbigiZm9vIiwgMCkpOwotICBFWFBFQ1RfRkFMU0UoVmFs aWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMpKTsKKyAgRVhQRUNUX0ZBTFNFKFZhbGlkYXRl UnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7fSkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5n aW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zX091dE9mUmFuZ2VJZF9IaWdoKSB7CitURVNU KFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zT3V0T2ZSYW5nZUlk SGlnaCkgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlVW5p cXVlRXh0ZW5zaW9ucygpOwogICBleHRlbnNpb25zLnB1c2hfYmFjayhSdHBFeHRlbnNpb24oImZv byIsIDI1NikpOwotICBFWFBFQ1RfRkFMU0UoVmFsaWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lv bnMpKTsKKyAgRVhQRUNUX0ZBTFNFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7 fSkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNp b25zX092ZXJsYXBwaW5nSWRzX1N0YXJ0T2ZTZXQpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVU ZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNPdmVybGFwcGluZ0lkc1N0YXJ0T2ZTZXQpIHsKICAg c3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVVuaXF1ZUV4dGVuc2lv bnMoKTsKICAgZXh0ZW5zaW9ucy5wdXNoX2JhY2soUnRwRXh0ZW5zaW9uKCJmb28iLCAxKSk7Ci0g IEVYUEVDVF9GQUxTRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucykpOworICBFWFBF Q1RfRkFMU0UoVmFsaWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMsIHt9KSk7CiB9CiAKLVRF U1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNfT3ZlcmxhcHBp bmdJZHNfRW5kT2ZTZXQpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0 cEV4dGVuc2lvbnNPdmVybGFwcGluZ0lkc0VuZE9mU2V0KSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4 dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25zKCk7CiAgIGV4dGVuc2lv bnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lvbigiZm9vIiwgMjU1KSk7Ci0gIEVYUEVDVF9GQUxTRShW YWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucykpOworICBFWFBFQ1RfRkFMU0UoVmFsaWRh dGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMsIHt9KSk7CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFF bmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX0VtcHR5TGlzdCkgeworVEVTVChXZWJSdGNN ZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9uc0VtcHR5VG9FbXB0eSkgeworICBz dGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7CisgIEVYUEVDVF9UUlVFKFZhbGlk YXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCBleHRlbnNpb25zKSk7Cit9CisKK1RFU1QoV2Vi UnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNOb0NoYW5nZSkgeworICBz dGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0ZW5zaW9u cygpOworICBFWFBFQ1RfVFJVRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywgZXh0 ZW5zaW9ucykpOworfQorCitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBF eHRlbnNpb25zQ2hhbmdlSWROb3RVcmwpIHsKKyAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBv bGRfZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25zKCk7CisgIHN0ZDo6dmVjdG9yPFJ0 cEV4dGVuc2lvbj4gbmV3X2V4dGVuc2lvbnMgPSBvbGRfZXh0ZW5zaW9uczsKKyAgc3RkOjpzd2Fw KG5ld19leHRlbnNpb25zWzBdLmlkLCBuZXdfZXh0ZW5zaW9uc1sxXS5pZCk7CisKKyAgRVhQRUNU X0ZBTFNFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhuZXdfZXh0ZW5zaW9ucywgb2xkX2V4dGVuc2lv bnMpKTsKK30KKworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5z aW9uc0NoYW5nZUlkRm9yVXJsKSB7CisgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gb2xkX2V4 dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0ZW5zaW9ucygpOworICBzdGQ6OnZlY3RvcjxSdHBFeHRl bnNpb24+IG5ld19leHRlbnNpb25zID0gb2xkX2V4dGVuc2lvbnM7CisgIC8vIENoYW5nZSBmaXJz dCBleHRlbnNpb24gdG8gc29tZXRoaW5nIG5vdCBnZW5lcmF0ZWQgYnkgTWFrZVVuaXF1ZUV4dGVu c2lvbnMKKyAgbmV3X2V4dGVuc2lvbnNbMF0uaWQgPSAxMjM7CisKKyAgRVhQRUNUX0ZBTFNFKFZh bGlkYXRlUnRwRXh0ZW5zaW9ucyhuZXdfZXh0ZW5zaW9ucywgb2xkX2V4dGVuc2lvbnMpKTsKK30K KworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNFbXB0eUxp c3QpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zOwogICB3ZWJydGM6 OkZpZWxkVHJpYWxCYXNlZENvbmZpZyB0cmlhbHM7CiAgIHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6UnRw RXh0ZW5zaW9uPiBmaWx0ZXJlZCA9CkBAIC0xMDgsNyArMTM1LDcgQEAgVEVTVChXZWJSdGNNZWRp YUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfRW1wdHlMaXN0KSB7CiAgIEVYUEVDVF9F USgwdSwgZmlsdGVyZWQuc2l6ZSgpKTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3Qs IEZpbHRlclJ0cEV4dGVuc2lvbnNfSW5jbHVkZU9ubHlTdXBwb3J0ZWQpIHsKK1RFU1QoV2ViUnRj TWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zSW5jbHVkZU9ubHlTdXBwb3J0ZWQp IHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVVuaXF1ZUV4 dGVuc2lvbnMoKTsKICAgd2VicnRjOjpGaWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxzOwogICBz dGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZmlsdGVyZWQgPQpAQCAtMTE4LDcgKzE0 NSw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX0lu Y2x1ZGVPbmx5U3VwcG9ydGVkKSB7CiAgIEVYUEVDVF9FUSgiaSIsIGZpbHRlcmVkWzFdLnVyaSk7 CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1Nv cnRlZEJ5TmFtZV8xKSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0 ZW5zaW9uc1NvcnRlZEJ5TmFtZTEpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRl bnNpb25zID0gTWFrZVVuaXF1ZUV4dGVuc2lvbnMoKTsKICAgd2VicnRjOjpGaWVsZFRyaWFsQmFz ZWRDb25maWcgdHJpYWxzOwogICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZmls dGVyZWQgPQpAQCAtMTI3LDcgKzE1NCw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBG aWx0ZXJSdHBFeHRlbnNpb25zX1NvcnRlZEJ5TmFtZV8xKSB7CiAgIEVYUEVDVF9UUlVFKElzU29y dGVkKGZpbHRlcmVkKSk7CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJS dHBFeHRlbnNpb25zX1NvcnRlZEJ5TmFtZV8yKSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVz dCwgRmlsdGVyUnRwRXh0ZW5zaW9uc1NvcnRlZEJ5TmFtZTIpIHsKICAgc3RkOjp2ZWN0b3I8UnRw RXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVVuaXF1ZUV4dGVuc2lvbnMoKTsKICAgd2VicnRj OjpGaWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxzOwogICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0 cEV4dGVuc2lvbj4gZmlsdGVyZWQgPQpAQCAtMTM2LDcgKzE2Myw3IEBAIFRFU1QoV2ViUnRjTWVk aWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1NvcnRlZEJ5TmFtZV8yKSB7CiAgIEVY UEVDVF9UUlVFKElzU29ydGVkKGZpbHRlcmVkKSk7CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdp bmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX0RvbnRSZW1vdmVSZWR1bmRhbnQpIHsKK1RFU1Qo V2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zRG9udFJlbW92ZVJlZHVu ZGFudCkgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlUmVk dW5kYW50RXh0ZW5zaW9ucygpOwogICB3ZWJydGM6OkZpZWxkVHJpYWxCYXNlZENvbmZpZyB0cmlh bHM7CiAgIHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiBmaWx0ZXJlZCA9CkBAIC0x NDYsNyArMTczLDcgQEAgVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVu c2lvbnNfRG9udFJlbW92ZVJlZHVuZGFudCkgewogICBFWFBFQ1RfRVEoZmlsdGVyZWRbMF0udXJp LCBmaWx0ZXJlZFsxXS51cmkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmls dGVyUnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnQpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdp bmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50KSB7CiAgIHN0ZDo6dmVj dG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VSZWR1bmRhbnRFeHRlbnNpb25zKCk7 CiAgIHdlYnJ0Yzo6RmllbGRUcmlhbEJhc2VkQ29uZmlnIHRyaWFsczsKICAgc3RkOjp2ZWN0b3I8 d2VicnRjOjpSdHBFeHRlbnNpb24+IGZpbHRlcmVkID0KQEAgLTE1Niw3ICsxODMsNyBAQCBURVNU KFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRh bnQpIHsKICAgRVhQRUNUX05FKGZpbHRlcmVkWzBdLnVyaSwgZmlsdGVyZWRbMV0udXJpKTsKIH0K IAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfUmVtb3Zl UmVkdW5kYW50RW5jcnlwdGVkXzEpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0 ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50RW5jcnlwdGVkMSkgewogICBzdGQ6OnZlY3Rv cjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNrKHdlYnJ0 Yzo6UnRwRXh0ZW5zaW9uKCJiIiwgMSkpOwogICBleHRlbnNpb25zLnB1c2hfYmFjayh3ZWJydGM6 OlJ0cEV4dGVuc2lvbigiYiIsIDIsIHRydWUpKTsKQEAgLTE3Myw3ICsyMDAsNyBAQCBURVNUKFdl YlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnRF bmNyeXB0ZWRfMSkgewogICBFWFBFQ1RfTkUoZmlsdGVyZWRbMV0udXJpLCBmaWx0ZXJlZFsyXS51 cmkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9u c19SZW1vdmVSZWR1bmRhbnRFbmNyeXB0ZWRfMikgeworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRl c3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNSZW1vdmVSZWR1bmRhbnRFbmNyeXB0ZWQyKSB7CiAgIHN0 ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9uczsKICAgZXh0ZW5zaW9ucy5wdXNoX2Jh Y2sod2VicnRjOjpSdHBFeHRlbnNpb24oImIiLCAxLCB0cnVlKSk7CiAgIGV4dGVuc2lvbnMucHVz aF9iYWNrKHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uKCJiIiwgMikpOwpAQCAtMTkwLDcgKzIxNyw3IEBA IFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1JlbW92ZVJl ZHVuZGFudEVuY3J5cHRlZF8yKSB7CiAgIEVYUEVDVF9ORShmaWx0ZXJlZFsxXS51cmksIGZpbHRl cmVkWzJdLnVyaSk7CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBF eHRlbnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3ZV8xKSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5l VGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc1JlbW92ZVJlZHVuZGFudEJ3ZTEpIHsKICAgd2VicnRj Ojp0ZXN0OjpTY29wZWRGaWVsZFRyaWFscyBvdmVycmlkZV9maWVsZF90cmlhbHNfKAogICAgICAg IldlYlJUQy1GaWx0ZXJBYnNTZW5kVGltZUV4dGVuc2lvbi9FbmFibGVkLyIpOwogICB3ZWJydGM6 OkZpZWxkVHJpYWxCYXNlZENvbmZpZyB0cmlhbHM7CkBAIC0yMDksNyArMjM2LDcgQEAgVEVTVChX ZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50 QndlXzEpIHsKIH0KIAogVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsCi0gICAgIEZpbHRlclJ0 cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50QndlXzFfS2VlcEFic1NlbmRUaW1lKSB7CisgICAg IEZpbHRlclJ0cEV4dGVuc2lvbnNSZW1vdmVSZWR1bmRhbnRCd2UxS2VlcEFic1NlbmRUaW1lKSB7 CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9uczsKICAgZXh0ZW5zaW9ucy5w dXNoX2JhY2soCiAgICAgICBSdHBFeHRlbnNpb24oUnRwRXh0ZW5zaW9uOjprVHJhbnNwb3J0U2Vx dWVuY2VOdW1iZXJVcmksIDMpKTsKQEAgLTIyNiw3ICsyNTMsNyBAQCBURVNUKFdlYlJ0Y01lZGlh RW5naW5lVGVzdCwKICAgRVhQRUNUX0VRKFJ0cEV4dGVuc2lvbjo6a0Fic1NlbmRUaW1lVXJpLCBm aWx0ZXJlZFsxXS51cmkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVy UnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnRCd2VFbmNyeXB0ZWRfMSkgeworVEVTVChXZWJS dGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNSZW1vdmVSZWR1bmRhbnRCd2VF bmNyeXB0ZWQxKSB7CiAgIHdlYnJ0Yzo6dGVzdDo6U2NvcGVkRmllbGRUcmlhbHMgb3ZlcnJpZGVf ZmllbGRfdHJpYWxzXygKICAgICAgICJXZWJSVEMtRmlsdGVyQWJzU2VuZFRpbWVFeHRlbnNpb24v RW5hYmxlZC8iKTsKICAgd2VicnRjOjpGaWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxzOwpAQCAt MjUxLDcgKzI3OCw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRl bnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3ZUVuY3J5cHRlZF8xKSB7CiB9CiAKIFRFU1QoV2ViUnRj TWVkaWFFbmdpbmVUZXN0LAotICAgICBGaWx0ZXJSdHBFeHRlbnNpb25zX1JlbW92ZVJlZHVuZGFu dEJ3ZUVuY3J5cHRlZF8xX0tlZXBBYnNTZW5kVGltZSkgeworICAgICBGaWx0ZXJSdHBFeHRlbnNp b25zUmVtb3ZlUmVkdW5kYW50QndlRW5jcnlwdGVkMUtlZXBBYnNTZW5kVGltZSkgewogICBzdGQ6 OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNr KAogICAgICAgUnRwRXh0ZW5zaW9uKFJ0cEV4dGVuc2lvbjo6a1RyYW5zcG9ydFNlcXVlbmNlTnVt YmVyVXJpLCAzKSk7CkBAIC0yNzQsNyArMzAxLDcgQEAgVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRl c3QsCiAgIEVYUEVDVF9ORShmaWx0ZXJlZFswXS5lbmNyeXB0LCBmaWx0ZXJlZFsxXS5lbmNyeXB0 KTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNf UmVtb3ZlUmVkdW5kYW50QndlXzIpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0 ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50QndlMikgewogICBzdGQ6OnZlY3RvcjxSdHBF eHRlbnNpb24+IGV4dGVuc2lvbnM7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lv bihSdHBFeHRlbnNpb246OmtUaW1lc3RhbXBPZmZzZXRVcmksIDEpKTsKICAgZXh0ZW5zaW9ucy5w dXNoX2JhY2soUnRwRXh0ZW5zaW9uKFJ0cEV4dGVuc2lvbjo6a0Fic1NlbmRUaW1lVXJpLCAxNCkp OwpAQCAtMjg2LDcgKzMxMyw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJS dHBFeHRlbnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3ZV8yKSB7CiAgIEVYUEVDVF9FUShSdHBFeHRl bnNpb246OmtBYnNTZW5kVGltZVVyaSwgZmlsdGVyZWRbMF0udXJpKTsKIH0KIAotVEVTVChXZWJS dGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50Qndl XzMpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zUmVt b3ZlUmVkdW5kYW50QndlMykgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lv bnM7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lvbihSdHBFeHRlbnNpb246OmtU aW1lc3RhbXBPZmZzZXRVcmksIDIpKTsKICAgZXh0ZW5zaW9ucy5wdXNoX2JhY2soUnRwRXh0ZW5z aW9uKFJ0cEV4dGVuc2lvbjo6a1RpbWVzdGFtcE9mZnNldFVyaSwgMTQpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93 ZWJydGNfdmlkZW9fZW5naW5lLmNjIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJj ZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192aWRlb19lbmdpbmUuY2MKaW5kZXggZWEyMjk4 YmMyMzA1MjczODcxNzRhYWZlZTI1YWJhZjIwMTEwNGVmOC4uMzllM2NjNTQ2YTk0NmE3MTRmN2Rk NmU1Y2M3OGFmZGI1ZmVkN2IyNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2Vi cnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192aWRlb19lbmdpbmUuY2MKKysr IGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5l L3dlYnJ0Y192aWRlb19lbmdpbmUuY2MKQEAgLTgwOCw3ICs4MDgsNyBAQCBib29sIFdlYlJ0Y1Zp ZGVvQ2hhbm5lbDo6R2V0Q2hhbmdlZFNlbmRQYXJhbWV0ZXJzKAogICAgIGNvbnN0IFZpZGVvU2Vu ZFBhcmFtZXRlcnMmIHBhcmFtcywKICAgICBDaGFuZ2VkU2VuZFBhcmFtZXRlcnMqIGNoYW5nZWRf cGFyYW1zKSBjb25zdCB7CiAgIGlmICghVmFsaWRhdGVDb2RlY0Zvcm1hdHMocGFyYW1zLmNvZGVj cykgfHwKLSAgICAgICFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4dGVuc2lvbnMpKSB7 CisgICAgICAhVmFsaWRhdGVSdHBFeHRlbnNpb25zKHBhcmFtcy5leHRlbnNpb25zLCBzZW5kX3J0 cF9leHRlbnNpb25zXykpIHsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KIApAQCAtODQzLDcgKzg0 Myw3IEBAIGJvb2wgV2ViUnRjVmlkZW9DaGFubmVsOjpHZXRDaGFuZ2VkU2VuZFBhcmFtZXRlcnMo CiAgIHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiBmaWx0ZXJlZF9leHRlbnNpb25z ID0gRmlsdGVyUnRwRXh0ZW5zaW9ucygKICAgICAgIHBhcmFtcy5leHRlbnNpb25zLCB3ZWJydGM6 OlJ0cEV4dGVuc2lvbjo6SXNTdXBwb3J0ZWRGb3JWaWRlbywgdHJ1ZSwKICAgICAgIGNhbGxfLT50 cmlhbHMoKSk7Ci0gIGlmICghc2VuZF9ydHBfZXh0ZW5zaW9uc18gfHwgKCpzZW5kX3J0cF9leHRl bnNpb25zXyAhPSBmaWx0ZXJlZF9leHRlbnNpb25zKSkgeworICBpZiAoc2VuZF9ydHBfZXh0ZW5z aW9uc18gIT0gZmlsdGVyZWRfZXh0ZW5zaW9ucykgewogICAgIGNoYW5nZWRfcGFyYW1zLT5ydHBf aGVhZGVyX2V4dGVuc2lvbnMgPQogICAgICAgICBhYnNsOjpvcHRpb25hbDxzdGQ6OnZlY3Rvcjx3 ZWJydGM6OlJ0cEV4dGVuc2lvbj4+KGZpbHRlcmVkX2V4dGVuc2lvbnMpOwogICB9CkBAIC05OTAs NyArOTkwLDcgQEAgYm9vbCBXZWJSdGNWaWRlb0NoYW5uZWw6OkFwcGx5Q2hhbmdlZFBhcmFtcygK ICAgICBTZXRFeHRtYXBBbGxvd01peGVkKCpjaGFuZ2VkX3BhcmFtcy5leHRtYXBfYWxsb3dfbWl4 ZWQpOwogICB9CiAgIGlmIChjaGFuZ2VkX3BhcmFtcy5ydHBfaGVhZGVyX2V4dGVuc2lvbnMpIHsK LSAgICBzZW5kX3J0cF9leHRlbnNpb25zXyA9IGNoYW5nZWRfcGFyYW1zLnJ0cF9oZWFkZXJfZXh0 ZW5zaW9uczsKKyAgICBzZW5kX3J0cF9leHRlbnNpb25zXyA9ICpjaGFuZ2VkX3BhcmFtcy5ydHBf aGVhZGVyX2V4dGVuc2lvbnM7CiAgIH0KIAogICBpZiAoY2hhbmdlZF9wYXJhbXMuc2VuZF9jb2Rl YyB8fCBjaGFuZ2VkX3BhcmFtcy5tYXhfYmFuZHdpZHRoX2JwcykgewpAQCAtMTE2Nyw3ICsxMTY3 LDcgQEAgYm9vbCBXZWJSdGNWaWRlb0NoYW5uZWw6OkdldENoYW5nZWRSZWN2UGFyYW1ldGVycygK ICAgICBjb25zdCBWaWRlb1JlY3ZQYXJhbWV0ZXJzJiBwYXJhbXMsCiAgICAgQ2hhbmdlZFJlY3ZQ YXJhbWV0ZXJzKiBjaGFuZ2VkX3BhcmFtcykgY29uc3QgewogICBpZiAoIVZhbGlkYXRlQ29kZWNG b3JtYXRzKHBhcmFtcy5jb2RlY3MpIHx8Ci0gICAgICAhVmFsaWRhdGVSdHBFeHRlbnNpb25zKHBh cmFtcy5leHRlbnNpb25zKSkgeworICAgICAgIVZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhwYXJhbXMu ZXh0ZW5zaW9ucywgcmVjdl9ydHBfZXh0ZW5zaW9uc18pKSB7CiAgICAgcmV0dXJuIGZhbHNlOwog ICB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2Vi cnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdmlkZW9fZW5naW5lLmggYi9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZpZGVvX2VuZ2lu ZS5oCmluZGV4IDliOGJhMGI3NGIwMmNiOWJmN2I2NmNjZDhlMDZjMzBiYzVlOWUyNDguLjY2MDIz MTk2YjEwZGNjZmVhZTM1Mzg0ZjdjODM3NjJlMzYwNDM5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9U aGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdmlk ZW9fZW5naW5lLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJy dGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192aWRlb19lbmdpbmUuaApAQCAtNjAxLDcgKzYwMSw3IEBA IGNsYXNzIFdlYlJ0Y1ZpZGVvQ2hhbm5lbCA6IHB1YmxpYyBWaWRlb01lZGlhQ2hhbm5lbCwKICAg c3RkOjp2ZWN0b3I8VmlkZW9Db2RlY1NldHRpbmdzPiBuZWdvdGlhdGVkX2NvZGVjc18KICAgICAg IFJUQ19HVUFSREVEX0JZKHRocmVhZF9jaGVja2VyXyk7CiAKLSAgYWJzbDo6b3B0aW9uYWw8c3Rk Ojp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+PiBzZW5kX3J0cF9leHRlbnNpb25zXworICBz dGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gc2VuZF9ydHBfZXh0ZW5zaW9uc18KICAg ICAgIFJUQ19HVUFSREVEX0JZKHRocmVhZF9jaGVja2VyXyk7CiAKICAgd2VicnRjOjpWaWRlb0Vu Y29kZXJGYWN0b3J5KiBjb25zdCBlbmNvZGVyX2ZhY3RvcnlfCmRpZmYgLS1naXQgYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3Zv aWNlX2VuZ2luZS5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRj L21lZGlhL2VuZ2luZS93ZWJydGNfdm9pY2VfZW5naW5lLmNjCmluZGV4IDQ0OGFkMzUyMmEwZDU1 NjJkZmNkNDdiM2Q0ZGIzN2JmNTBhNzA4YWUuLjdjZTUwNjNjZmUxMjA3MTEyYTk1OTAwZmM1YTg0 OGJjNDhhNjgwMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3Vy Y2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdm9pY2VfZW5naW5lLmNjCisrKyBiL1NvdXJj ZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNf dm9pY2VfZW5naW5lLmNjCkBAIC0xMzg0LDcgKzEzODQsNyBAQCBib29sIFdlYlJ0Y1ZvaWNlTWVk aWFDaGFubmVsOjpTZXRTZW5kUGFyYW1ldGVycygKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KIAot ICBpZiAoIVZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhwYXJhbXMuZXh0ZW5zaW9ucykpIHsKKyAgaWYg KCFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4dGVuc2lvbnMsIHNlbmRfcnRwX2V4dGVu c2lvbnNfKSkgewogICAgIHJldHVybiBmYWxzZTsKICAgfQogCkBAIC0xNDMwLDcgKzE0MzAsNyBA QCBib29sIFdlYlJ0Y1ZvaWNlTWVkaWFDaGFubmVsOjpTZXRSZWN2UGFyYW1ldGVycygKICAgICBy ZXR1cm4gZmFsc2U7CiAgIH0KIAotICBpZiAoIVZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhwYXJhbXMu ZXh0ZW5zaW9ucykpIHsKKyAgaWYgKCFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4dGVu c2lvbnMsIHJlY3ZfcnRwX2V4dGVuc2lvbnNfKSkgewogICAgIHJldHVybiBmYWxzZTsKICAgfQog ICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZmlsdGVyZWRfZXh0ZW5zaW9ucyA9 IEZpbHRlclJ0cEV4dGVuc2lvbnMoCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3 ZWJydGMvU291cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBfaGVhZGVyX2V4 dGVuc2lvbl9tYXAuY2MgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBfaGVhZGVyX2V4dGVuc2lvbl9tYXAuY2MKaW5k ZXggNTQxZTU3MGVkODgyYWQ4MGIyYThiNDA2OWY0MWQxZjU5YzBlNmYyYy4uMjIxMzc3ZWJlYWFi NGRiYzlhY2FjNjlkN2QxMmEzODc5YWYxZWJmNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9ydHBfcnRjcC9zb3VyY2UvcnRwX2hl YWRlcl9leHRlbnNpb25fbWFwLmNjCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9T b3VyY2Uvd2VicnRjL21vZHVsZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9u X21hcC5jYwpAQCAtMSw0ICsxLDQgQEAKLS8qCisgLyoKICAqICBDb3B5cmlnaHQgKGMpIDIwMTIg VGhlIFdlYlJUQyBwcm9qZWN0IGF1dGhvcnMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuCiAgKgogICog IFVzZSBvZiB0aGlzIHNvdXJjZSBjb2RlIGlzIGdvdmVybmVkIGJ5IGEgQlNELXN0eWxlIGxpY2Vu c2UKQEAgLTE2MSw3ICsxNjEsMTIgQEAgYm9vbCBSdHBIZWFkZXJFeHRlbnNpb25NYXA6OlJlZ2lz dGVyKGludCBpZCwKICAgICAgICAgICAgICAgICAgICAgICAgIDw8IHN0YXRpY19jYXN0PGludD4o cmVnaXN0ZXJlZF90eXBlKTsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KLSAgUlRDX0RDSEVDSygh SXNSZWdpc3RlcmVkKHR5cGUpKTsKKyAgaWYgKElzUmVnaXN0ZXJlZCh0eXBlKSkgeworICAgIFJU Q19MT0coTFNfV0FSTklORykgPDwgIklsbGVnYWwgcmVyZWdpc3RyYXRpb24gZm9yIHVyaTogIiA8 PCB1cmkKKyAgICAgICAgICAgICAgICAgICAgICAgIDw8ICIgaXMgcHJldmlvdXNseSByZWdpc3Rl cmVkIHdpdGggaWQgIiA8PCBHZXRJZCh0eXBlKQorICAgICAgICAgICAgICAgICAgICAgICAgPDwg IiBhbmQgY2Fubm90IGJlIHJlcmVnaXN0ZXJlZCB3aXRoIGlkICIgPDwgaWQ7CisgICAgcmV0dXJu IGZhbHNlOworICB9CiAKICAgLy8gVGhlcmUgaXMgYSBydW4tdGltZSBjaGVjayBhYm92ZSBpZCBm aXRzIGludG8gdWludDhfdC4KICAgaWRzX1t0eXBlXSA9IHN0YXRpY19jYXN0PHVpbnQ4X3Q+KGlk KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRj L21vZHVsZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF91bml0dGVz dC5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMv cnRwX3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF91bml0dGVzdC5jYwppbmRl eCA5MWJiMjUyNzczMmFkODJkNmE0ZTQ0ODA0M2FjMzUyNmRlMjM4Zjk5Li4wMzI2YjQ1ZmU3ZDBi MGUyOGIzMjBiODdlYzAyNzFmMGQ1OGEyODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBfaGVh ZGVyX2V4dGVuc2lvbl9tYXBfdW5pdHRlc3QuY2MKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9ydHBfcnRjcC9zb3VyY2UvcnRwX2hlYWRlcl9l eHRlbnNpb25fbWFwX3VuaXR0ZXN0LmNjCkBAIC0xMDYsNCArMTA2LDEwIEBAIFRFU1QoUnRwSGVh ZGVyRXh0ZW5zaW9uVGVzdCwgR2V0SWQpIHsKICAgRVhQRUNUX0VRKDMsIG1hcC5HZXRJZChUcmFu c21pc3Npb25PZmZzZXQ6OmtJZCkpOwogfQogCitURVNUKFJ0cEhlYWRlckV4dGVuc2lvblRlc3Qs IFJlbWFwRmFpbHMpIHsKKyAgUnRwSGVhZGVyRXh0ZW5zaW9uTWFwIG1hcDsKKyAgRVhQRUNUX1RS VUUobWFwLlJlZ2lzdGVyPFRyYW5zbWlzc2lvbk9mZnNldD4oMykpOworICBFWFBFQ1RfRkFMU0Uo bWFwLlJlZ2lzdGVyPFRyYW5zbWlzc2lvbk9mZnNldD4oNCkpOworfQorCiB9ICAvLyBuYW1lc3Bh Y2Ugd2VicnRjCg== 449839 2022-01-24 11:51:11 -0800 2022-01-24 13:41:29 -0800 Patch for landing bug-235510-20220124205108.patch text/plain 21388 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NDI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA4MzUxMzY0NjViMzFlN2I3NzhjNzFhNzFhZDExOTVhMDhhOTYwMGE4Li4yYzIx ODllOTk3ZjRjOGI1ZDY2ZDUwM2ZkMDcwYTc3NGJmNzFmMmY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAyMi0wMS0yNCAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2hlcnJ5LXBpY2sgV2ViUlRDIDIz NTgyNiBjaGFuZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNTUxMAorICAgICAgICA8cmRhcjovLzg3ODg0MTg0PgorCisgICAgICAgIFJldmlld2Vk IGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBDaGVycnktcGlja2luZyBhYm92ZSBmaXhpbmcg Zm9yIGNvbXBsaWFuY2UuCisKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93 ZWJydGNfbWVkaWFfZW5naW5lLmNjOgorICAgICAgICAqIFNvdXJjZS93ZWJydGMvbWVkaWEvZW5n aW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUuaDoKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRjL21lZGlh L2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lX3VuaXR0ZXN0LmNjOgorICAgICAgICAqIFNvdXJj ZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192aWRlb19lbmdpbmUuY2M6CisgICAgICAgICog U291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZpZGVvX2VuZ2luZS5oOgorICAgICAg ICAqIFNvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192b2ljZV9lbmdpbmUuY2M6Cisg ICAgICAgICogU291cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBfaGVhZGVy X2V4dGVuc2lvbl9tYXAuY2M6CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9y dGNwL3NvdXJjZS9ydHBfaGVhZGVyX2V4dGVuc2lvbl9tYXBfdW5pdHRlc3QuY2M6CisKIDIwMjIt MDEtMjEgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi S2l0IGZhaWxzIHRvIGJ1aWxkIC0gZXJyb3I6ICd3ZWJydGMvcnRjX2Jhc2UvbmV0d29yay5oJyBm aWxlIG5vdCBmb3VuZApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1Nv dXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUuY2MgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21l ZGlhX2VuZ2luZS5jYwppbmRleCA2Y2U1MmU0YzhlMjJhOTNkNGEyODNiNTVmZDIzZjkwNGFlMGEz NDY1Li5mMDgzYjljOWNhOWQzYWExMGJlMDMwNzMxZDZlM2ZlYzBhZDRlOThkIDEwMDY0NAotLS0g YS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUv d2VicnRjX21lZGlhX2VuZ2luZS5jYworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv U291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZS5jYwpAQCAtMTAs NiArMTAsNyBAQAogCiAjaW5jbHVkZSAibWVkaWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUu aCIKIAorI2luY2x1ZGUgPG1hcD4KICNpbmNsdWRlIDxtZW1vcnk+CiAjaW5jbHVkZSA8dXRpbGl0 eT4KIApAQCAtNzQsNyArNzUsOCBAQCB2b2lkIERpc2NhcmRSZWR1bmRhbnRFeHRlbnNpb25zKAog fSAgLy8gbmFtZXNwYWNlCiAKIGJvb2wgVmFsaWRhdGVSdHBFeHRlbnNpb25zKAotICAgIGNvbnN0 IHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiYgZXh0ZW5zaW9ucykgeworICAgIHJ0 Yzo6QXJyYXlWaWV3PGNvbnN0IHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zLAorICAg IHJ0Yzo6QXJyYXlWaWV3PGNvbnN0IHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPiBvbGRfZXh0ZW5zaW9u cykgewogICBib29sIGlkX3VzZWRbMSArIHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uOjprTWF4SWRdID0g e2ZhbHNlfTsKICAgZm9yIChjb25zdCBhdXRvJiBleHRlbnNpb24gOiBleHRlbnNpb25zKSB7CiAg ICAgaWYgKGV4dGVuc2lvbi5pZCA8IHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uOjprTWluSWQgfHwKQEAg LTg5LDYgKzkxLDQ1IEBAIGJvb2wgVmFsaWRhdGVSdHBFeHRlbnNpb25zKAogICAgIH0KICAgICBp ZF91c2VkW2V4dGVuc2lvbi5pZF0gPSB0cnVlOwogICB9CisgIC8vIFZhbGlkYXRlIHRoZSBleHRl bnNpb24gbGlzdCBhZ2FpbnN0IHRoZSBhbHJlYWR5IG5lZ290aWF0ZWQgZXh0ZW5zaW9ucy4KKyAg Ly8gUmUtcmVnaXN0ZXJpbmcgaXMgT0ssIHJlLW1hcHBpbmcgKGVpdGhlciBzYW1lIFVSTCBhdCBu ZXcgSUQgb3Igc2FtZQorICAvLyBJRCB1c2VkIHdpdGggbmV3IFVSTCkgaXMgYW4gaWxsZWdhbCBy ZW1hcC4KKworICAvLyBUaGlzIGlzIHJlcXVpcmVkIGluIG9yZGVyIHRvIGF2b2lkIGEgY3Jhc2gg d2hlbiByZWdpc3RlcmluZyBhbgorICAvLyBleHRlbnNpb24uIEEgYmV0dGVyIHN0cnVjdHVyZSB3 b3VsZCB1c2UgdGhlIHJlZ2lzdGVyZWQgZXh0ZW5zaW9ucworICAvLyBpbiB0aGUgUlRQU2VuZGVy LiBUaGlzIHJlcXVpcmVzIHNwaW5uaW5nIHRocm91Z2g6CisgIC8vCisgIC8vIFdlYlJ0Y1ZvaWNl TWVkaWFDaGFubmVsOjo6OldlYlJ0Y0F1ZGlvU2VuZFN0cmVhbTo6c3RyZWFtXyAocG9pbnRlcikK KyAgLy8gQXVkaW9TZW5kU3RyZWFtOjpydHBfcnRjcF9tb2R1bGVfIChwb2ludGVyKQorICAvLyBN b2R1bGVSdHBSdGNwSW1wbDI6OnJ0cF9zZW5kZXJfIChwb2ludGVyKQorICAvLyBSdHBTZW5kZXJD b250ZXh0OjpwYWNrZXRfZ2VuZXJhdG9yIChzdHJ1Y3QgbWVtYmVyKQorICAvLyBSVFBTZW5kZXI6 OnJ0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF8gKGNsYXNzIG1lbWJlcikKKyAgLy8KKyAgLy8gR2V0 dGluZyBhdCB0aGlzIHNlZW1zIGxpa2UgYSBoYXJkIHNsb2cuCisgIGlmICghb2xkX2V4dGVuc2lv bnMuZW1wdHkoKSkgeworICAgIGFic2w6OnN0cmluZ192aWV3IHVyaW1hcFsxICsgd2VicnRjOjpS dHBFeHRlbnNpb246OmtNYXhJZF07CisgICAgc3RkOjptYXA8YWJzbDo6c3RyaW5nX3ZpZXcsIGlu dD4gaWRtYXA7CisgICAgZm9yIChjb25zdCBhdXRvJiBvbGRfZXh0ZW5zaW9uIDogb2xkX2V4dGVu c2lvbnMpIHsKKyAgICAgIHVyaW1hcFtvbGRfZXh0ZW5zaW9uLmlkXSA9IG9sZF9leHRlbnNpb24u dXJpOworICAgICAgaWRtYXBbb2xkX2V4dGVuc2lvbi51cmldID0gb2xkX2V4dGVuc2lvbi5pZDsK KyAgICB9CisgICAgZm9yIChjb25zdCBhdXRvJiBleHRlbnNpb24gOiBleHRlbnNpb25zKSB7Cisg ICAgICBpZiAoIXVyaW1hcFtleHRlbnNpb24uaWRdLmVtcHR5KCkgJiYKKyAgICAgICAgICB1cmlt YXBbZXh0ZW5zaW9uLmlkXSAhPSBleHRlbnNpb24udXJpKSB7CisgICAgICAgIFJUQ19MT0coTFNf RVJST1IpIDw8ICJFeHRlbnNpb24gbmVnb3RpYXRpb24gZmFpbHVyZTogIiA8PCBleHRlbnNpb24u aWQKKyAgICAgICAgICAgICAgICAgICAgICAgICAgPDwgIiB3YXMgbWFwcGVkIHRvICIgPDwgdXJp bWFwW2V4dGVuc2lvbi5pZF0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgPDwgIiBidXQgaXMg cHJvcG9zZWQgY2hhbmdlZCB0byAiIDw8IGV4dGVuc2lvbi51cmk7CisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgIH0KKyAgICAgIGNvbnN0IGF1dG8mIGl0ID0gaWRtYXAuZmluZChleHRlbnNp b24udXJpKTsKKyAgICAgIGlmIChpdCAhPSBpZG1hcC5lbmQoKSAmJiBpdC0+c2Vjb25kICE9IGV4 dGVuc2lvbi5pZCkgeworICAgICAgICBSVENfTE9HKExTX0VSUk9SKSA8PCAiRXh0ZW5zaW9uIG5l Z290YXRpb24gZmFpbHVyZTogIiA8PCBleHRlbnNpb24udXJpCisgICAgICAgICAgICAgICAgICAg ICAgICAgIDw8ICIgd2FzIGlkZW50aWZpZWQgYnkgIiA8PCBpdC0+c2Vjb25kCisgICAgICAgICAg ICAgICAgICAgICAgICAgIDw8ICIgYnV0IGlzIHByb3Bvc2VkIGNoYW5nZWQgdG8gIiA8PCBleHRl bnNpb24uaWQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgIH0KKyAgICB9CisgIH0KICAg cmV0dXJuIHRydWU7CiB9CiAKQEAgLTk3LDcgKzEzOCw4IEBAIHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6 UnRwRXh0ZW5zaW9uPiBGaWx0ZXJSdHBFeHRlbnNpb25zKAogICAgIGJvb2wgKCpzdXBwb3J0ZWQp KGFic2w6OnN0cmluZ192aWV3KSwKICAgICBib29sIGZpbHRlcl9yZWR1bmRhbnRfZXh0ZW5zaW9u cywKICAgICBjb25zdCB3ZWJydGM6OldlYlJ0Y0tleVZhbHVlQ29uZmlnJiB0cmlhbHMpIHsKLSAg UlRDX0RDSEVDSyhWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucykpOworICAvLyBEb24n dCBjaGVjayBhZ2FpbnN0IG9sZCBwYXJhbWV0ZXJzOyB0aGlzIHNob3VsZCBoYXZlIGJlZW4gZG9u ZSBlYXJsaWVyLgorICBSVENfRENIRUNLKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25z LCB7fSkpOwogICBSVENfRENIRUNLKHN1cHBvcnRlZCk7CiAgIHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6 UnRwRXh0ZW5zaW9uPiByZXN1bHQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lLmgg Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUv d2VicnRjX21lZGlhX2VuZ2luZS5oCmluZGV4IDM0ZWM0Y2RjOWM0MzE4YjAzMjdhOGEwMzgyOWY1 YjBjMjE5ZjZmNjguLmZmOTc3NjA5YjJhYjNhZTBkMzNmMWEwZDU5OTE3NDFiMTlhNGE0ZTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlh L2VuZ2luZS93ZWJydGNfbWVkaWFfZW5naW5lLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y19tZWRpYV9lbmdpbmUuaApA QCAtNjMsOCArNjMsMTEgQEAgUlRDX0VYUE9SVCBzdGQ6OnVuaXF1ZV9wdHI8TWVkaWFFbmdpbmVJ bnRlcmZhY2U+IENyZWF0ZU1lZGlhRW5naW5lKAogICAgIE1lZGlhRW5naW5lRGVwZW5kZW5jaWVz IGRlcGVuZGVuY2llcyk7CiAKIC8vIFZlcmlmeSB0aGF0IGV4dGVuc2lvbiBJRHMgYXJlIHdpdGhp biAxLWJ5dGUgZXh0ZW5zaW9uIHJhbmdlIGFuZCBhcmUgbm90Ci0vLyBvdmVybGFwcGluZy4KLWJv b2wgVmFsaWRhdGVSdHBFeHRlbnNpb25zKGNvbnN0IHN0ZDo6dmVjdG9yPHdlYnJ0Yzo6UnRwRXh0 ZW5zaW9uPiYgZXh0ZW5zaW9ucyk7CisvLyBvdmVybGFwcGluZywgYW5kIHRoYXQgdGhleSBmb3Jt IGEgbGVnYWwgY2hhbmdlIGZyb20gcHJldmlvdXNseSByZWdpc3RlcmQKKy8vIGV4dGVuc2lvbnMg KGlmIGFueSkuCitib29sIFZhbGlkYXRlUnRwRXh0ZW5zaW9ucygKKyAgICBydGM6OkFycmF5Vmll dzxjb25zdCB3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZXh0ZW5uc2lvbnMsCisgICAgcnRjOjpBcnJh eVZpZXc8Y29uc3Qgd2VicnRjOjpSdHBFeHRlbnNpb24+IG9sZF9leHRlbnNpb25zKTsKIAogLy8g RGlzY2FyZCBhbnkgZXh0ZW5zaW9ucyBub3QgdmFsaWRhdGVkIGJ5IHRoZSAnc3VwcG9ydGVkJyBw cmVkaWNhdGUuIER1cGxpY2F0ZQogLy8gZXh0ZW5zaW9ucyBhcmUgcmVtb3ZlZCBpZiAnZmlsdGVy X3JlZHVuZGFudF9leHRlbnNpb25zJyBpcyBzZXQsIGFuZCBhbHNvIGFueQpkaWZmIC0tZ2l0IGEv U291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dl YnJ0Y19tZWRpYV9lbmdpbmVfdW5pdHRlc3QuY2MgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZV91bml0dGVz dC5jYwppbmRleCA3OGQxM2ZjMjk3Y2UzOTU0YzdkNmNlNjBlMGE3OWRhN2IwNzQ1YmUzLi44MTk4 MmZhZTJiMTUzMWNjMWYxNDMxN2UyMjdkNzBjNzVhZjE0MzRjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21l ZGlhX2VuZ2luZV91bml0dGVzdC5jYworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMv U291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX21lZGlhX2VuZ2luZV91bml0dGVzdC5j YwpAQCAtNjYsNDEgKzY2LDY4IEBAIGJvb2wgSXNTb3J0ZWQoY29uc3Qgc3RkOjp2ZWN0b3I8d2Vi cnRjOjpSdHBFeHRlbnNpb24+JiBleHRlbnNpb25zKSB7CiB9CiB9ICAvLyBuYW1lc3BhY2UKIAot VEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9uc19FbXB0eUxp c3QpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNF bXB0eUxpc3QpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zOwotICBF WFBFQ1RfVFJVRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucykpOworICBFWFBFQ1Rf VFJVRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywge30pKTsKIH0KIAotVEVTVChX ZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9uc19BbGxHb29kKSB7CitU RVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zQWxsR29vZCkg ewogICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0 ZW5zaW9ucygpOwotICBFWFBFQ1RfVFJVRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9u cykpOworICBFWFBFQ1RfVFJVRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywge30p KTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9u c19PdXRPZlJhbmdlSWRfTG93KSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRh dGVSdHBFeHRlbnNpb25zT3V0T2ZSYW5nZUlkX0xvdykgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRl bnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0ZW5zaW9ucygpOwogICBleHRlbnNpb25z LnB1c2hfYmFjayhSdHBFeHRlbnNpb24oImZvbyIsIDApKTsKLSAgRVhQRUNUX0ZBTFNFKFZhbGlk YXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zKSk7CisgIEVYUEVDVF9GQUxTRShWYWxpZGF0ZVJ0 cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywge30pKTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2lu ZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9uc19PdXRPZlJhbmdlSWRfSGlnaCkgeworVEVTVChX ZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9uc091dE9mUmFuZ2VJZEhp Z2gpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVVuaXF1 ZUV4dGVuc2lvbnMoKTsKICAgZXh0ZW5zaW9ucy5wdXNoX2JhY2soUnRwRXh0ZW5zaW9uKCJmb28i LCAyNTYpKTsKLSAgRVhQRUNUX0ZBTFNFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25z KSk7CisgIEVYUEVDVF9GQUxTRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywge30p KTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0ZW5zaW9u c19PdmVybGFwcGluZ0lkc19TdGFydE9mU2V0KSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVz dCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zT3ZlcmxhcHBpbmdJZHNTdGFydE9mU2V0KSB7CiAgIHN0 ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25z KCk7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lvbigiZm9vIiwgMSkpOwotICBF WFBFQ1RfRkFMU0UoVmFsaWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMpKTsKKyAgRVhQRUNU X0ZBTFNFKFZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7fSkpOwogfQogCi1URVNU KFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zX092ZXJsYXBwaW5n SWRzX0VuZE9mU2V0KSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBF eHRlbnNpb25zT3ZlcmxhcHBpbmdJZHNFbmRPZlNldCkgewogICBzdGQ6OnZlY3RvcjxSdHBFeHRl bnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0ZW5zaW9ucygpOwogICBleHRlbnNpb25z LnB1c2hfYmFjayhSdHBFeHRlbnNpb24oImZvbyIsIDI1NSkpOwotICBFWFBFQ1RfRkFMU0UoVmFs aWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMpKTsKKyAgRVhQRUNUX0ZBTFNFKFZhbGlkYXRl UnRwRXh0ZW5zaW9ucyhleHRlbnNpb25zLCB7fSkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5n aW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19FbXB0eUxpc3QpIHsKK1RFU1QoV2ViUnRjTWVk aWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lvbnNFbXB0eVRvRW1wdHkpIHsKKyAgc3Rk Ojp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zOworICBFWFBFQ1RfVFJVRShWYWxpZGF0 ZVJ0cEV4dGVuc2lvbnMoZXh0ZW5zaW9ucywgZXh0ZW5zaW9ucykpOworfQorCitURVNUKFdlYlJ0 Y01lZGlhRW5naW5lVGVzdCwgVmFsaWRhdGVSdHBFeHRlbnNpb25zTm9DaGFuZ2UpIHsKKyAgc3Rk Ojp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVVuaXF1ZUV4dGVuc2lvbnMo KTsKKyAgRVhQRUNUX1RSVUUoVmFsaWRhdGVSdHBFeHRlbnNpb25zKGV4dGVuc2lvbnMsIGV4dGVu c2lvbnMpKTsKK30KKworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIFZhbGlkYXRlUnRwRXh0 ZW5zaW9uc0NoYW5nZUlkTm90VXJsKSB7CisgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gb2xk X2V4dGVuc2lvbnMgPSBNYWtlVW5pcXVlRXh0ZW5zaW9ucygpOworICBzdGQ6OnZlY3RvcjxSdHBF eHRlbnNpb24+IG5ld19leHRlbnNpb25zID0gb2xkX2V4dGVuc2lvbnM7CisgIHN0ZDo6c3dhcChu ZXdfZXh0ZW5zaW9uc1swXS5pZCwgbmV3X2V4dGVuc2lvbnNbMV0uaWQpOworCisgIEVYUEVDVF9G QUxTRShWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMobmV3X2V4dGVuc2lvbnMsIG9sZF9leHRlbnNpb25z KSk7Cit9CisKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBWYWxpZGF0ZVJ0cEV4dGVuc2lv bnNDaGFuZ2VJZEZvclVybCkgeworICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IG9sZF9leHRl bnNpb25zID0gTWFrZVVuaXF1ZUV4dGVuc2lvbnMoKTsKKyAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5z aW9uPiBuZXdfZXh0ZW5zaW9ucyA9IG9sZF9leHRlbnNpb25zOworICAvLyBDaGFuZ2UgZmlyc3Qg ZXh0ZW5zaW9uIHRvIHNvbWV0aGluZyBub3QgZ2VuZXJhdGVkIGJ5IE1ha2VVbmlxdWVFeHRlbnNp b25zCisgIG5ld19leHRlbnNpb25zWzBdLmlkID0gMTIzOworCisgIEVYUEVDVF9GQUxTRShWYWxp ZGF0ZVJ0cEV4dGVuc2lvbnMobmV3X2V4dGVuc2lvbnMsIG9sZF9leHRlbnNpb25zKSk7Cit9CisK K1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zRW1wdHlMaXN0 KSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9uczsKICAgd2VicnRjOjpG aWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxzOwogICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4 dGVuc2lvbj4gZmlsdGVyZWQgPQpAQCAtMTA4LDcgKzEzNSw3IEBAIFRFU1QoV2ViUnRjTWVkaWFF bmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX0VtcHR5TGlzdCkgewogICBFWFBFQ1RfRVEo MHUsIGZpbHRlcmVkLnNpemUoKSk7CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBG aWx0ZXJSdHBFeHRlbnNpb25zX0luY2x1ZGVPbmx5U3VwcG9ydGVkKSB7CitURVNUKFdlYlJ0Y01l ZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc0luY2x1ZGVPbmx5U3VwcG9ydGVkKSB7 CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRl bnNpb25zKCk7CiAgIHdlYnJ0Yzo6RmllbGRUcmlhbEJhc2VkQ29uZmlnIHRyaWFsczsKICAgc3Rk Ojp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+IGZpbHRlcmVkID0KQEAgLTExOCw3ICsxNDUs NyBAQCBURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19JbmNs dWRlT25seVN1cHBvcnRlZCkgewogICBFWFBFQ1RfRVEoImkiLCBmaWx0ZXJlZFsxXS51cmkpOwog fQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19Tb3J0 ZWRCeU5hbWVfMSkgeworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVu c2lvbnNTb3J0ZWRCeU5hbWUxKSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4dGVuc2lvbj4gZXh0ZW5z aW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25zKCk7CiAgIHdlYnJ0Yzo6RmllbGRUcmlhbEJhc2Vk Q29uZmlnIHRyaWFsczsKICAgc3RkOjp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+IGZpbHRl cmVkID0KQEAgLTEyNyw3ICsxNTQsNyBAQCBURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmls dGVyUnRwRXh0ZW5zaW9uc19Tb3J0ZWRCeU5hbWVfMSkgewogICBFWFBFQ1RfVFJVRShJc1NvcnRl ZChmaWx0ZXJlZCkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRw RXh0ZW5zaW9uc19Tb3J0ZWRCeU5hbWVfMikgeworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3Qs IEZpbHRlclJ0cEV4dGVuc2lvbnNTb3J0ZWRCeU5hbWUyKSB7CiAgIHN0ZDo6dmVjdG9yPFJ0cEV4 dGVuc2lvbj4gZXh0ZW5zaW9ucyA9IE1ha2VVbmlxdWVFeHRlbnNpb25zKCk7CiAgIHdlYnJ0Yzo6 RmllbGRUcmlhbEJhc2VkQ29uZmlnIHRyaWFsczsKICAgc3RkOjp2ZWN0b3I8d2VicnRjOjpSdHBF eHRlbnNpb24+IGZpbHRlcmVkID0KQEAgLTEzNiw3ICsxNjMsNyBAQCBURVNUKFdlYlJ0Y01lZGlh RW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19Tb3J0ZWRCeU5hbWVfMikgewogICBFWFBF Q1RfVFJVRShJc1NvcnRlZChmaWx0ZXJlZCkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5l VGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19Eb250UmVtb3ZlUmVkdW5kYW50KSB7CitURVNUKFdl YlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc0RvbnRSZW1vdmVSZWR1bmRh bnQpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zID0gTWFrZVJlZHVu ZGFudEV4dGVuc2lvbnMoKTsKICAgd2VicnRjOjpGaWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxz OwogICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZmlsdGVyZWQgPQpAQCAtMTQ2 LDcgKzE3Myw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNp b25zX0RvbnRSZW1vdmVSZWR1bmRhbnQpIHsKICAgRVhQRUNUX0VRKGZpbHRlcmVkWzBdLnVyaSwg ZmlsdGVyZWRbMV0udXJpKTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRl clJ0cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50KSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5l VGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc1JlbW92ZVJlZHVuZGFudCkgewogICBzdGQ6OnZlY3Rv cjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnMgPSBNYWtlUmVkdW5kYW50RXh0ZW5zaW9ucygpOwog ICB3ZWJydGM6OkZpZWxkVHJpYWxCYXNlZENvbmZpZyB0cmlhbHM7CiAgIHN0ZDo6dmVjdG9yPHdl YnJ0Yzo6UnRwRXh0ZW5zaW9uPiBmaWx0ZXJlZCA9CkBAIC0xNTYsNyArMTgzLDcgQEAgVEVTVChX ZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50 KSB7CiAgIEVYUEVDVF9ORShmaWx0ZXJlZFswXS51cmksIGZpbHRlcmVkWzFdLnVyaSk7CiB9CiAK LVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1JlbW92ZVJl ZHVuZGFudEVuY3J5cHRlZF8xKSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVy UnRwRXh0ZW5zaW9uc1JlbW92ZVJlZHVuZGFudEVuY3J5cHRlZDEpIHsKICAgc3RkOjp2ZWN0b3I8 UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zOwogICBleHRlbnNpb25zLnB1c2hfYmFjayh3ZWJydGM6 OlJ0cEV4dGVuc2lvbigiYiIsIDEpKTsKICAgZXh0ZW5zaW9ucy5wdXNoX2JhY2sod2VicnRjOjpS dHBFeHRlbnNpb24oImIiLCAyLCB0cnVlKSk7CkBAIC0xNzMsNyArMjAwLDcgQEAgVEVTVChXZWJS dGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50RW5j cnlwdGVkXzEpIHsKICAgRVhQRUNUX05FKGZpbHRlcmVkWzFdLnVyaSwgZmlsdGVyZWRbMl0udXJp KTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNf UmVtb3ZlUmVkdW5kYW50RW5jcnlwdGVkXzIpIHsKK1RFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0 LCBGaWx0ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50RW5jcnlwdGVkMikgewogICBzdGQ6 OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNr KHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uKCJiIiwgMSwgdHJ1ZSkpOwogICBleHRlbnNpb25zLnB1c2hf YmFjayh3ZWJydGM6OlJ0cEV4dGVuc2lvbigiYiIsIDIpKTsKQEAgLTE5MCw3ICsyMTcsNyBAQCBU RVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1 bmRhbnRFbmNyeXB0ZWRfMikgewogICBFWFBFQ1RfTkUoZmlsdGVyZWRbMV0udXJpLCBmaWx0ZXJl ZFsyXS51cmkpOwogfQogCi1URVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0 ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnRCd2VfMSkgeworVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRl c3QsIEZpbHRlclJ0cEV4dGVuc2lvbnNSZW1vdmVSZWR1bmRhbnRCd2UxKSB7CiAgIHdlYnJ0Yzo6 dGVzdDo6U2NvcGVkRmllbGRUcmlhbHMgb3ZlcnJpZGVfZmllbGRfdHJpYWxzXygKICAgICAgICJX ZWJSVEMtRmlsdGVyQWJzU2VuZFRpbWVFeHRlbnNpb24vRW5hYmxlZC8iKTsKICAgd2VicnRjOjpG aWVsZFRyaWFsQmFzZWRDb25maWcgdHJpYWxzOwpAQCAtMjA5LDcgKzIzNiw3IEBAIFRFU1QoV2Vi UnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3 ZV8xKSB7CiB9CiAKIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LAotICAgICBGaWx0ZXJSdHBF eHRlbnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3ZV8xX0tlZXBBYnNTZW5kVGltZSkgeworICAgICBG aWx0ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50QndlMUtlZXBBYnNTZW5kVGltZSkgewog ICBzdGQ6OnZlY3RvcjxSdHBFeHRlbnNpb24+IGV4dGVuc2lvbnM7CiAgIGV4dGVuc2lvbnMucHVz aF9iYWNrKAogICAgICAgUnRwRXh0ZW5zaW9uKFJ0cEV4dGVuc2lvbjo6a1RyYW5zcG9ydFNlcXVl bmNlTnVtYmVyVXJpLCAzKSk7CkBAIC0yMjYsNyArMjUzLDcgQEAgVEVTVChXZWJSdGNNZWRpYUVu Z2luZVRlc3QsCiAgIEVYUEVDVF9FUShSdHBFeHRlbnNpb246OmtBYnNTZW5kVGltZVVyaSwgZmls dGVyZWRbMV0udXJpKTsKIH0KIAotVEVTVChXZWJSdGNNZWRpYUVuZ2luZVRlc3QsIEZpbHRlclJ0 cEV4dGVuc2lvbnNfUmVtb3ZlUmVkdW5kYW50QndlRW5jcnlwdGVkXzEpIHsKK1RFU1QoV2ViUnRj TWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zUmVtb3ZlUmVkdW5kYW50QndlRW5j cnlwdGVkMSkgewogICB3ZWJydGM6OnRlc3Q6OlNjb3BlZEZpZWxkVHJpYWxzIG92ZXJyaWRlX2Zp ZWxkX3RyaWFsc18oCiAgICAgICAiV2ViUlRDLUZpbHRlckFic1NlbmRUaW1lRXh0ZW5zaW9uL0Vu YWJsZWQvIik7CiAgIHdlYnJ0Yzo6RmllbGRUcmlhbEJhc2VkQ29uZmlnIHRyaWFsczsKQEAgLTI1 MSw3ICsyNzgsNyBAQCBURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5z aW9uc19SZW1vdmVSZWR1bmRhbnRCd2VFbmNyeXB0ZWRfMSkgewogfQogCiBURVNUKFdlYlJ0Y01l ZGlhRW5naW5lVGVzdCwKLSAgICAgRmlsdGVyUnRwRXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnRC d2VFbmNyeXB0ZWRfMV9LZWVwQWJzU2VuZFRpbWUpIHsKKyAgICAgRmlsdGVyUnRwRXh0ZW5zaW9u c1JlbW92ZVJlZHVuZGFudEJ3ZUVuY3J5cHRlZDFLZWVwQWJzU2VuZFRpbWUpIHsKICAgc3RkOjp2 ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25zOwogICBleHRlbnNpb25zLnB1c2hfYmFjaygK ICAgICAgIFJ0cEV4dGVuc2lvbihSdHBFeHRlbnNpb246OmtUcmFuc3BvcnRTZXF1ZW5jZU51bWJl clVyaSwgMykpOwpAQCAtMjc0LDcgKzMwMSw3IEBAIFRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0 LAogICBFWFBFQ1RfTkUoZmlsdGVyZWRbMF0uZW5jcnlwdCwgZmlsdGVyZWRbMV0uZW5jcnlwdCk7 CiB9CiAKLVRFU1QoV2ViUnRjTWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1Jl bW92ZVJlZHVuZGFudEJ3ZV8yKSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVy UnRwRXh0ZW5zaW9uc1JlbW92ZVJlZHVuZGFudEJ3ZTIpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0 ZW5zaW9uPiBleHRlbnNpb25zOwogICBleHRlbnNpb25zLnB1c2hfYmFjayhSdHBFeHRlbnNpb24o UnRwRXh0ZW5zaW9uOjprVGltZXN0YW1wT2Zmc2V0VXJpLCAxKSk7CiAgIGV4dGVuc2lvbnMucHVz aF9iYWNrKFJ0cEV4dGVuc2lvbihSdHBFeHRlbnNpb246OmtBYnNTZW5kVGltZVVyaSwgMTQpKTsK QEAgLTI4Niw3ICszMTMsNyBAQCBURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRw RXh0ZW5zaW9uc19SZW1vdmVSZWR1bmRhbnRCd2VfMikgewogICBFWFBFQ1RfRVEoUnRwRXh0ZW5z aW9uOjprQWJzU2VuZFRpbWVVcmksIGZpbHRlcmVkWzBdLnVyaSk7CiB9CiAKLVRFU1QoV2ViUnRj TWVkaWFFbmdpbmVUZXN0LCBGaWx0ZXJSdHBFeHRlbnNpb25zX1JlbW92ZVJlZHVuZGFudEJ3ZV8z KSB7CitURVNUKFdlYlJ0Y01lZGlhRW5naW5lVGVzdCwgRmlsdGVyUnRwRXh0ZW5zaW9uc1JlbW92 ZVJlZHVuZGFudEJ3ZTMpIHsKICAgc3RkOjp2ZWN0b3I8UnRwRXh0ZW5zaW9uPiBleHRlbnNpb25z OwogICBleHRlbnNpb25zLnB1c2hfYmFjayhSdHBFeHRlbnNpb24oUnRwRXh0ZW5zaW9uOjprVGlt ZXN0YW1wT2Zmc2V0VXJpLCAyKSk7CiAgIGV4dGVuc2lvbnMucHVzaF9iYWNrKFJ0cEV4dGVuc2lv bihSdHBFeHRlbnNpb246OmtUaW1lc3RhbXBPZmZzZXRVcmksIDE0KSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2Vi cnRjX3ZpZGVvX2VuZ2luZS5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uv d2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdmlkZW9fZW5naW5lLmNjCmluZGV4IGVhMjI5OGJj MjMwNTI3Mzg3MTc0YWFmZWUyNWFiYWYyMDExMDRlZjguLjM5ZTNjYzU0NmE5NDZhNzE0ZjdkZDZl NWNjNzhhZmRiNWZlZDdiMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0 Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93ZWJydGNfdmlkZW9fZW5naW5lLmNjCisrKyBi L1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21lZGlhL2VuZ2luZS93 ZWJydGNfdmlkZW9fZW5naW5lLmNjCkBAIC04MDgsNyArODA4LDcgQEAgYm9vbCBXZWJSdGNWaWRl b0NoYW5uZWw6OkdldENoYW5nZWRTZW5kUGFyYW1ldGVycygKICAgICBjb25zdCBWaWRlb1NlbmRQ YXJhbWV0ZXJzJiBwYXJhbXMsCiAgICAgQ2hhbmdlZFNlbmRQYXJhbWV0ZXJzKiBjaGFuZ2VkX3Bh cmFtcykgY29uc3QgewogICBpZiAoIVZhbGlkYXRlQ29kZWNGb3JtYXRzKHBhcmFtcy5jb2RlY3Mp IHx8Ci0gICAgICAhVmFsaWRhdGVSdHBFeHRlbnNpb25zKHBhcmFtcy5leHRlbnNpb25zKSkgewor ICAgICAgIVZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhwYXJhbXMuZXh0ZW5zaW9ucywgc2VuZF9ydHBf ZXh0ZW5zaW9uc18pKSB7CiAgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKQEAgLTg0Myw3ICs4NDMs NyBAQCBib29sIFdlYlJ0Y1ZpZGVvQ2hhbm5lbDo6R2V0Q2hhbmdlZFNlbmRQYXJhbWV0ZXJzKAog ICBzdGQ6OnZlY3Rvcjx3ZWJydGM6OlJ0cEV4dGVuc2lvbj4gZmlsdGVyZWRfZXh0ZW5zaW9ucyA9 IEZpbHRlclJ0cEV4dGVuc2lvbnMoCiAgICAgICBwYXJhbXMuZXh0ZW5zaW9ucywgd2VicnRjOjpS dHBFeHRlbnNpb246OklzU3VwcG9ydGVkRm9yVmlkZW8sIHRydWUsCiAgICAgICBjYWxsXy0+dHJp YWxzKCkpOwotICBpZiAoIXNlbmRfcnRwX2V4dGVuc2lvbnNfIHx8ICgqc2VuZF9ydHBfZXh0ZW5z aW9uc18gIT0gZmlsdGVyZWRfZXh0ZW5zaW9ucykpIHsKKyAgaWYgKHNlbmRfcnRwX2V4dGVuc2lv bnNfICE9IGZpbHRlcmVkX2V4dGVuc2lvbnMpIHsKICAgICBjaGFuZ2VkX3BhcmFtcy0+cnRwX2hl YWRlcl9leHRlbnNpb25zID0KICAgICAgICAgYWJzbDo6b3B0aW9uYWw8c3RkOjp2ZWN0b3I8d2Vi cnRjOjpSdHBFeHRlbnNpb24+PihmaWx0ZXJlZF9leHRlbnNpb25zKTsKICAgfQpAQCAtOTkwLDcg Kzk5MCw3IEBAIGJvb2wgV2ViUnRjVmlkZW9DaGFubmVsOjpBcHBseUNoYW5nZWRQYXJhbXMoCiAg ICAgU2V0RXh0bWFwQWxsb3dNaXhlZCgqY2hhbmdlZF9wYXJhbXMuZXh0bWFwX2FsbG93X21peGVk KTsKICAgfQogICBpZiAoY2hhbmdlZF9wYXJhbXMucnRwX2hlYWRlcl9leHRlbnNpb25zKSB7Ci0g ICAgc2VuZF9ydHBfZXh0ZW5zaW9uc18gPSBjaGFuZ2VkX3BhcmFtcy5ydHBfaGVhZGVyX2V4dGVu c2lvbnM7CisgICAgc2VuZF9ydHBfZXh0ZW5zaW9uc18gPSAqY2hhbmdlZF9wYXJhbXMucnRwX2hl YWRlcl9leHRlbnNpb25zOwogICB9CiAKICAgaWYgKGNoYW5nZWRfcGFyYW1zLnNlbmRfY29kZWMg fHwgY2hhbmdlZF9wYXJhbXMubWF4X2JhbmR3aWR0aF9icHMpIHsKQEAgLTExNjcsNyArMTE2Nyw3 IEBAIGJvb2wgV2ViUnRjVmlkZW9DaGFubmVsOjpHZXRDaGFuZ2VkUmVjdlBhcmFtZXRlcnMoCiAg ICAgY29uc3QgVmlkZW9SZWN2UGFyYW1ldGVycyYgcGFyYW1zLAogICAgIENoYW5nZWRSZWN2UGFy YW1ldGVycyogY2hhbmdlZF9wYXJhbXMpIGNvbnN0IHsKICAgaWYgKCFWYWxpZGF0ZUNvZGVjRm9y bWF0cyhwYXJhbXMuY29kZWNzKSB8fAotICAgICAgIVZhbGlkYXRlUnRwRXh0ZW5zaW9ucyhwYXJh bXMuZXh0ZW5zaW9ucykpIHsKKyAgICAgICFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4 dGVuc2lvbnMsIHJlY3ZfcnRwX2V4dGVuc2lvbnNfKSkgewogICAgIHJldHVybiBmYWxzZTsKICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZpZGVvX2VuZ2luZS5oIGIvU291cmNlL1RoaXJkUGFydHkv bGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192aWRlb19lbmdpbmUu aAppbmRleCA5YjhiYTBiNzRiMDJjYjliZjdiNjZjY2Q4ZTA2YzMwYmM1ZTllMjQ4Li42NjAyMzE5 NmIxMGRjY2ZlYWUzNTM4NGY3YzgzNzYyZTM2MDQzOWIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZpZGVv X2VuZ2luZS5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRj L21lZGlhL2VuZ2luZS93ZWJydGNfdmlkZW9fZW5naW5lLmgKQEAgLTYwMSw3ICs2MDEsNyBAQCBj bGFzcyBXZWJSdGNWaWRlb0NoYW5uZWwgOiBwdWJsaWMgVmlkZW9NZWRpYUNoYW5uZWwsCiAgIHN0 ZDo6dmVjdG9yPFZpZGVvQ29kZWNTZXR0aW5ncz4gbmVnb3RpYXRlZF9jb2RlY3NfCiAgICAgICBS VENfR1VBUkRFRF9CWSh0aHJlYWRfY2hlY2tlcl8pOwogCi0gIGFic2w6Om9wdGlvbmFsPHN0ZDo6 dmVjdG9yPHdlYnJ0Yzo6UnRwRXh0ZW5zaW9uPj4gc2VuZF9ydHBfZXh0ZW5zaW9uc18KKyAgc3Rk Ojp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+IHNlbmRfcnRwX2V4dGVuc2lvbnNfCiAgICAg ICBSVENfR1VBUkRFRF9CWSh0aHJlYWRfY2hlY2tlcl8pOwogCiAgIHdlYnJ0Yzo6VmlkZW9FbmNv ZGVyRmFjdG9yeSogY29uc3QgZW5jb2Rlcl9mYWN0b3J5XwpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvbWVkaWEvZW5naW5lL3dlYnJ0Y192b2lj ZV9lbmdpbmUuY2MgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9t ZWRpYS9lbmdpbmUvd2VicnRjX3ZvaWNlX2VuZ2luZS5jYwppbmRleCA0NDhhZDM1MjJhMGQ1NTYy ZGZjZDQ3YjNkNGRiMzdiZjUwYTcwOGFlLi43Y2U1MDYzY2ZlMTIwNzExMmE5NTkwMGZjNWE4NDhi YzQ4YTY4MDE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl L3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3ZvaWNlX2VuZ2luZS5jYworKysgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tZWRpYS9lbmdpbmUvd2VicnRjX3Zv aWNlX2VuZ2luZS5jYwpAQCAtMTM4NCw3ICsxMzg0LDcgQEAgYm9vbCBXZWJSdGNWb2ljZU1lZGlh Q2hhbm5lbDo6U2V0U2VuZFBhcmFtZXRlcnMoCiAgICAgcmV0dXJuIGZhbHNlOwogICB9CiAKLSAg aWYgKCFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4dGVuc2lvbnMpKSB7CisgIGlmICgh VmFsaWRhdGVSdHBFeHRlbnNpb25zKHBhcmFtcy5leHRlbnNpb25zLCBzZW5kX3J0cF9leHRlbnNp b25zXykpIHsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KIApAQCAtMTQzMCw3ICsxNDMwLDcgQEAg Ym9vbCBXZWJSdGNWb2ljZU1lZGlhQ2hhbm5lbDo6U2V0UmVjdlBhcmFtZXRlcnMoCiAgICAgcmV0 dXJuIGZhbHNlOwogICB9CiAKLSAgaWYgKCFWYWxpZGF0ZVJ0cEV4dGVuc2lvbnMocGFyYW1zLmV4 dGVuc2lvbnMpKSB7CisgIGlmICghVmFsaWRhdGVSdHBFeHRlbnNpb25zKHBhcmFtcy5leHRlbnNp b25zLCByZWN2X3J0cF9leHRlbnNpb25zXykpIHsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KICAg c3RkOjp2ZWN0b3I8d2VicnRjOjpSdHBFeHRlbnNpb24+IGZpbHRlcmVkX2V4dGVuc2lvbnMgPSBG aWx0ZXJSdHBFeHRlbnNpb25zKApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2Vi cnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9ydHBfcnRjcC9zb3VyY2UvcnRwX2hlYWRlcl9leHRl bnNpb25fbWFwLmNjIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMv bW9kdWxlcy9ydHBfcnRjcC9zb3VyY2UvcnRwX2hlYWRlcl9leHRlbnNpb25fbWFwLmNjCmluZGV4 IDU0MWU1NzBlZDg4MmFkODBiMmE4YjQwNjlmNDFkMWY1OWMwZTZmMmMuLjA1ODQ4MjNhNTZiZjhj OGNiZGRiOTE1ZDI0ZGIwOGE5MmQ4NWQ5M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5 L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVsZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFk ZXJfZXh0ZW5zaW9uX21hcC5jYworKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291 cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBfaGVhZGVyX2V4dGVuc2lvbl9t YXAuY2MKQEAgLTE2MSw3ICsxNjEsMTIgQEAgYm9vbCBSdHBIZWFkZXJFeHRlbnNpb25NYXA6OlJl Z2lzdGVyKGludCBpZCwKICAgICAgICAgICAgICAgICAgICAgICAgIDw8IHN0YXRpY19jYXN0PGlu dD4ocmVnaXN0ZXJlZF90eXBlKTsKICAgICByZXR1cm4gZmFsc2U7CiAgIH0KLSAgUlRDX0RDSEVD SyghSXNSZWdpc3RlcmVkKHR5cGUpKTsKKyAgaWYgKElzUmVnaXN0ZXJlZCh0eXBlKSkgeworICAg IFJUQ19MT0coTFNfV0FSTklORykgPDwgIklsbGVnYWwgcmVyZWdpc3RyYXRpb24gZm9yIHVyaTog IiA8PCB1cmkKKyAgICAgICAgICAgICAgICAgICAgICAgIDw8ICIgaXMgcHJldmlvdXNseSByZWdp c3RlcmVkIHdpdGggaWQgIiA8PCBHZXRJZCh0eXBlKQorICAgICAgICAgICAgICAgICAgICAgICAg PDwgIiBhbmQgY2Fubm90IGJlIHJlcmVnaXN0ZXJlZCB3aXRoIGlkICIgPDwgaWQ7CisgICAgcmV0 dXJuIGZhbHNlOworICB9CiAKICAgLy8gVGhlcmUgaXMgYSBydW4tdGltZSBjaGVjayBhYm92ZSBp ZCBmaXRzIGludG8gdWludDhfdC4KICAgaWRzX1t0eXBlXSA9IHN0YXRpY19jYXN0PHVpbnQ4X3Q+ KGlkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2Vi cnRjL21vZHVsZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF91bml0 dGVzdC5jYyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL21vZHVs ZXMvcnRwX3J0Y3Avc291cmNlL3J0cF9oZWFkZXJfZXh0ZW5zaW9uX21hcF91bml0dGVzdC5jYwpp bmRleCA5MWJiMjUyNzczMmFkODJkNmE0ZTQ0ODA0M2FjMzUyNmRlMjM4Zjk5Li4wMzI2YjQ1ZmU3 ZDBiMGUyOGIzMjBiODdlYzAyNzFmMGQ1OGEyODRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9tb2R1bGVzL3J0cF9ydGNwL3NvdXJjZS9ydHBf aGVhZGVyX2V4dGVuc2lvbl9tYXBfdW5pdHRlc3QuY2MKKysrIGIvU291cmNlL1RoaXJkUGFydHkv bGlid2VicnRjL1NvdXJjZS93ZWJydGMvbW9kdWxlcy9ydHBfcnRjcC9zb3VyY2UvcnRwX2hlYWRl cl9leHRlbnNpb25fbWFwX3VuaXR0ZXN0LmNjCkBAIC0xMDYsNCArMTA2LDEwIEBAIFRFU1QoUnRw SGVhZGVyRXh0ZW5zaW9uVGVzdCwgR2V0SWQpIHsKICAgRVhQRUNUX0VRKDMsIG1hcC5HZXRJZChU cmFuc21pc3Npb25PZmZzZXQ6OmtJZCkpOwogfQogCitURVNUKFJ0cEhlYWRlckV4dGVuc2lvblRl c3QsIFJlbWFwRmFpbHMpIHsKKyAgUnRwSGVhZGVyRXh0ZW5zaW9uTWFwIG1hcDsKKyAgRVhQRUNU X1RSVUUobWFwLlJlZ2lzdGVyPFRyYW5zbWlzc2lvbk9mZnNldD4oMykpOworICBFWFBFQ1RfRkFM U0UobWFwLlJlZ2lzdGVyPFRyYW5zbWlzc2lvbk9mZnNldD4oNCkpOworfQorCiB9ICAvLyBuYW1l c3BhY2Ugd2VicnRjCg==