205922 2020-01-08 05:56:47 -0800 RemoteVideoSample should be able to support canvas video samples 2020-01-17 13:15:46 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson ews-watchlist glenn jer.noble philipj sergio tsavell webkit-bug-importer youennf oldest_to_newest 1604059 0 youennf 2020-01-08 05:56:47 -0800 RemoteVideoSample should be able to support canvas video samples 1604060 1 387100 youennf 2020-01-08 06:03:30 -0800 Created attachment 387100 Patch 1604125 2 387100 eric.carlson 2020-01-08 09:21:27 -0800 Comment on attachment 387100 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=387100&action=review > Source/WebCore/platform/graphics/RemoteVideoSample.cpp:56 > + auto ioSurface = IOSurface::create(size, sRGBColorSpaceRef(), IOSurface::Format::RGBA); Minor nit: you might as well move this down a few lines in case CVPixelBufferLockBaseAddress fails. > Source/WebCore/platform/graphics/RemoteVideoSample.cpp:109 > + RELEASE_LOG_ERROR(Media, "RemoteVideoSample::create: CVPixelBufferGetIOSurface returned nullptr"); This log message is now incorrect. > LayoutTests/http/wpt/mediarecorder/MediaRecorder-AV-audio-video-dataavailable-gpuprocess-expected.txt:5 > +Harness Error (TIMEOUT), message = null > + > +TIMEOUT Verify MediaRecorder is working in GPUProcess Test timed out Maybe add a comment to the ChangeLog about why the new test fails? 1604549 3 youennf 2020-01-09 01:37:04 -0800 (In reply to Eric Carlson from comment #2) > Comment on attachment 387100 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=387100&action=review > > > Source/WebCore/platform/graphics/RemoteVideoSample.cpp:56 > > + auto ioSurface = IOSurface::create(size, sRGBColorSpaceRef(), IOSurface::Format::RGBA); > > Minor nit: you might as well move this down a few lines in case > CVPixelBufferLockBaseAddress fails. OK > > Source/WebCore/platform/graphics/RemoteVideoSample.cpp:109 > > + RELEASE_LOG_ERROR(Media, "RemoteVideoSample::create: CVPixelBufferGetIOSurface returned nullptr"); > > This log message is now incorrect. Updated. > > LayoutTests/http/wpt/mediarecorder/MediaRecorder-AV-audio-video-dataavailable-gpuprocess-expected.txt:5 > > +Harness Error (TIMEOUT), message = null > > + > > +TIMEOUT Verify MediaRecorder is working in GPUProcess Test timed out > > Maybe add a comment to the ChangeLog about why the new test fails? Last minute change to the test made it fail, it is missing a t.done. Will fix it. 1604550 4 387200 youennf 2020-01-09 01:37:46 -0800 Created attachment 387200 Patch for landing 1604580 5 387200 commit-queue 2020-01-09 06:31:16 -0800 Comment on attachment 387200 Patch for landing Clearing flags on attachment: 387200 Committed r254256: <https://trac.webkit.org/changeset/254256> 1604581 6 commit-queue 2020-01-09 06:31:17 -0800 All reviewed patches have been landed. Closing bug. 1604585 7 webkit-bug-importer 2020-01-09 06:32:13 -0800 <rdar://problem/58442026> 1608171 8 tsavell 2020-01-17 13:15:46 -0800 The new test http/wpt/mediarecorder/MediaRecorder-AV-audio-video-dataavailable-gpuprocess.html added in https://trac.webkit.org/changeset/254256/webkit is a flaky failure on Mojave wk2 Tracking in https://bugs.webkit.org/show_bug.cgi?id=206437 387100 2020-01-08 06:03:30 -0800 2020-01-09 01:37:42 -0800 Patch bug-205922-20200108150328.patch text/plain 12114 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MTkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGExMzlhZTVkY2Q0ZWE3 MDU3YTBhZjJmMGQ4ODY2YjQwMGYzZmY0ZC4uZDAxZDM3YzRkMTI2OWQ1ODkyN2QyNjcwOTIxOWFk YmExNmI5MzkwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTA4ICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVWaWRlb1NhbXBs ZSBzaG91bGQgYmUgYWJsZSB0byBzdXBwb3J0IGNhbnZhcyB2aWRlbyBzYW1wbGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU5MjIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDYW52YXMgY2FwdHVyZSBp cyBwcm9kdWNpbmcgdmlkZW8gc2FtcGxlcyB0aGF0IGFyZSBub3QgSU9TdXJmYWNlIGJhY2tlZC4K KyAgICAgICAgVGhpcyBtYWtlcyBpdCBpbXBvc3NpYmxlIHRvIHNlbmQgdGhlbSB0aHJvdWdoIElQ QyB2aWEgUmVtb3RlVmlkZW9TYW1wbGUuCisgICAgICAgIFdlIGJlZWYgdXAgUmVtb3RlVmlkZW9T YW1wbGUgdG8gY3JlYXRlIGFuIElPU3VyZmFjZSBmb3IgUkdCQSB2aWRlbyBzYW1wbGVzLgorCisg ICAgICAgIFRlc3Q6IGh0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRp by12aWRlby1kYXRhYXZhaWxhYmxlLWdwdXByb2Nlc3MuaHRtbAorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvUmVtb3RlVmlkZW9TYW1wbGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dHJh bnNmZXJCR1JBUGl4ZWxCdWZmZXJUb0lPU3VyZmFjZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW1v dGVWaWRlb1NhbXBsZTo6Y3JlYXRlKToKKwogMjAyMC0wMS0wOCAgeW91ZW5uIGZhYmxldCAgPHlv dWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IE1lZGlhUmVjb3JkZXIgYmFja2Vu ZCBpbiBHUFVQcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9SZW1vdGVWaWRlb1NhbXBsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9SZW1vdGVWaWRlb1NhbXBsZS5jcHAKaW5kZXggNmMxZjg5ZmZlMGRlYTgxZjk5ZDM1ZTg3 YzEwYjEwYzYyZjU3ZTQ4Ny4uNjY4YjI4YzNmMmY2YmEyODI1Nzk2MWVkZTk5ZGY2NzkxZGNjYzA5 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVtb3RlVmlk ZW9TYW1wbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JlbW90 ZVZpZGVvU2FtcGxlLmNwcApAQCAtMjgsOSArMjgsMTQgQEAKIAogI2lmIEVOQUJMRShNRURJQV9T VFJFQU0pICYmIFBMQVRGT1JNKENPQ09BKQogCisjaW5jbHVkZSAiSU9TdXJmYWNlLmgiCiAjaW5j bHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk1lZGlhU2FtcGxlLmgiCiAKKyNpZiBVU0UoQUND RUxFUkFURSkKKyNpbmNsdWRlIDxBY2NlbGVyYXRlL0FjY2VsZXJhdGUuaD4KKyNlbmRpZgorCiAj aWYgSEFWRShJT1NVUkZBQ0UpCiAjaW5jbHVkZSAiR3JhcGhpY3NDb250ZXh0Q0cuaCIKICNlbmRp ZgpAQCAtNDIsNiArNDcsNDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogdXNpbmcgbmFtZXNwYWNl IFBBTDsKIAogI2lmIEhBVkUoSU9TVVJGQUNFKQorc3RhdGljIGlubGluZSBzdGQ6OnVuaXF1ZV9w dHI8SU9TdXJmYWNlPiB0cmFuc2ZlckJHUkFQaXhlbEJ1ZmZlclRvSU9TdXJmYWNlKENWUGl4ZWxC dWZmZXJSZWYgcGl4ZWxCdWZmZXIpCit7CisjaWYgVVNFKEFDQ0VMRVJBVEUpCisgICAgQVNTRVJU KENWUGl4ZWxCdWZmZXJHZXRQaXhlbEZvcm1hdFR5cGUocGl4ZWxCdWZmZXIpID09IGtDVlBpeGVs Rm9ybWF0VHlwZV8zMkJHUkEpOworCisgICAgSW50U2l6ZSBzaXplIHsgc3RhdGljX2Nhc3Q8aW50 PihDVlBpeGVsQnVmZmVyR2V0V2lkdGgocGl4ZWxCdWZmZXIpKSwgc3RhdGljX2Nhc3Q8aW50PihD VlBpeGVsQnVmZmVyR2V0SGVpZ2h0KHBpeGVsQnVmZmVyKSkgfTsKKyAgICBhdXRvIGlvU3VyZmFj ZSA9ICBJT1N1cmZhY2U6OmNyZWF0ZShzaXplLCBzUkdCQ29sb3JTcGFjZVJlZigpLCBJT1N1cmZh Y2U6OkZvcm1hdDo6UkdCQSk7CisKKyAgICBhdXRvIHJlc3VsdCA9IENWUGl4ZWxCdWZmZXJMb2Nr QmFzZUFkZHJlc3MocGl4ZWxCdWZmZXIsIGtDVlBpeGVsQnVmZmVyTG9ja19SZWFkT25seSk7Cisg ICAgQVNTRVJUKHJlc3VsdCA9PSBrQ1ZSZXR1cm5TdWNjZXNzKTsKKyAgICBpZiAocmVzdWx0ICE9 IGtDVlJldHVyblN1Y2Nlc3MpIHsKKyAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJ0 cmFuc2ZlckJHUkFQaXhlbEJ1ZmZlclRvSU9TdXJmYWNlIENWUGl4ZWxCdWZmZXJMb2NrQmFzZUFk ZHJlc3MoKSByZXR1cm5lZCBlcnJvciBjb2RlICVkIiwgcmVzdWx0KTsKKyAgICAgICAgcmV0dXJu IG51bGxwdHI7CisgICAgfQorCisgICAgSU9TdXJmYWNlOjpMb2NrZXIgbG9jaygqaW9TdXJmYWNl KTsKKyAgICB2SW1hZ2VfQnVmZmVyIHNyYzsKKyAgICBzcmMud2lkdGggPSBzaXplLndpZHRoKCk7 CisgICAgc3JjLmhlaWdodCA9IHNpemUuaGVpZ2h0KCk7CisgICAgc3JjLnJvd0J5dGVzID0gQ1ZQ aXhlbEJ1ZmZlckdldEJ5dGVzUGVyUm93KHBpeGVsQnVmZmVyKTsKKyAgICBzcmMuZGF0YSA9IENW UGl4ZWxCdWZmZXJHZXRCYXNlQWRkcmVzcyhwaXhlbEJ1ZmZlcik7CisKKyAgICB2SW1hZ2VfQnVm ZmVyIGRlc3Q7CisgICAgZGVzdC53aWR0aCA9IHNpemUud2lkdGgoKTsKKyAgICBkZXN0LmhlaWdo dCA9IHNpemUuaGVpZ2h0KCk7CisgICAgZGVzdC5yb3dCeXRlcyA9IGlvU3VyZmFjZS0+Ynl0ZXNQ ZXJSb3coKTsKKyAgICBkZXN0LmRhdGEgPSBsb2NrLnN1cmZhY2VCYXNlQWRkcmVzcygpOworCisg ICAgdkltYWdlVW5wcmVtdWx0aXBseURhdGFfQkdSQTg4ODgoJnNyYywgJmRlc3QsIGt2SW1hZ2VO b0ZsYWdzKTsKKworICAgIHJlc3VsdCA9IENWUGl4ZWxCdWZmZXJVbmxvY2tCYXNlQWRkcmVzcyhw aXhlbEJ1ZmZlciwga0NWUGl4ZWxCdWZmZXJMb2NrX1JlYWRPbmx5KTsKKyAgICBBU1NFUlQocmVz dWx0ID09IGtDVlJldHVyblN1Y2Nlc3MpOworICAgIGlmIChyZXN1bHQgIT0ga0NWUmV0dXJuU3Vj Y2VzcykgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgInRyYW5zZmVyQkdSQVBp eGVsQnVmZmVyVG9JT1N1cmZhY2UgQ1ZQaXhlbEJ1ZmZlclVubG9ja0Jhc2VBZGRyZXNzKCkgcmV0 dXJuZWQgZXJyb3IgY29kZSAlZCIsIHJlc3VsdCk7CisgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgIH0KKyAgICByZXR1cm4gaW9TdXJmYWNlOworI2Vsc2UKKyAgICBSRUxFQVNFX0xPR19FUlJP UihNZWRpYSwgInRyYW5zZmVyQkdSQVBpeGVsQnVmZmVyVG9JT1N1cmZhY2UgY2Fubm90IGNvbnZl cnQgdG8gSU9TdXJmYWNlIik7CisgICAgcmV0dXJuIG51bGxwdHI7CisjZW5kaWYKK30KKwogc3Rk Ojp1bmlxdWVfcHRyPFJlbW90ZVZpZGVvU2FtcGxlPiBSZW1vdGVWaWRlb1NhbXBsZTo6Y3JlYXRl KE1lZGlhU2FtcGxlJiBzYW1wbGUpCiB7CiAgICAgQVNTRVJUKHNhbXBsZS5wbGF0Zm9ybVNhbXBs ZSgpLnR5cGUgPT0gUGxhdGZvcm1TYW1wbGU6OkNNU2FtcGxlQnVmZmVyVHlwZSk7CkBAIC01Miwx MCArMTAwLDIxIEBAIHN0ZDo6dW5pcXVlX3B0cjxSZW1vdGVWaWRlb1NhbXBsZT4gUmVtb3RlVmlk ZW9TYW1wbGU6OmNyZWF0ZShNZWRpYVNhbXBsZSYgc2FtcGxlCiAgICAgICAgIHJldHVybiBudWxs cHRyOwogICAgIH0KIAorICAgIHN0ZDo6dW5pcXVlX3B0cjxJT1N1cmZhY2U+IGlvU3VyZmFjZTsK ICAgICBhdXRvIHN1cmZhY2UgPSBDVlBpeGVsQnVmZmVyR2V0SU9TdXJmYWNlKGltYWdlQnVmZmVy KTsKICAgICBpZiAoIXN1cmZhY2UpIHsKLSAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEs ICJSZW1vdGVWaWRlb1NhbXBsZTo6Y3JlYXRlOiBDVlBpeGVsQnVmZmVyR2V0SU9TdXJmYWNlIHJl dHVybmVkIG51bGxwdHIiKTsKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIC8vIFNw ZWNpYWwgY2FzZSBmb3IgY2FudmFzIGRhdGEgdGhhdCBpcyBSR0JBLCBub3QgSU9TdXJmYWNlIGJh Y2tlZC4KKyAgICAgICAgYXV0byBwaXhlbEZvcm1hdFR5cGUgPSBDVlBpeGVsQnVmZmVyR2V0UGl4 ZWxGb3JtYXRUeXBlKGltYWdlQnVmZmVyKTsKKyAgICAgICAgaWYgKHBpeGVsRm9ybWF0VHlwZSAh PSBrQ1ZQaXhlbEZvcm1hdFR5cGVfMzJCR1JBKSB7CisgICAgICAgICAgICBSRUxFQVNFX0xPR19F UlJPUihNZWRpYSwgIlJlbW90ZVZpZGVvU2FtcGxlOjpjcmVhdGU6IENWUGl4ZWxCdWZmZXJHZXRJ T1N1cmZhY2UgcmV0dXJuZWQgbnVsbHB0ciIpOworICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7 CisgICAgICAgIH0KKworICAgICAgICBpb1N1cmZhY2UgPSB0cmFuc2ZlckJHUkFQaXhlbEJ1ZmZl clRvSU9TdXJmYWNlKGltYWdlQnVmZmVyKTsKKyAgICAgICAgaWYgKCFpb1N1cmZhY2UpCisgICAg ICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBzdXJmYWNlID0gaW9TdXJmYWNlLT5z dXJmYWNlKCk7CiAgICAgfQogCiAgICAgcmV0dXJuIHN0ZDo6dW5pcXVlX3B0cjxSZW1vdGVWaWRl b1NhbXBsZT4obmV3IFJlbW90ZVZpZGVvU2FtcGxlKHN1cmZhY2UsIHNSR0JDb2xvclNwYWNlUmVm KCksIHNhbXBsZS5wcmVzZW50YXRpb25UaW1lKCksIHNhbXBsZS52aWRlb1JvdGF0aW9uKCksIHNh bXBsZS52aWRlb01pcnJvcmVkKCkpKTsKQEAgLTkzLDQgKzE1Miw0IEBAIElPU3VyZmFjZVJlZiBS ZW1vdGVWaWRlb1NhbXBsZTo6c3VyZmFjZSgpCiAKIH0KIAotI2VuZGlmIC8vIEVOQUJMRShNRURJ QV9TVFJFQU0pCisjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkgJiYgUExBVEZPUk0oQ09D T0EpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNWY3NjIzZDE0NjRkYWFlNDk2ZjU5Y2I2ZjMzODFjNzdjNjFiZjAzYS4uMjNl NDE2NTZhYmNlYWM2ZGFiNjYyZDJkZDhlMTg1Mzg0OGZmMGRhMSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDIwLTAxLTA4ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAg ICAgICBSZW1vdGVWaWRlb1NhbXBsZSBzaG91bGQgYmUgYWJsZSB0byBzdXBwb3J0IGNhbnZhcyB2 aWRlbyBzYW1wbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMDU5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGh0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRl by1kYXRhYXZhaWxhYmxlLWdwdXByb2Nlc3MtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBodHRwL3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8tdmlkZW8tZGF0 YWF2YWlsYWJsZS1ncHVwcm9jZXNzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L21l ZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRlby1kYXRhYXZhaWxhYmxlLmh0 bWw6CisgICAgICAgIFJlbW92ZSBubyBsb25nZXIgdmFsaWQgY29tbWVudCBhbmQgYmVlZiB1cCB0 ZXN0IGluIGNhc2Ugb2YgYXNzZXJ0aW9uIGZhaWx1cmUuCisKIDIwMjAtMDEtMDggIHlvdWVubiBm YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBNZWRpYVJlY29y ZGVyIGJhY2tlbmQgaW4gR1BVUHJvY2VzcwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93 cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFi bGUtZ3B1cHJvY2Vzcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9tZWRpYXJl Y29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8tdmlkZW8tZGF0YWF2YWlsYWJsZS1ncHVwcm9j ZXNzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42MDVhOTU5YWYzZmI4ZjcxZjQ0OGExODI5NTA3 NjA4ZTczYTkxYmQyCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvbWVk aWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUtZ3B1 cHJvY2Vzcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACisKKworSGFybmVzcyBFcnJvciAo VElNRU9VVCksIG1lc3NhZ2UgPSBudWxsCisKK1RJTUVPVVQgVmVyaWZ5IE1lZGlhUmVjb3JkZXIg aXMgd29ya2luZyBpbiBHUFVQcm9jZXNzIFRlc3QgdGltZWQgb3V0CisKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRpby12 aWRlby1kYXRhYXZhaWxhYmxlLWdwdXByb2Nlc3MuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0 L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRlby1kYXRhYXZhaWxhYmxl LWdwdXByb2Nlc3MuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZmY1ODgwMzg3N2Q2MjdiYjQ1MmFmZTA2N2Y3 N2Q5ZmMwMGExZjFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvbWVk aWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUtZ3B1 cHJvY2Vzcy5odG1sCkBAIC0wLDAgKzEsOTEgQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+Cis8 aGVhZD4KKyAgICA8dGl0bGU+TWVkaWFSZWNvcmRlciBEYXRhYXZhaWxhYmxlPC90aXRsZT4KKyAg ICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vdzNjLmdpdGh1Yi5pby9tZWRpYWNhcHR1 cmUtcmVjb3JkL01lZGlhUmVjb3JkZXIuaHRtbCNtZWRpYXJlY29yZGVyIj4KKyAgICA8c2NyaXB0 IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBz cmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorICAgIDxzY3Jp cHQgc3JjPSIuLi9jb21tb24vY2FudmFzLXRlc3RzLmpzIj48L3NjcmlwdD4KKyAgICA8bGluayBy ZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2NvbW1vbi9jYW52YXMtdGVzdHMuY3NzIj4KKzwvaGVh ZD4KKzxib2R5PgorPGRpdj4KKyAgICA8dmlkZW8gaWQ9InBsYXllciI+CisgICAgPC92aWRlbz4K KzwvZGl2PgorPGRpdj4KKyAgICA8Y2FudmFzIGlkPSJjYW52YXMiIHdpZHRoPSIyMDAiIGhlaWdo dD0iMjAwIj4KKyAgICA8L2NhbnZhcz4KKyAgICA8Y2FudmFzIGlkPSJmcmFtZSIgd2lkdGg9IjIw MCIgaGVpZ2h0PSIyMDAiPgorICAgIDwvY2FudmFzPgorPC9kaXY+Cis8c2NyaXB0PgorICAgIGlm ICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFVzZUdQVVBy b2Nlc3NGb3JXZWJSVEModHJ1ZSk7CisKKyAgICB2YXIgY29udGV4dDsKKyAgICB2YXIgZHJhd1N0 YXJ0VGltZTsKKworICAgIGZ1bmN0aW9uIGNyZWF0ZVZpZGVvU3RyZWFtKCkgeworICAgICAgICBj b25zdCBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2FudmFzIik7CisgICAgICAg IGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQnKTsKKyAgICAgICAgcmV0dXJuIGNhbnZh cy5jYXB0dXJlU3RyZWFtKCk7CisgICAgfQorCisgICAgZnVuY3Rpb24gZG9SZWRJbWFnZURyYXco KSB7CisgICAgICAgIGlmIChjb250ZXh0KSB7CisgICAgICAgICAgICBjb250ZXh0LmZpbGxTdHls ZSA9ICIjZmYwMDAwIjsKKyAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QoMCwgMCwgMjAwLCAy MDApOworICAgICAgICAgICAgaWYgKERhdGUubm93KCkgLSBkcmF3U3RhcnRUaW1lIDwgNTAwKSB7 CisgICAgICAgICAgICAgICAgd2luZG93LnJlcXVlc3RBbmltYXRpb25GcmFtZShkb1JlZEltYWdl RHJhdyk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIGRyYXdTdGFydFRp bWUgPSBEYXRlLm5vdygpOworICAgICAgICAgICAgICAgIGRvR3JlZW5JbWFnZURyYXcoKTsKKyAg ICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKworICAgIGZ1bmN0aW9uIGRvR3JlZW5JbWFn ZURyYXcoKSB7CisgICAgICAgIGlmIChjb250ZXh0KSB7CisgICAgICAgICAgICBjb250ZXh0LmZp bGxTdHlsZSA9ICIjMDBmZjAwIjsKKyAgICAgICAgICAgIGNvbnRleHQuZmlsbFJlY3QoMCwgMCwg MjAwLCAyMDApOworICAgICAgICAgICAgaWYgKERhdGUubm93KCkgLSBkcmF3U3RhcnRUaW1lIDwg MjAwMCkgeworICAgICAgICAgICAgICAgIHdpbmRvdy5yZXF1ZXN0QW5pbWF0aW9uRnJhbWUoZG9H cmVlbkltYWdlRHJhdyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9CisKKyAgICBh c3luY190ZXN0KHQgPT4geworICAgICAgICBjb25zdCBhYyA9IG5ldyBBdWRpb0NvbnRleHQoKTsK KyAgICAgICAgY29uc3Qgb3NjID0gYWMuY3JlYXRlT3NjaWxsYXRvcigpOworICAgICAgICBjb25z dCBkZXN0ID0gYWMuY3JlYXRlTWVkaWFTdHJlYW1EZXN0aW5hdGlvbigpOworICAgICAgICBjb25z dCBhdWRpbyA9IGRlc3Quc3RyZWFtOworICAgICAgICBvc2MuY29ubmVjdChkZXN0KTsKKworICAg ICAgICBjb25zdCB2aWRlbyA9IGNyZWF0ZVZpZGVvU3RyZWFtKCk7CisgICAgICAgIGFzc2VydF9l cXVhbHModmlkZW8uZ2V0QXVkaW9UcmFja3MoKS5sZW5ndGgsIDAsICJ2aWRlbyBtZWRpYXN0cmVh bSBzdGFydHMgd2l0aCBubyBhdWRpbyB0cmFjayIpOworICAgICAgICBhc3NlcnRfZXF1YWxzKGF1 ZGlvLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoLCAxLCAiYXVkaW8gbWVkaWFzdHJlYW0gc3RhcnRz IHdpdGggb25lIGF1ZGlvIHRyYWNrIik7CisgICAgICAgIHZpZGVvLmFkZFRyYWNrKGF1ZGlvLmdl dEF1ZGlvVHJhY2tzKClbMF0pOworICAgICAgICBhc3NlcnRfZXF1YWxzKHZpZGVvLmdldEF1ZGlv VHJhY2tzKCkubGVuZ3RoLCAxLCAidmlkZW8gbWVkaWFzdHJlYW0gc3RhcnRzIHdpdGggb25lIGF1 ZGlvIHRyYWNrIik7CisgICAgICAgIGNvbnN0IHJlY29yZGVyID0gbmV3IE1lZGlhUmVjb3JkZXIo dmlkZW8pOworICAgICAgICBsZXQgbW9kZSA9IDA7CisKKyAgICAgICAgcmVjb3JkZXIub25kYXRh YXZhaWxhYmxlID0gdC5zdGVwX2Z1bmMoYmxvYkV2ZW50ID0+IHsKKyAgICAgICAgICAgIGFzc2Vy dF90cnVlKGJsb2JFdmVudCBpbnN0YW5jZW9mIEJsb2JFdmVudCwgJ3RoZSB0eXBlIG9mIGV2ZW50 IHNob3VsZCBiZSBCbG9iRXZlbnQnKTsKKyAgICAgICAgICAgIGFzc2VydF9lcXVhbHMoYmxvYkV2 ZW50LnR5cGUsICdkYXRhYXZhaWxhYmxlJywgJ3RoZSBldmVudCB0eXBlIHNob3VsZCBiZSBkYXRh YXZhaWxhYmxlJyk7CisgICAgICAgICAgICBhc3NlcnRfdHJ1ZShibG9iRXZlbnQuaXNUcnVzdGVk LCAnaXNUcnVzdGVkIHNob3VsZCBiZSB0cnVlIHdoZW4gdGhlIGV2ZW50IGlzIGNyZWF0ZWQgYnkg QysrJyk7CisgICAgICAgICAgICBhc3NlcnRfdHJ1ZShibG9iRXZlbnQuZGF0YSBpbnN0YW5jZW9m IEJsb2IsICd0aGUgdHlwZSBvZiBkYXRhIHNob3VsZCBiZSBCbG9iJyk7CisgICAgICAgICAgICBh c3NlcnRfdHJ1ZShibG9iRXZlbnQuZGF0YS5zaXplID4gMCwgJ3RoZSBibG9iIHNob3VsZCBjb250 YWluIHNvbWUgYnVmZmVycycpOworICAgICAgICB9KTsKKyAgICAgICAgZHJhd1N0YXJ0VGltZSA9 IERhdGUubm93KCk7CisgICAgICAgIGRvUmVkSW1hZ2VEcmF3KCk7CisgICAgICAgIHJlY29yZGVy LnN0YXJ0KCk7CisgICAgICAgIGFzc2VydF9lcXVhbHMocmVjb3JkZXIuc3RhdGUsICdyZWNvcmRp bmcnLCAnTWVkaWFSZWNvcmRlciBoYXMgYmVlbiBzdGFydGVkIHN1Y2Nlc3NmdWxseScpOworICAg ICAgICBzZXRUaW1lb3V0KCgpID0+IHsKKyAgICAgICAgICAgIHJlY29yZGVyLnN0b3AoKTsKKyAg ICAgICAgfSwgMjAwMCk7CisgICAgfSwgJ1ZlcmlmeSBNZWRpYVJlY29yZGVyIGlzIHdvcmtpbmcg aW4gR1BVUHJvY2VzcycpOworCis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1h dWRpby12aWRlby1kYXRhYXZhaWxhYmxlLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9tZWRp YXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8tdmlkZW8tZGF0YWF2YWlsYWJsZS5odG1s CmluZGV4IDQ0YjZhMmZlZTNiYTI1ZjdiYmNlYmFkZTk3NDMwYjIyNDg4MWRmYWMuLjIwNmU2MjU5 M2YxZmJiZmJmYWZlYjNiNjFlNjNlNmY5NTI1ODVkNDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRlby1kYXRh YXZhaWxhYmxlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvbWVkaWFyZWNvcmRlci9N ZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUuaHRtbApAQCAtMjAsNyAr MjAsNiBAQAogICAgIDwvY2FudmFzPgogPC9kaXY+CiA8c2NyaXB0PgotICAgIC8vIFRoaXMgdGVz dCBpcyBub3QgcGFzc2luZyB3aXRoIEdQVVByb2Nlc3MgYXMgbG9uZyBhcyBjYXB0dXJlIGZyYW1l cyBhcmUgbm90IElPU3VyZmFjZWQgYmFja2VkLgogICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQog ICAgICAgICB3aW5kb3cuaW50ZXJuYWxzLnNldFVzZUdQVVByb2Nlc3NGb3JXZWJSVEMoZmFsc2Up OwogCkBAIC04MSwxNSArODAsMTUgQEAKICAgICAgICAgICAgIGNvbnN0IHJlc0ZyYW1lID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImZyYW1lIik7CiAgICAgICAgICAgICBjb25zdCByZXNDb250 ZXh0ID0gcmVzRnJhbWUuZ2V0Q29udGV4dCgnMmQnKTsKIAotICAgICAgICAgICAgcGxheWVyLm9u Y2FucGxheSA9ICgpID0+IHsKKyAgICAgICAgICAgIHBsYXllci5vbmNhbnBsYXkgPSB0LnN0ZXBf ZnVuYygoKSA9PiB7CiAgICAgICAgICAgICAgICAgYXNzZXJ0X2dyZWF0ZXJfdGhhbihwbGF5ZXIu ZHVyYXRpb24sIDAuMSwgJ3RoZSBkdXJhdGlvbiBzaG91bGQgYmUgZ3JlYXRlciB0aGFuIDEwMG1z Jyk7CiAgICAgICAgICAgICAgICAgcGxheWVyLnBsYXkoKTsKLSAgICAgICAgICAgIH07CisgICAg ICAgICAgICB9KTsKICAgICAgICAgICAgIHBsYXllci5vbnBsYXkgPSAoKSA9PiB7CiAgICAgICAg ICAgICAgICAgcGxheWVyLnBhdXNlKCk7CiAgICAgICAgICAgICAgICAgcGxheWVyLmN1cnJlbnRU aW1lID0gMC4wNTsKICAgICAgICAgICAgIH07Ci0gICAgICAgICAgICBwbGF5ZXIub25zZWVrZWQg PSAoKSA9PiB7CisgICAgICAgICAgICBwbGF5ZXIub25zZWVrZWQgPSB0LnN0ZXBfZnVuYygoKSA9 PiB7CiAgICAgICAgICAgICAgICAgcmVzQ29udGV4dC5kcmF3SW1hZ2UocGxheWVyLCAwLCAwKTsK ICAgICAgICAgICAgICAgICBpZiAoIW1vZGUpIHsKICAgICAgICAgICAgICAgICAgICAgX2Fzc2Vy dFBpeGVsQXBwcm94KHJlc0ZyYW1lLCAyNSwgMjUsIDI1NSwgMCwgMCwgMjU1LCAiMjUsIDI1Iiwg IjI1NSwgMCwgMCwgMjU1IiwgMjApOwpAQCAtMTAxLDcgKzEwMCw3IEBACiAgICAgICAgICAgICAg ICAgICAgIF9hc3NlcnRQaXhlbEFwcHJveChyZXNGcmFtZSwgMTk5LCAxOTksIDAsIDI1NSwgMCwg MjU1LCAiMTk5LCAxOTkiLCAiMCwgMjU1LCAwLCAyNTUiLCAyMCk7CiAgICAgICAgICAgICAgICAg ICAgIHQuZG9uZSgpOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH07CisgICAgICAg ICAgICB9KTsKICAgICAgICAgICAgIHBsYXllci5sb2FkKCk7CiAgICAgICAgIH0pOwogICAgICAg ICBkcmF3U3RhcnRUaW1lID0gRGF0ZS5ub3coKTsK 387200 2020-01-09 01:37:46 -0800 2020-01-09 06:31:16 -0800 Patch for landing bug-205922-20200109103744.patch text/plain 12104 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTllNzg2ZGU2MDVjMmM0 NDcyZWFhZGZhODU5YzIwNmE5NjgyY2QxNy4uYTBjNDEwNjY3ZTM1NzhmNDY3NmFlZDcyZmJiNTRm MThiODJkODhlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAxLTA5ICB5b3Vl bm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdGVWaWRlb1NhbXBs ZSBzaG91bGQgYmUgYWJsZSB0byBzdXBwb3J0IGNhbnZhcyB2aWRlbyBzYW1wbGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU5MjIKKworICAgICAg ICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgQ2FudmFzIGNhcHR1cmUgaXMg cHJvZHVjaW5nIHZpZGVvIHNhbXBsZXMgdGhhdCBhcmUgbm90IElPU3VyZmFjZSBiYWNrZWQuCisg ICAgICAgIFRoaXMgbWFrZXMgaXQgaW1wb3NzaWJsZSB0byBzZW5kIHRoZW0gdGhyb3VnaCBJUEMg dmlhIFJlbW90ZVZpZGVvU2FtcGxlLgorICAgICAgICBXZSBiZWVmIHVwIFJlbW90ZVZpZGVvU2Ft cGxlIHRvIGNyZWF0ZSBhbiBJT1N1cmZhY2UgZm9yIFJHQkEgdmlkZW8gc2FtcGxlcy4KKworICAg ICAgICBUZXN0OiBodHRwL3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8t dmlkZW8tZGF0YWF2YWlsYWJsZS1ncHVwcm9jZXNzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3Jt L2dyYXBoaWNzL1JlbW90ZVZpZGVvU2FtcGxlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnRyYW5z ZmVyQkdSQVBpeGVsQnVmZmVyVG9JT1N1cmZhY2UpOgorICAgICAgICAoV2ViQ29yZTo6UmVtb3Rl VmlkZW9TYW1wbGU6OmNyZWF0ZSk6CisKIDIwMjAtMDEtMDggIEtlaXRoIE1pbGxlciAgPGtlaXRo X21pbGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW50cm9kdWNlIEpTQXJyYXlJdGVy YXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVtb3Rl VmlkZW9TYW1wbGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUmVtb3Rl VmlkZW9TYW1wbGUuY3BwCmluZGV4IDZjMWY4OWZmZTBkZWE4MWY5OWQzNWU4N2MxMGIxMGM2MmY1 N2U0ODcuLjc3MDQ3NjI1N2JlYjAyNDIwY2U0Njk1M2M3NTNhY2JjZjlhNjlhNWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1JlbW90ZVZpZGVvU2FtcGxlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9SZW1vdGVWaWRlb1NhbXBs ZS5jcHAKQEAgLTI4LDkgKzI4LDE0IEBACiAKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKSAmJiBQ TEFURk9STShDT0NPQSkKIAorI2luY2x1ZGUgIklPU3VyZmFjZS5oIgogI2luY2x1ZGUgIkxvZ2dp bmcuaCIKICNpbmNsdWRlICJNZWRpYVNhbXBsZS5oIgogCisjaWYgVVNFKEFDQ0VMRVJBVEUpCisj aW5jbHVkZSA8QWNjZWxlcmF0ZS9BY2NlbGVyYXRlLmg+CisjZW5kaWYKKwogI2lmIEhBVkUoSU9T VVJGQUNFKQogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dENHLmgiCiAjZW5kaWYKQEAgLTQyLDYg KzQ3LDQ5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIHVzaW5nIG5hbWVzcGFjZSBQQUw7CiAKICNp ZiBIQVZFKElPU1VSRkFDRSkKK3N0YXRpYyBpbmxpbmUgc3RkOjp1bmlxdWVfcHRyPElPU3VyZmFj ZT4gdHJhbnNmZXJCR1JBUGl4ZWxCdWZmZXJUb0lPU3VyZmFjZShDVlBpeGVsQnVmZmVyUmVmIHBp eGVsQnVmZmVyKQoreworI2lmIFVTRShBQ0NFTEVSQVRFKQorICAgIEFTU0VSVChDVlBpeGVsQnVm ZmVyR2V0UGl4ZWxGb3JtYXRUeXBlKHBpeGVsQnVmZmVyKSA9PSBrQ1ZQaXhlbEZvcm1hdFR5cGVf MzJCR1JBKTsKKworICAgIGF1dG8gcmVzdWx0ID0gQ1ZQaXhlbEJ1ZmZlckxvY2tCYXNlQWRkcmVz cyhwaXhlbEJ1ZmZlciwga0NWUGl4ZWxCdWZmZXJMb2NrX1JlYWRPbmx5KTsKKyAgICBBU1NFUlQo cmVzdWx0ID09IGtDVlJldHVyblN1Y2Nlc3MpOworICAgIGlmIChyZXN1bHQgIT0ga0NWUmV0dXJu U3VjY2VzcykgeworICAgICAgICBSRUxFQVNFX0xPR19FUlJPUihNZWRpYSwgInRyYW5zZmVyQkdS QVBpeGVsQnVmZmVyVG9JT1N1cmZhY2UgQ1ZQaXhlbEJ1ZmZlckxvY2tCYXNlQWRkcmVzcygpIHJl dHVybmVkIGVycm9yIGNvZGUgJWQiLCByZXN1bHQpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsK KyAgICB9CisKKyAgICBJbnRTaXplIHNpemUgeyBzdGF0aWNfY2FzdDxpbnQ+KENWUGl4ZWxCdWZm ZXJHZXRXaWR0aChwaXhlbEJ1ZmZlcikpLCBzdGF0aWNfY2FzdDxpbnQ+KENWUGl4ZWxCdWZmZXJH ZXRIZWlnaHQocGl4ZWxCdWZmZXIpKSB9OworICAgIGF1dG8gaW9TdXJmYWNlID0gIElPU3VyZmFj ZTo6Y3JlYXRlKHNpemUsIHNSR0JDb2xvclNwYWNlUmVmKCksIElPU3VyZmFjZTo6Rm9ybWF0OjpS R0JBKTsKKworICAgIElPU3VyZmFjZTo6TG9ja2VyIGxvY2soKmlvU3VyZmFjZSk7CisgICAgdklt YWdlX0J1ZmZlciBzcmM7CisgICAgc3JjLndpZHRoID0gc2l6ZS53aWR0aCgpOworICAgIHNyYy5o ZWlnaHQgPSBzaXplLmhlaWdodCgpOworICAgIHNyYy5yb3dCeXRlcyA9IENWUGl4ZWxCdWZmZXJH ZXRCeXRlc1BlclJvdyhwaXhlbEJ1ZmZlcik7CisgICAgc3JjLmRhdGEgPSBDVlBpeGVsQnVmZmVy R2V0QmFzZUFkZHJlc3MocGl4ZWxCdWZmZXIpOworCisgICAgdkltYWdlX0J1ZmZlciBkZXN0Owor ICAgIGRlc3Qud2lkdGggPSBzaXplLndpZHRoKCk7CisgICAgZGVzdC5oZWlnaHQgPSBzaXplLmhl aWdodCgpOworICAgIGRlc3Qucm93Qnl0ZXMgPSBpb1N1cmZhY2UtPmJ5dGVzUGVyUm93KCk7Cisg ICAgZGVzdC5kYXRhID0gbG9jay5zdXJmYWNlQmFzZUFkZHJlc3MoKTsKKworICAgIHZJbWFnZVVu cHJlbXVsdGlwbHlEYXRhX0JHUkE4ODg4KCZzcmMsICZkZXN0LCBrdkltYWdlTm9GbGFncyk7CisK KyAgICByZXN1bHQgPSBDVlBpeGVsQnVmZmVyVW5sb2NrQmFzZUFkZHJlc3MocGl4ZWxCdWZmZXIs IGtDVlBpeGVsQnVmZmVyTG9ja19SZWFkT25seSk7CisgICAgQVNTRVJUKHJlc3VsdCA9PSBrQ1ZS ZXR1cm5TdWNjZXNzKTsKKyAgICBpZiAocmVzdWx0ICE9IGtDVlJldHVyblN1Y2Nlc3MpIHsKKyAg ICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJ0cmFuc2ZlckJHUkFQaXhlbEJ1ZmZlclRv SU9TdXJmYWNlIENWUGl4ZWxCdWZmZXJVbmxvY2tCYXNlQWRkcmVzcygpIHJldHVybmVkIGVycm9y IGNvZGUgJWQiLCByZXN1bHQpOworICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAgICB9CisgICAg cmV0dXJuIGlvU3VyZmFjZTsKKyNlbHNlCisgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEsICJ0 cmFuc2ZlckJHUkFQaXhlbEJ1ZmZlclRvSU9TdXJmYWNlIGNhbm5vdCBjb252ZXJ0IHRvIElPU3Vy ZmFjZSIpOworICAgIHJldHVybiBudWxscHRyOworI2VuZGlmCit9CisKIHN0ZDo6dW5pcXVlX3B0 cjxSZW1vdGVWaWRlb1NhbXBsZT4gUmVtb3RlVmlkZW9TYW1wbGU6OmNyZWF0ZShNZWRpYVNhbXBs ZSYgc2FtcGxlKQogewogICAgIEFTU0VSVChzYW1wbGUucGxhdGZvcm1TYW1wbGUoKS50eXBlID09 IFBsYXRmb3JtU2FtcGxlOjpDTVNhbXBsZUJ1ZmZlclR5cGUpOwpAQCAtNTIsMTAgKzEwMCwyMSBA QCBzdGQ6OnVuaXF1ZV9wdHI8UmVtb3RlVmlkZW9TYW1wbGU+IFJlbW90ZVZpZGVvU2FtcGxlOjpj cmVhdGUoTWVkaWFTYW1wbGUmIHNhbXBsZQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9 CiAKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8SU9TdXJmYWNlPiBpb1N1cmZhY2U7CiAgICAgYXV0byBz dXJmYWNlID0gQ1ZQaXhlbEJ1ZmZlckdldElPU3VyZmFjZShpbWFnZUJ1ZmZlcik7CiAgICAgaWYg KCFzdXJmYWNlKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKE1lZGlhLCAiUmVtb3RlVmlk ZW9TYW1wbGU6OmNyZWF0ZTogQ1ZQaXhlbEJ1ZmZlckdldElPU3VyZmFjZSByZXR1cm5lZCBudWxs cHRyIik7Ci0gICAgICAgIHJldHVybiBudWxscHRyOworICAgICAgICAvLyBTcGVjaWFsIGNhc2Ug Zm9yIGNhbnZhcyBkYXRhIHRoYXQgaXMgUkdCQSwgbm90IElPU3VyZmFjZSBiYWNrZWQuCisgICAg ICAgIGF1dG8gcGl4ZWxGb3JtYXRUeXBlID0gQ1ZQaXhlbEJ1ZmZlckdldFBpeGVsRm9ybWF0VHlw ZShpbWFnZUJ1ZmZlcik7CisgICAgICAgIGlmIChwaXhlbEZvcm1hdFR5cGUgIT0ga0NWUGl4ZWxG b3JtYXRUeXBlXzMyQkdSQSkgeworICAgICAgICAgICAgUkVMRUFTRV9MT0dfRVJST1IoTWVkaWEs ICJSZW1vdGVWaWRlb1NhbXBsZTo6Y3JlYXRlIGRvZXMgbm90IHN1cHBvcnQgbm9uIElPU3VyZmFj ZSBiYWNrZWQgc2FtcGxlcyB0aGF0IGFyZSBub3QgQkdSQSIpOworICAgICAgICAgICAgcmV0dXJu IG51bGxwdHI7CisgICAgICAgIH0KKworICAgICAgICBpb1N1cmZhY2UgPSB0cmFuc2ZlckJHUkFQ aXhlbEJ1ZmZlclRvSU9TdXJmYWNlKGltYWdlQnVmZmVyKTsKKyAgICAgICAgaWYgKCFpb1N1cmZh Y2UpCisgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgICAgICBzdXJmYWNlID0gaW9T dXJmYWNlLT5zdXJmYWNlKCk7CiAgICAgfQogCiAgICAgcmV0dXJuIHN0ZDo6dW5pcXVlX3B0cjxS ZW1vdGVWaWRlb1NhbXBsZT4obmV3IFJlbW90ZVZpZGVvU2FtcGxlKHN1cmZhY2UsIHNSR0JDb2xv clNwYWNlUmVmKCksIHNhbXBsZS5wcmVzZW50YXRpb25UaW1lKCksIHNhbXBsZS52aWRlb1JvdGF0 aW9uKCksIHNhbXBsZS52aWRlb01pcnJvcmVkKCkpKTsKQEAgLTkzLDQgKzE1Miw0IEBAIElPU3Vy ZmFjZVJlZiBSZW1vdGVWaWRlb1NhbXBsZTo6c3VyZmFjZSgpCiAKIH0KIAotI2VuZGlmIC8vIEVO QUJMRShNRURJQV9TVFJFQU0pCisjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NUUkVBTSkgJiYgUExB VEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKaW5kZXggNDE4ZTNmNGI2YzIyYTIxNWU4MTI4NmU4ZjgzODNkMDJiN2I0 MzQwZS4uYTZjYjk1MzRkYjc4ODk2OTA0ZWI0Mjg2ZmZhZjZiMGFkYjc1NDdkOCAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDIwLTAxLTA5ICB5b3Vlbm4gZmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KKworICAgICAgICBSZW1vdGVWaWRlb1NhbXBsZSBzaG91bGQgYmUgYWJsZSB0byBzdXBwb3J0 IGNhbnZhcyB2aWRlbyBzYW1wbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDU5MjIKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgKiBodHRwL3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVk aW8tdmlkZW8tZGF0YWF2YWlsYWJsZS1ncHVwcm9jZXNzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZp ZGVvLWRhdGFhdmFpbGFibGUtZ3B1cHJvY2Vzcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRw L3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8tdmlkZW8tZGF0YWF2YWls YWJsZS5odG1sOgorICAgICAgICBSZW1vdmUgbm8gbG9uZ2VyIHZhbGlkIGNvbW1lbnQgYW5kIGJl ZWYgdXAgdGVzdCBpbiBjYXNlIG9mIGFzc2VydGlvbiBmYWlsdXJlLgorCiAyMDIwLTAxLTA5ICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OOiBb IE1hYyBdIHdlYnJ0Yy92aWRlby1hdXRvcGxheS5odG1sIGlzIGEgZmxha3kgZmFpbHVyZQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVy LUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUtZ3B1cHJvY2Vzcy1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9odHRwL3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3JkZXItQVYtYXVkaW8t dmlkZW8tZGF0YWF2YWlsYWJsZS1ncHVwcm9jZXNzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5h NjZiNDE0MTBlZmU5ZTJmYTdjOWZmODdhMGYyOWEyOTIwZWE2MDY5Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1 ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUtZ3B1cHJvY2Vzcy1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSw0IEBACisKKworUEFTUyBWZXJpZnkgTWVkaWFSZWNvcmRlciBpcyB3b3JraW5nIGluIEdQVVBy b2Nlc3MgCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvd3B0L21lZGlhcmVjb3JkZXIv TWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRlby1kYXRhYXZhaWxhYmxlLWdwdXByb2Nlc3MuaHRt bCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L21lZGlhcmVjb3JkZXIvTWVkaWFSZWNvcmRlci1BVi1h dWRpby12aWRlby1kYXRhYXZhaWxhYmxlLWdwdXByb2Nlc3MuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMzMw NmRlNzk0N2JiYjkyNTczOTRjM2JhMTk2MjAxYjA1ODQ3ODhiCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlv LXZpZGVvLWRhdGFhdmFpbGFibGUtZ3B1cHJvY2Vzcy5odG1sCkBAIC0wLDAgKzEsOTIgQEAKKzwh ZG9jdHlwZSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+TWVkaWFSZWNvcmRlciBE YXRhYXZhaWxhYmxlPC90aXRsZT4KKyAgICA8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8v dzNjLmdpdGh1Yi5pby9tZWRpYWNhcHR1cmUtcmVjb3JkL01lZGlhUmVjb3JkZXIuaHRtbCNtZWRp YXJlY29yZGVyIj4KKyAgICA8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQu anMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSIuLi9jb21tb24vY2FudmFzLXRlc3RzLmpz Ij48L3NjcmlwdD4KKyAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uL2NvbW1vbi9j YW52YXMtdGVzdHMuY3NzIj4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj4KKyAgICA8dmlkZW8gaWQ9 InBsYXllciI+CisgICAgPC92aWRlbz4KKzwvZGl2PgorPGRpdj4KKyAgICA8Y2FudmFzIGlkPSJj YW52YXMiIHdpZHRoPSIyMDAiIGhlaWdodD0iMjAwIj4KKyAgICA8L2NhbnZhcz4KKyAgICA8Y2Fu dmFzIGlkPSJmcmFtZSIgd2lkdGg9IjIwMCIgaGVpZ2h0PSIyMDAiPgorICAgIDwvY2FudmFzPgor PC9kaXY+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICB3aW5k b3cuaW50ZXJuYWxzLnNldFVzZUdQVVByb2Nlc3NGb3JXZWJSVEModHJ1ZSk7CisKKyAgICB2YXIg Y29udGV4dDsKKyAgICB2YXIgZHJhd1N0YXJ0VGltZTsKKworICAgIGZ1bmN0aW9uIGNyZWF0ZVZp ZGVvU3RyZWFtKCkgeworICAgICAgICBjb25zdCBjYW52YXMgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiY2FudmFzIik7CisgICAgICAgIGNvbnRleHQgPSBjYW52YXMuZ2V0Q29udGV4dCgnMmQn KTsKKyAgICAgICAgcmV0dXJuIGNhbnZhcy5jYXB0dXJlU3RyZWFtKCk7CisgICAgfQorCisgICAg ZnVuY3Rpb24gZG9SZWRJbWFnZURyYXcoKSB7CisgICAgICAgIGlmIChjb250ZXh0KSB7CisgICAg ICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9ICIjZmYwMDAwIjsKKyAgICAgICAgICAgIGNvbnRl eHQuZmlsbFJlY3QoMCwgMCwgMjAwLCAyMDApOworICAgICAgICAgICAgaWYgKERhdGUubm93KCkg LSBkcmF3U3RhcnRUaW1lIDwgNTAwKSB7CisgICAgICAgICAgICAgICAgd2luZG93LnJlcXVlc3RB bmltYXRpb25GcmFtZShkb1JlZEltYWdlRHJhdyk7CisgICAgICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgICAgIGRyYXdTdGFydFRpbWUgPSBEYXRlLm5vdygpOworICAgICAgICAgICAgICAg IGRvR3JlZW5JbWFnZURyYXcoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKwor ICAgIGZ1bmN0aW9uIGRvR3JlZW5JbWFnZURyYXcoKSB7CisgICAgICAgIGlmIChjb250ZXh0KSB7 CisgICAgICAgICAgICBjb250ZXh0LmZpbGxTdHlsZSA9ICIjMDBmZjAwIjsKKyAgICAgICAgICAg IGNvbnRleHQuZmlsbFJlY3QoMCwgMCwgMjAwLCAyMDApOworICAgICAgICAgICAgaWYgKERhdGUu bm93KCkgLSBkcmF3U3RhcnRUaW1lIDwgMjAwMCkgeworICAgICAgICAgICAgICAgIHdpbmRvdy5y ZXF1ZXN0QW5pbWF0aW9uRnJhbWUoZG9HcmVlbkltYWdlRHJhdyk7CisgICAgICAgICAgICB9Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICBhc3luY190ZXN0KHQgPT4geworICAgICAgICBjb25zdCBh YyA9IG5ldyBBdWRpb0NvbnRleHQoKTsKKyAgICAgICAgY29uc3Qgb3NjID0gYWMuY3JlYXRlT3Nj aWxsYXRvcigpOworICAgICAgICBjb25zdCBkZXN0ID0gYWMuY3JlYXRlTWVkaWFTdHJlYW1EZXN0 aW5hdGlvbigpOworICAgICAgICBjb25zdCBhdWRpbyA9IGRlc3Quc3RyZWFtOworICAgICAgICBv c2MuY29ubmVjdChkZXN0KTsKKworICAgICAgICBjb25zdCB2aWRlbyA9IGNyZWF0ZVZpZGVvU3Ry ZWFtKCk7CisgICAgICAgIGFzc2VydF9lcXVhbHModmlkZW8uZ2V0QXVkaW9UcmFja3MoKS5sZW5n dGgsIDAsICJ2aWRlbyBtZWRpYXN0cmVhbSBzdGFydHMgd2l0aCBubyBhdWRpbyB0cmFjayIpOwor ICAgICAgICBhc3NlcnRfZXF1YWxzKGF1ZGlvLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoLCAxLCAi YXVkaW8gbWVkaWFzdHJlYW0gc3RhcnRzIHdpdGggb25lIGF1ZGlvIHRyYWNrIik7CisgICAgICAg IHZpZGVvLmFkZFRyYWNrKGF1ZGlvLmdldEF1ZGlvVHJhY2tzKClbMF0pOworICAgICAgICBhc3Nl cnRfZXF1YWxzKHZpZGVvLmdldEF1ZGlvVHJhY2tzKCkubGVuZ3RoLCAxLCAidmlkZW8gbWVkaWFz dHJlYW0gc3RhcnRzIHdpdGggb25lIGF1ZGlvIHRyYWNrIik7CisgICAgICAgIGNvbnN0IHJlY29y ZGVyID0gbmV3IE1lZGlhUmVjb3JkZXIodmlkZW8pOworICAgICAgICBsZXQgbW9kZSA9IDA7CisK KyAgICAgICAgcmVjb3JkZXIub25kYXRhYXZhaWxhYmxlID0gdC5zdGVwX2Z1bmMoYmxvYkV2ZW50 ID0+IHsKKyAgICAgICAgICAgIGFzc2VydF90cnVlKGJsb2JFdmVudCBpbnN0YW5jZW9mIEJsb2JF dmVudCwgJ3RoZSB0eXBlIG9mIGV2ZW50IHNob3VsZCBiZSBCbG9iRXZlbnQnKTsKKyAgICAgICAg ICAgIGFzc2VydF9lcXVhbHMoYmxvYkV2ZW50LnR5cGUsICdkYXRhYXZhaWxhYmxlJywgJ3RoZSBl dmVudCB0eXBlIHNob3VsZCBiZSBkYXRhYXZhaWxhYmxlJyk7CisgICAgICAgICAgICBhc3NlcnRf dHJ1ZShibG9iRXZlbnQuaXNUcnVzdGVkLCAnaXNUcnVzdGVkIHNob3VsZCBiZSB0cnVlIHdoZW4g dGhlIGV2ZW50IGlzIGNyZWF0ZWQgYnkgQysrJyk7CisgICAgICAgICAgICBhc3NlcnRfdHJ1ZShi bG9iRXZlbnQuZGF0YSBpbnN0YW5jZW9mIEJsb2IsICd0aGUgdHlwZSBvZiBkYXRhIHNob3VsZCBi ZSBCbG9iJyk7CisgICAgICAgICAgICBhc3NlcnRfdHJ1ZShibG9iRXZlbnQuZGF0YS5zaXplID4g MCwgJ3RoZSBibG9iIHNob3VsZCBjb250YWluIHNvbWUgYnVmZmVycycpOworICAgICAgICAgICAg dC5kb25lKCk7CisgICAgICAgIH0pOworICAgICAgICBkcmF3U3RhcnRUaW1lID0gRGF0ZS5ub3co KTsKKyAgICAgICAgZG9SZWRJbWFnZURyYXcoKTsKKyAgICAgICAgcmVjb3JkZXIuc3RhcnQoKTsK KyAgICAgICAgYXNzZXJ0X2VxdWFscyhyZWNvcmRlci5zdGF0ZSwgJ3JlY29yZGluZycsICdNZWRp YVJlY29yZGVyIGhhcyBiZWVuIHN0YXJ0ZWQgc3VjY2Vzc2Z1bGx5Jyk7CisgICAgICAgIHNldFRp bWVvdXQoKCkgPT4geworICAgICAgICAgICAgcmVjb3JkZXIuc3RvcCgpOworICAgICAgICB9LCAy MDAwKTsKKyAgICB9LCAnVmVyaWZ5IE1lZGlhUmVjb3JkZXIgaXMgd29ya2luZyBpbiBHUFVQcm9j ZXNzJyk7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC93cHQvbWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVv LWRhdGFhdmFpbGFibGUuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L21lZGlhcmVjb3JkZXIv TWVkaWFSZWNvcmRlci1BVi1hdWRpby12aWRlby1kYXRhYXZhaWxhYmxlLmh0bWwKaW5kZXggNDRi NmEyZmVlM2JhMjVmN2JiY2ViYWRlOTc0MzBiMjI0ODgxZGZhYy4uMjA2ZTYyNTkzZjFmYmJmYmZh ZmViM2I2MWU2M2U2Zjk1MjU4NWQ0MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC93cHQv bWVkaWFyZWNvcmRlci9NZWRpYVJlY29yZGVyLUFWLWF1ZGlvLXZpZGVvLWRhdGFhdmFpbGFibGUu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9tZWRpYXJlY29yZGVyL01lZGlhUmVjb3Jk ZXItQVYtYXVkaW8tdmlkZW8tZGF0YWF2YWlsYWJsZS5odG1sCkBAIC0yMCw3ICsyMCw2IEBACiAg ICAgPC9jYW52YXM+CiA8L2Rpdj4KIDxzY3JpcHQ+Ci0gICAgLy8gVGhpcyB0ZXN0IGlzIG5vdCBw YXNzaW5nIHdpdGggR1BVUHJvY2VzcyBhcyBsb25nIGFzIGNhcHR1cmUgZnJhbWVzIGFyZSBub3Qg SU9TdXJmYWNlZCBiYWNrZWQuCiAgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCiAgICAgICAgIHdp bmRvdy5pbnRlcm5hbHMuc2V0VXNlR1BVUHJvY2Vzc0ZvcldlYlJUQyhmYWxzZSk7CiAKQEAgLTgx LDE1ICs4MCwxNSBAQAogICAgICAgICAgICAgY29uc3QgcmVzRnJhbWUgPSBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiZnJhbWUiKTsKICAgICAgICAgICAgIGNvbnN0IHJlc0NvbnRleHQgPSByZXNG cmFtZS5nZXRDb250ZXh0KCcyZCcpOwogCi0gICAgICAgICAgICBwbGF5ZXIub25jYW5wbGF5ID0g KCkgPT4geworICAgICAgICAgICAgcGxheWVyLm9uY2FucGxheSA9IHQuc3RlcF9mdW5jKCgpID0+ IHsKICAgICAgICAgICAgICAgICBhc3NlcnRfZ3JlYXRlcl90aGFuKHBsYXllci5kdXJhdGlvbiwg MC4xLCAndGhlIGR1cmF0aW9uIHNob3VsZCBiZSBncmVhdGVyIHRoYW4gMTAwbXMnKTsKICAgICAg ICAgICAgICAgICBwbGF5ZXIucGxheSgpOwotICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIH0p OwogICAgICAgICAgICAgcGxheWVyLm9ucGxheSA9ICgpID0+IHsKICAgICAgICAgICAgICAgICBw bGF5ZXIucGF1c2UoKTsKICAgICAgICAgICAgICAgICBwbGF5ZXIuY3VycmVudFRpbWUgPSAwLjA1 OwogICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIHBsYXllci5vbnNlZWtlZCA9ICgpID0+IHsK KyAgICAgICAgICAgIHBsYXllci5vbnNlZWtlZCA9IHQuc3RlcF9mdW5jKCgpID0+IHsKICAgICAg ICAgICAgICAgICByZXNDb250ZXh0LmRyYXdJbWFnZShwbGF5ZXIsIDAsIDApOwogICAgICAgICAg ICAgICAgIGlmICghbW9kZSkgewogICAgICAgICAgICAgICAgICAgICBfYXNzZXJ0UGl4ZWxBcHBy b3gocmVzRnJhbWUsIDI1LCAyNSwgMjU1LCAwLCAwLCAyNTUsICIyNSwgMjUiLCAiMjU1LCAwLCAw LCAyNTUiLCAyMCk7CkBAIC0xMDEsNyArMTAwLDcgQEAKICAgICAgICAgICAgICAgICAgICAgX2Fz c2VydFBpeGVsQXBwcm94KHJlc0ZyYW1lLCAxOTksIDE5OSwgMCwgMjU1LCAwLCAyNTUsICIxOTks IDE5OSIsICIwLCAyNTUsIDAsIDI1NSIsIDIwKTsKICAgICAgICAgICAgICAgICAgICAgdC5kb25l KCk7CiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIH0pOwog ICAgICAgICAgICAgcGxheWVyLmxvYWQoKTsKICAgICAgICAgfSk7CiAgICAgICAgIGRyYXdTdGFy dFRpbWUgPSBEYXRlLm5vdygpOwo=