206412 2020-01-17 06:41:42 -0800 [MSE] Decode glitches when watching videos on CNN.com 2020-01-17 13:04:01 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble aboya calvaris commit-queue eric.carlson ews-watchlist glenn philipj sergio oldest_to_newest 1607964 0 jer.noble 2020-01-17 06:41:42 -0800 [MSE] Decode glitches when watching videos on CNN.com 1607965 1 jer.noble 2020-01-17 06:42:49 -0800 <rdar://problem/55685630> 1607967 2 388034 jer.noble 2020-01-17 06:56:55 -0800 Created attachment 388034 Patch 1607995 3 388034 aboya 2020-01-17 08:08:47 -0800 Comment on attachment 388034 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=388034&action=review Looks good to me. > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1680 > + // When appending media containing P-frames (media whose samples' presentation timestamps I think you mean B-frames. A movie with only I-frames and P-frames has monotonic presentation timestamps, and usually PTS=DTS. > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1691 > + auto nextDecodedSample = trackBuffer.samples.decodeOrder().findSampleAfterDecodeKey(decodeKey); nextDecodeSample, nextSampleDTS, nextSampleInDecodeOrder or even just nextSample. > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1699 > + if (nextSyncSample == nextDecodedSample) The only way this could be true is if nextDecodeSample == end(), but that was checked already above. 1607997 4 388034 calvaris 2020-01-17 08:13:40 -0800 Comment on attachment 388034 Patch Thanks Alicia! 1608023 5 jer.noble 2020-01-17 09:11:33 -0800 (In reply to Alicia Boya García from comment #3) > Comment on attachment 388034 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=388034&action=review > > Looks good to me. > > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1680 > > + // When appending media containing P-frames (media whose samples' presentation timestamps > > I think you mean B-frames. A movie with only I-frames and P-frames has > monotonic presentation timestamps, and usually PTS=DTS. Whoops, looks like I got that... backwards. > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1691 > > + auto nextDecodedSample = trackBuffer.samples.decodeOrder().findSampleAfterDecodeKey(decodeKey); > > nextDecodeSample, nextSampleDTS, nextSampleInDecodeOrder or even just > nextSample. As you can tell from SampleMap, I don’t mind long, descriptive names, so maybe I’ll go with “nextSampleInDecodeOrder”. > > Source/WebCore/Modules/mediasource/SourceBuffer.cpp:1699 > > + if (nextSyncSample == nextDecodedSample) > > The only way this could be true is if nextDecodeSample == end(), but that > was checked already above. Good catch! 1608053 6 388053 jer.noble 2020-01-17 10:11:35 -0800 Created attachment 388053 Patch for landing 1608164 7 388053 commit-queue 2020-01-17 13:03:59 -0800 Comment on attachment 388053 Patch for landing Clearing flags on attachment: 388053 Committed r254761: <https://trac.webkit.org/changeset/254761> 1608165 8 commit-queue 2020-01-17 13:04:01 -0800 All reviewed patches have been landed. Closing bug. 388034 2020-01-17 06:56:55 -0800 2020-01-17 10:11:33 -0800 Patch bug-206412-20200117065638.patch text/plain 10508 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZjZDYwMzBkNDMzYTc5 NTU2Y2YwNzFkMzRkZjM2YjA1NTNiNTlkOS4uZDFlNDM1OWI3OTY4MjcwNzQ1MDNmZTdkNWRlMjQw YmE4ZjRlYmYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAxLTE3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIERlY29kZSBnbGl0 Y2hlcyB3aGVuIHdhdGNoaW5nIHZpZGVvcyBvbiBDTk4uY29tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY0MTIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU1Njg1NjMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utc2FtcGxlcy1vdXQt b2Ytb3JkZXIuaHRtbAorCisgICAgICAgIFRoZSAiQ29kZWQgZnJhbWUgcHJvY2Vzc2luZyIgYWxn b3JpdGhtIGhhcyBhIGtub3duIHNob3J0Y29taW5nIDxodHRwczovL2dpdGh1Yi5jb20vdzNjL21l ZGlhLXNvdXJjZS9pc3N1ZXMvMTg3PgorICAgICAgICB3aGVuIGRlYWxpbmcgYXBwZW5kcyBvZiB3 aXRoICJTQVAgVHlwZSAyIiBjb250ZW50LCBvciBpbiBnZW5lcmFsIHRlcm1zLCBhcHBlbmRpbmcg ZGF0YSB3aGVyZSB0aGUgcmVzdWx0aW5nIHNhbXBsZXMKKyAgICAgICAgaGF2ZSBwcmVzZW50YXRp b24gdGltZXMgdGhhdCBkbyBub3QgaW5jcmVhc2UgbW9ub3RvbmljYWxseS4gV2hlbiB0aGlzIG9j Y3VycywgdGhlIG9yZGVyaW5nIG9mIHNhbXBsZXMgaW4gcHJlc2VudGF0aW9uCisgICAgICAgIHRp bWUgd2lsbCBiZSBkaWZmZXJlbnQgZnJvbSB0aGUgb3JkZXJpbmcgb2Ygc2FtcGxlcyBpbiBkZWNv ZGUgdGltZS4gVGhlIGRlY29kZXIgcmVxdWlyZXMgc2FtcGxlcyB0byBiZSBlbnF1ZXVlZCBpbgor ICAgICAgICBkZWNvZGUgdGltZSBvcmRlciwgYnV0IHRoZSBNU0Ugc3BlY2lmaWNhdGlvbiBvbmx5 IGNoZWNrcyBmb3Igb3ZlcmxhcHBpbmcgc2FtcGxlcyBpbiBwcmVzZW50YXRpb24gdGltZSBvcmRl ci4gRHVyaW5nCisgICAgICAgIGFwcGVuZHMgb2Ygb3V0LW9mLW9yZGVyIHNhbXBsZXMsIHRoaXMg Y2FuIGxlYWQgdG8gbmV3IHNhbXBsZXMgYmVpbmcgaW5zZXJ0ZWQgYmV0d2VlbiBhIHByZXZpb3Vz bHkgYXBwZW5kZWQgc2FtcGxlIGFuZAorICAgICAgICB0aGUgc2FtcGxlIG9uIHdoaWNoIHRoYXQg c2FtcGxlIGRlcGVuZHMuCisKKyAgICAgICAgVG8gcmVzb2x2ZSB0aGlzLCBhZGQgYSBuZXcgc3Rl cCBpbiB0aGUgaW1wbGVtZW50YXRpb24gb2YgdGhlICJjb2RlZCBmcmFtZSBwcm9jZXNzaW5nIiBh bGdvcml0aG0gaW4gCisgICAgICAgIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVyUHJpdmF0ZURp ZFJlY2VpdmVTYW1wbGUoKS4gV2hlbiB0aGUgaW5jb21pbmcgZnJhbWUgaXMgYSBzeW5jIHNhbXBs ZSwgc2VhcmNoIGZvcndhcmQKKyAgICAgICAgaW4gdGhlIFRyYWNrQnVmZmVyIGZvciBhbGwgcHJl dmlvdXMgc2FtcGxlcyBpbiBiZXR3ZWVuIHRoZSBuZXcgc3luYyBzYW1wbGUsIGFuZCB0aGUgbmV4 dCBzeW5jIHNhbXBsZS4gQWxsIHRoZQorICAgICAgICBzYW1wbGVzIGZvdW5kIGluIHRoaXMgc3Rl cCB3b3VsZCBmYWlsIHRvIGRlY29kZSBjb3JyZWN0bHkgaWYgZW5xdWV1ZWQgYWZ0ZXIgdGhlIG5l dyAocG9zc2libHkgZGlmZmVyZW50IHJlc29sdXRpb24pCisgICAgICAgIHN5bmMgc2FtcGxlLCBz byB0aGV5IGFyZSByZW1vdmVkIGluIHRoaXMgc3RlcC4KKworICAgICAgICAqIE1vZHVsZXMvbWVk aWFzb3VyY2UvU2FtcGxlTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlY29kZU9yZGVyU2Ft cGxlTWFwOjpmaW5kU2FtcGxlQWZ0ZXJEZWNvZGVLZXkpOgorICAgICAgICAqIE1vZHVsZXMvbWVk aWFzb3VyY2UvU2FtcGxlTWFwLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9Tb3Vy Y2VCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyOjpzb3VyY2VCdWZm ZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6CisKIDIwMjAtMDEtMDggIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBwZXJzaXN0ZW50LXVzYWdlLXJl Y29yZCBtZXNzYWdlIGZhaWxzIGZpcnN0IHRpbWU7IHN1Y2NlZWRzIHN1YnNlcXVlbnQgdGltZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFw LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmNwcApp bmRleCAwN2NmNWQ3YzA5YWQzYjNiZGMxZWY1NDBjYjFiMGFlZDc2M2ZjMTNjLi5iNzFiMzM3ODE5 ZTE4MDk5NDVkYTJkNGMwOWU1NTI4YjhhMjM4NzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwCkBAIC0xODgsNiArMTg4LDExIEBAIERl Y29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6ZmluZFNh bXBsZVdpdGhEZWNvZGVLZXkoY29uCiAgICAgcmV0dXJuIG1fc2FtcGxlcy5maW5kKGtleSk7CiB9 CiAKK0RlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1hcDo6 ZmluZFNhbXBsZUFmdGVyRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmIGtleSkKK3sKKyAgICByZXR1 cm4gbV9zYW1wbGVzLnVwcGVyX2JvdW5kKGtleSk7Cit9CisKIFByZXNlbnRhdGlvbk9yZGVyU2Ft cGxlTWFwOjpyZXZlcnNlX2l0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxlTWFwOjpyZXZl cnNlRmluZFNhbXBsZUNvbnRhaW5pbmdQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1lZGlhVGltZSYg dGltZSkKIHsKICAgICBhdXRvIHJhbmdlID0gc3RkOjplcXVhbF9yYW5nZShyYmVnaW4oKSwgcmVu ZCgpLCB0aW1lLCBTYW1wbGVJc0dyZWF0ZXJUaGFuTWVkaWFUaW1lQ29tcGFyYXRvcjxNYXBUeXBl PigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2Ft cGxlTWFwLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5o CmluZGV4IGY3ODMwODJlNmYxYTI2NDhmOGUyMDAwZjlhMDA2OGI4MjAyMmExYzMuLmVhZjQ5MzE1 OTdkMjY4NTIzYzY2N2JkOWNkY2M0Y2VhNjU0MzM2OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmgKKysrIGIvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaApAQCAtOTMsNiArOTMsNyBAQCBwdWJsaWM6 CiAgICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciByZW5kKCkgY29uc3QgeyByZXR1cm4gbV9zYW1w bGVzLnJlbmQoKTsgfQogCiAgICAgV0VCQ09SRV9FWFBPUlQgaXRlcmF0b3IgZmluZFNhbXBsZVdp dGhEZWNvZGVLZXkoY29uc3QgS2V5VHlwZSYpOworICAgIFdFQkNPUkVfRVhQT1JUIGl0ZXJhdG9y IGZpbmRTYW1wbGVBZnRlckRlY29kZUtleShjb25zdCBLZXlUeXBlJik7CiAgICAgV0VCQ09SRV9F WFBPUlQgcmV2ZXJzZV9pdGVyYXRvciByZXZlcnNlRmluZFNhbXBsZVdpdGhEZWNvZGVLZXkoY29u c3QgS2V5VHlwZSYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHJldmVyc2VfaXRlcmF0b3IgZmluZFN5 bmNTYW1wbGVQcmlvclRvUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRpbWUmLCBjb25zdCBN ZWRpYVRpbWUmIHRocmVzaG9sZCA9IE1lZGlhVGltZTo6cG9zaXRpdmVJbmZpbml0ZVRpbWUoKSk7 CiAgICAgV0VCQ09SRV9FWFBPUlQgcmV2ZXJzZV9pdGVyYXRvciBmaW5kU3luY1NhbXBsZVByaW9y VG9EZWNvZGVJdGVyYXRvcihyZXZlcnNlX2l0ZXJhdG9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAppbmRleCBjNTExYzQyNzM4 M2JlZTNhYmRkM2JhYzFhYzk0YmVhYzQ1YmQ3YzUyLi4yYmQ0MTk1NWI0Yjg3NDRjYmYwMzE1ZjNi ZWJlZjBlNzRhOTczOThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlh c291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRp YXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCkBAIC0xNjc3LDYgKzE2NzcsMzIgQEAgdm9pZCBTb3Vy Y2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKE1lZGlhU2FtcGxl JiBzYW1wbGUpCiAgICAgICAgICAgICAgICAgZXJhc2VkU2FtcGxlcy5hZGRSYW5nZShpdGVyX3Bh aXIuZmlyc3QsIGl0ZXJfcGFpci5zZWNvbmQpOwogICAgICAgICB9CiAKKyAgICAgICAgLy8gV2hl biBhcHBlbmRpbmcgbWVkaWEgY29udGFpbmluZyBQLWZyYW1lcyAobWVkaWEgd2hvc2Ugc2FtcGxl cycgcHJlc2VudGF0aW9uIHRpbWVzdGFtcHMKKyAgICAgICAgLy8gZG8gbm90IGluY3JlYXNlIG1v bm90b25pY2FsbHksIHRoZSBwcmlvciBlcmFzZSBzdGVwcyBjb3VsZCBsZWF2ZSBhIHNhbXBsZSBp biB0aGUgdHJhY2tCdWZmZXIKKyAgICAgICAgLy8gd2hpY2ggd2lsbCBiZSBkaXNjb25uZWN0ZWQg ZnJvbSBpdHMgcHJldmlvdXMgSS1mcmFtZS4gSWYgdGhlIGluY29taW5nIGZyYW1lIGlzIGFuIEkt ZnJhbWUsCisgICAgICAgIC8vIHJlbW92ZSBhbGwgc2FtcGxlcyBpbiBkZWNvZGUgb3JkZXIgYmV0 d2VlbiB0aGUgaW5jb21pbmcgSS1mcmFtZSdzIGRlY29kZSB0aW1lc3RhbXAgYW5kIHRoZQorICAg ICAgICAvLyBuZXh0IEktZnJhbWUuIFNlZSA8aHR0cHM6Ly9naXRodWIuY29tL3czYy9tZWRpYS1z b3VyY2UvaXNzdWVzLzE4Nz4gZm9yIGEgZGlzY3Vzc2lvbiBvZiB3aGF0CisgICAgICAgIC8vIHRo ZSBob3cgdGhlIE1TRSBzcGVjaWZpY2F0aW9uIHNob3VsZCBoYW5kbGllIHRoaXMgc2VjbmFyaW8u CisgICAgICAgIGRvIHsKKyAgICAgICAgICAgIGlmICghc2FtcGxlLmlzU3luYygpKQorICAgICAg ICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBsZU1hcDo6S2V5 VHlwZSBkZWNvZGVLZXkoc2FtcGxlLmRlY29kZVRpbWUoKSwgc2FtcGxlLnByZXNlbnRhdGlvblRp bWUoKSk7CisgICAgICAgICAgICBhdXRvIG5leHREZWNvZGVkU2FtcGxlID0gdHJhY2tCdWZmZXIu c2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVBZnRlckRlY29kZUtleShkZWNvZGVLZXkp OworICAgICAgICAgICAgaWYgKG5leHREZWNvZGVkU2FtcGxlID09IHRyYWNrQnVmZmVyLnNhbXBs ZXMuZGVjb2RlT3JkZXIoKS5lbmQoKSkKKyAgICAgICAgICAgICAgICBicmVhazsKKworICAgICAg ICAgICAgaWYgKG5leHREZWNvZGVkU2FtcGxlLT5zZWNvbmQtPmlzU3luYygpKQorICAgICAgICAg ICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBhdXRvIG5leHRTeW5jU2FtcGxlID0gdHJhY2tC dWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTeW5jU2FtcGxlQWZ0ZXJEZWNvZGVJdGVy YXRvcihuZXh0RGVjb2RlZFNhbXBsZSk7CisgICAgICAgICAgICBpZiAobmV4dFN5bmNTYW1wbGUg PT0gbmV4dERlY29kZWRTYW1wbGUpCisgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAg ICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJEaXNjb3ZlcmVkIG91dC1vZi1vcmRlciBmcmFt ZXMsIGZyb206ICIsICpuZXh0RGVjb2RlZFNhbXBsZS0+c2Vjb25kLCAiIHRvOiAiLCAobmV4dFN5 bmNTYW1wbGUgPT0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmVuZCgpID8gIltl bmRdIl9zIDogdG9TdHJpbmcoKm5leHRTeW5jU2FtcGxlLT5zZWNvbmQpKSk7CisgICAgICAgICAg ICBlcmFzZWRTYW1wbGVzLmFkZFJhbmdlKG5leHREZWNvZGVkU2FtcGxlLCBuZXh0U3luY1NhbXBs ZSk7CisgICAgICAgIH0gd2hpbGUgKGZhbHNlKTsKKwogICAgICAgICAvLyBUaGVyZSBhcmUgbWFu eSBmaWxlcyBvdXQgdGhlcmUgd2hlcmUgdGhlIGZyYW1lIHRpbWVzIGFyZSBub3QgcGVyZmVjdGx5 IGNvbnRpZ3VvdXMgYW5kIG1heSBoYXZlIHNtYWxsIG92ZXJsYXBzCiAgICAgICAgIC8vIGJldHdl ZW4gdGhlIGJlZ2lubmluZyBvZiBhIGZyYW1lIGFuZCB0aGUgZW5kIG9mIHRoZSBwcmV2aW91cyBv bmU7IHRoZXJlZm9yZSBhIHRvbGVyYW5jZSBpcyBuZWVkZWQgd2hlbmV2ZXIKICAgICAgICAgLy8g ZHVyYXRpb25zIGFyZSBjb25zaWRlcmVkLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEv bWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1zYW1wbGVzLW91dC1vZi1vcmRlci1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXNhbXBsZXMt b3V0LW9mLW9yZGVyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43ZTVjMTE3ZjFlOTA2ZmViMmUz ZGUzMGY5ODI4OTUxNGJkNGRmYWE5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVk aWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1zYW1wbGVzLW91dC1vZi1vcmRlci1leHBlY3Rl ZC50eHQKQEAgLTAsMCArMSwyMCBAQAorCitSVU4odmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9iamVj dFVSTChzb3VyY2UpKQorRVZFTlQoc291cmNlb3BlbikKK1JVTihzb3VyY2VCdWZmZXIgPSBzb3Vy Y2UuYWRkU291cmNlQnVmZmVyKCJ2aWRlby9tb2NrOyBjb2RlY3M9bW9jayIpKQorRmlyc3Qgc2Vn bWVudCBoYXMgbm9ybWFsLCBtb25vdG9uaWNhbGx5IGluY3JlYXNpbmcgc2FtcGxlcy4KK1JVTihz b3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKG1lZGlhU2VnbWVudCkpCitFVkVOVCh1cGRhdGVlbmQp CitFWFBFQ1RFRCAoYnVmZmVyZWRTYW1wbGVzLmxlbmd0aCA9PSAnMycpIE9LCit7UFRTKHsxLzEg PSAxLjAwMDAwMH0pLCBEVFMoezEvMSA9IDEuMDAwMDAwfSksIGR1cmF0aW9uKHsxLzEgPSAxLjAw MDAwMH0pLCBmbGFncygxKSwgZ2VuZXJhdGlvbigwKX0KK3tQVFMoezIvMSA9IDIuMDAwMDAwfSks IERUUyh7Mi8xID0gMi4wMDAwMDB9KSwgZHVyYXRpb24oezEvMSA9IDEuMDAwMDAwfSksIGZsYWdz KDApLCBnZW5lcmF0aW9uKDApfQore1BUUyh7My8xID0gMy4wMDAwMDB9KSwgRFRTKHszLzEgPSAz LjAwMDAwMH0pLCBkdXJhdGlvbih7MS8xID0gMS4wMDAwMDB9KSwgZmxhZ3MoMCksIGdlbmVyYXRp b24oMCl9CitTZWNvbmQsIG92ZXJsYXBwaW5nIHNlZ21lbnQgaGFzIG91dC1vZi1kaXNwbGF5LW9y ZGVyIHNhbXBsZXMuIFRoaXMgYXBwZW5kIHNob3VsZCByZXBsYWNlIHRoZSBsYXN0IHNhbXBsZSBm cm9tIHRoZSBwcmV2aW91cyBhcHBlbmQuCitSVU4oc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlciht ZWRpYVNlZ21lbnQpKQorRVZFTlQodXBkYXRlZW5kKQorRVhQRUNURUQgKGJ1ZmZlcmVkU2FtcGxl cy5sZW5ndGggPT0gJzMnKSBPSwore1BUUyh7MS8xID0gMS4wMDAwMDB9KSwgRFRTKHsxLzEgPSAx LjAwMDAwMH0pLCBkdXJhdGlvbih7MS8xID0gMS4wMDAwMDB9KSwgZmxhZ3MoMSksIGdlbmVyYXRp b24oMCl9Cit7UFRTKHsyLzEgPSAyLjAwMDAwMH0pLCBEVFMoezIvMSA9IDIuMDAwMDAwfSksIGR1 cmF0aW9uKHsxLzEgPSAxLjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigwKX0KK3tQVFMo ezQvMSA9IDQuMDAwMDAwfSksIERUUyh7Mi8xID0gMi4wMDAwMDB9KSwgZHVyYXRpb24oezEvMSA9 IDEuMDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9uKDEpfQorRU5EIE9GIFRFU1QKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1zYW1w bGVzLW91dC1vZi1vcmRlci5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21l ZGlhLXNvdXJjZS1zYW1wbGVzLW91dC1vZi1vcmRlci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmFhOGI2NWUy YTgzYmQ3Y2Q3MWY1ODRjY2ZlMDQyZTdmYmViMGI4MDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXNhbXBsZXMtb3V0LW9mLW9y ZGVyLmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFk PgorICAgIDx0aXRsZT5tZWRpYS1zb3VyY2Utc2FtcGxlcy1vdXQtb2Ytb3JkZXI8L3RpdGxlPgor ICAgIDxzY3JpcHQgc3JjPSJtb2NrLW1lZGlhLXNvdXJjZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNj cmlwdCBzcmM9Ii4uL3ZpZGVvLXRlc3QuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAg dmFyIHNvdXJjZTsKKyAgICB2YXIgc291cmNlQnVmZmVyOworICAgIHZhciBpbml0U2VnbWVudDsK KyAgICB2YXIgbWVkaWFTZWdtZW50OworCisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAg ICAgIGludGVybmFscy5pbml0aWFsaXplTW9ja01lZGlhU291cmNlKCk7CisKKyAgICB3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGFzeW5jIGV2ZW50ID0+IHsKKyAgICAgICAgZmluZE1l ZGlhRWxlbWVudCgpOworCisgICAgICAgIHNvdXJjZSA9IG5ldyBNZWRpYVNvdXJjZSgpOworICAg ICAgICBydW4oJ3ZpZGVvLnNyYyA9IFVSTC5jcmVhdGVPYmplY3RVUkwoc291cmNlKScpOworICAg ICAgICBhd2FpdCB3YWl0Rm9yKHNvdXJjZSwgJ3NvdXJjZW9wZW4nKTsKKworICAgICAgICBydW4o J3NvdXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoInZpZGVvL21vY2s7IGNvZGVj cz1tb2NrIiknKTsKKyAgICAgICAgY29uc29sZVdyaXRlKCdGaXJzdCBzZWdtZW50IGhhcyBub3Jt YWwsIG1vbm90b25pY2FsbHkgaW5jcmVhc2luZyBzYW1wbGVzLicpCisgICAgICAgIG1lZGlhU2Vn bWVudCA9IGNvbmNhdGVuYXRlU2FtcGxlcyhbCisgICAgICAgICAgICBtYWtlQUluaXQoMiwgW21h a2VBVHJhY2soMSwgJ21vY2snLCBUUkFDS19LSU5ELkFVRElPKV0pLCAKKyAgICAgICAgICAgIG1h a2VBU2FtcGxlKDEsIDEsIDEsIDEsIDEsIFNBTVBMRV9GTEFHLlNZTkMsIDApLAorICAgICAgICAg ICAgbWFrZUFTYW1wbGUoMiwgMiwgMSwgMSwgMSwgU0FNUExFX0ZMQUcuTk9ORSwgMCksCisgICAg ICAgICAgICBtYWtlQVNhbXBsZSgzLCAzLCAxLCAxLCAxLCBTQU1QTEVfRkxBRy5OT05FLCAwKSwK KyAgICAgICAgXSk7CisgICAgICAgIHJ1bignc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihtZWRp YVNlZ21lbnQpJyk7CisgICAgICAgIGF3YWl0IHdhaXRGb3Ioc291cmNlQnVmZmVyLCAndXBkYXRl ZW5kJyk7CisKKyAgICAgICAgYnVmZmVyZWRTYW1wbGVzID0gaW50ZXJuYWxzLmJ1ZmZlcmVkU2Ft cGxlc0ZvclRyYWNrSUQoc291cmNlQnVmZmVyLCAxKTsKKyAgICAgICAgdGVzdEV4cGVjdGVkKCJi dWZmZXJlZFNhbXBsZXMubGVuZ3RoIiwgMyk7CisgICAgICAgIGJ1ZmZlcmVkU2FtcGxlcy5mb3JF YWNoKGNvbnNvbGVXcml0ZSk7CisKKyAgICAgICAgY29uc29sZVdyaXRlKCdTZWNvbmQsIG92ZXJs YXBwaW5nIHNlZ21lbnQgaGFzIG91dC1vZi1kaXNwbGF5LW9yZGVyIHNhbXBsZXMuIFRoaXMgYXBw ZW5kIHNob3VsZCByZXBsYWNlIHRoZSBsYXN0IHNhbXBsZSBmcm9tIHRoZSBwcmV2aW91cyBhcHBl bmQuJykKKyAgICAgICAgbWVkaWFTZWdtZW50ID0gY29uY2F0ZW5hdGVTYW1wbGVzKFsKKyAgICAg ICAgICAgIG1ha2VBSW5pdCgyLCBbbWFrZUFUcmFjaygxLCAnbW9jaycsIFRSQUNLX0tJTkQuQVVE SU8pXSksIAorICAgICAgICAgICAgbWFrZUFTYW1wbGUoNCwgMiwgMSwgMSwgMSwgU0FNUExFX0ZM QUcuU1lOQywgMSksCisgICAgICAgIF0pOworICAgICAgICBydW4oJ3NvdXJjZUJ1ZmZlci5hcHBl bmRCdWZmZXIobWVkaWFTZWdtZW50KScpOworICAgICAgICBhd2FpdCB3YWl0Rm9yKHNvdXJjZUJ1 ZmZlciwgJ3VwZGF0ZWVuZCcpOworCisgICAgICAgIGJ1ZmZlcmVkU2FtcGxlcyA9IGludGVybmFs cy5idWZmZXJlZFNhbXBsZXNGb3JUcmFja0lEKHNvdXJjZUJ1ZmZlciwgMSk7CisgICAgICAgIHRl c3RFeHBlY3RlZCgiYnVmZmVyZWRTYW1wbGVzLmxlbmd0aCIsIDMpOworICAgICAgICBidWZmZXJl ZFNhbXBsZXMuZm9yRWFjaChjb25zb2xlV3JpdGUpOworCisgICAgICAgIGVuZFRlc3QoKTsKKyAg ICB9KTsKKyAgICA8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICAgIDx2aWRlbz48L3ZpZGVv PgorPC9ib2R5PgorPC9odG1sPgo= 388053 2020-01-17 10:11:35 -0800 2020-01-17 13:03:59 -0800 Patch for landing bug-206412-20200117101118.patch text/plain 11278 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWZjZDYwMzBkNDMzYTc5 NTU2Y2YwNzFkMzRkZjM2YjA1NTNiNTlkOS4uOTNjNWIzY2UyYzNmNDQ0OThhNWE4YjdjNGVjYWRk NGNlOTYxYzU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAxLTE3ICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFtNU0VdIERlY29kZSBnbGl0 Y2hlcyB3aGVuIHdhdGNoaW5nIHZpZGVvcyBvbiBDTk4uY29tCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDY0MTIKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzU1Njg1NjMwPgorCisgICAgICAgIFJldmlld2VkIGJ5IFhhYmllciBSb2RyaWd1ZXotQ2Fs dmFyLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Utc2Ft cGxlcy1vdXQtb2Ytb3JkZXIuaHRtbAorCisgICAgICAgIFRoZSAiQ29kZWQgZnJhbWUgcHJvY2Vz c2luZyIgYWxnb3JpdGhtIGhhcyBhIGtub3duIHNob3J0Y29taW5nIDxodHRwczovL2dpdGh1Yi5j b20vdzNjL21lZGlhLXNvdXJjZS9pc3N1ZXMvMTg3PgorICAgICAgICB3aGVuIGRlYWxpbmcgYXBw ZW5kcyBvZiB3aXRoICJTQVAgVHlwZSAyIiBjb250ZW50LCBvciBpbiBnZW5lcmFsIHRlcm1zLCBh cHBlbmRpbmcgZGF0YSB3aGVyZSB0aGUgcmVzdWx0aW5nIHNhbXBsZXMKKyAgICAgICAgaGF2ZSBw cmVzZW50YXRpb24gdGltZXMgdGhhdCBkbyBub3QgaW5jcmVhc2UgbW9ub3RvbmljYWxseS4gV2hl biB0aGlzIG9jY3VycywgdGhlIG9yZGVyaW5nIG9mIHNhbXBsZXMgaW4gcHJlc2VudGF0aW9uCisg ICAgICAgIHRpbWUgd2lsbCBiZSBkaWZmZXJlbnQgZnJvbSB0aGUgb3JkZXJpbmcgb2Ygc2FtcGxl cyBpbiBkZWNvZGUgdGltZS4gVGhlIGRlY29kZXIgcmVxdWlyZXMgc2FtcGxlcyB0byBiZSBlbnF1 ZXVlZCBpbgorICAgICAgICBkZWNvZGUgdGltZSBvcmRlciwgYnV0IHRoZSBNU0Ugc3BlY2lmaWNh dGlvbiBvbmx5IGNoZWNrcyBmb3Igb3ZlcmxhcHBpbmcgc2FtcGxlcyBpbiBwcmVzZW50YXRpb24g dGltZSBvcmRlci4gRHVyaW5nCisgICAgICAgIGFwcGVuZHMgb2Ygb3V0LW9mLW9yZGVyIHNhbXBs ZXMsIHRoaXMgY2FuIGxlYWQgdG8gbmV3IHNhbXBsZXMgYmVpbmcgaW5zZXJ0ZWQgYmV0d2VlbiBh IHByZXZpb3VzbHkgYXBwZW5kZWQgc2FtcGxlIGFuZAorICAgICAgICB0aGUgc2FtcGxlIG9uIHdo aWNoIHRoYXQgc2FtcGxlIGRlcGVuZHMuCisKKyAgICAgICAgVG8gcmVzb2x2ZSB0aGlzLCBhZGQg YSBuZXcgc3RlcCBpbiB0aGUgaW1wbGVtZW50YXRpb24gb2YgdGhlICJjb2RlZCBmcmFtZSBwcm9j ZXNzaW5nIiBhbGdvcml0aG0gaW4gCisgICAgICAgIFNvdXJjZUJ1ZmZlcjo6c291cmNlQnVmZmVy UHJpdmF0ZURpZFJlY2VpdmVTYW1wbGUoKS4gV2hlbiB0aGUgaW5jb21pbmcgZnJhbWUgaXMgYSBz eW5jIHNhbXBsZSwgc2VhcmNoIGZvcndhcmQKKyAgICAgICAgaW4gdGhlIFRyYWNrQnVmZmVyIGZv ciBhbGwgcHJldmlvdXMgc2FtcGxlcyBpbiBiZXR3ZWVuIHRoZSBuZXcgc3luYyBzYW1wbGUsIGFu ZCB0aGUgbmV4dCBzeW5jIHNhbXBsZS4gQWxsIHRoZQorICAgICAgICBzYW1wbGVzIGZvdW5kIGlu IHRoaXMgc3RlcCB3b3VsZCBmYWlsIHRvIGRlY29kZSBjb3JyZWN0bHkgaWYgZW5xdWV1ZWQgYWZ0 ZXIgdGhlIG5ldyAocG9zc2libHkgZGlmZmVyZW50IHJlc29sdXRpb24pCisgICAgICAgIHN5bmMg c2FtcGxlLCBzbyB0aGV5IGFyZSByZW1vdmVkIGluIHRoaXMgc3RlcC4KKworICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRlY29k ZU9yZGVyU2FtcGxlTWFwOjpmaW5kU2FtcGxlQWZ0ZXJEZWNvZGVLZXkpOgorICAgICAgICAqIE1v ZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmg6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXNv dXJjZS9Tb3VyY2VCdWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyOjpz b3VyY2VCdWZmZXJQcml2YXRlRGlkUmVjZWl2ZVNhbXBsZSk6CisKIDIwMjAtMDEtMDggIEplciBO b2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBwZXJzaXN0ZW50 LXVzYWdlLXJlY29yZCBtZXNzYWdlIGZhaWxzIGZpcnN0IHRpbWU7IHN1Y2NlZWRzIHN1YnNlcXVl bnQgdGltZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2Uv U2FtcGxlTWFwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxl TWFwLmNwcAppbmRleCAwN2NmNWQ3YzA5YWQzYjNiZGMxZWY1NDBjYjFiMGFlZDc2M2ZjMTNjLi5i NzFiMzM3ODE5ZTE4MDk5NDVkYTJkNGMwOWU1NTI4YjhhMjM4NzBlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1NhbXBsZU1hcC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuY3BwCkBAIC0xODgsNiArMTg4 LDExIEBAIERlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNhbXBsZU1h cDo6ZmluZFNhbXBsZVdpdGhEZWNvZGVLZXkoY29uCiAgICAgcmV0dXJuIG1fc2FtcGxlcy5maW5k KGtleSk7CiB9CiAKK0RlY29kZU9yZGVyU2FtcGxlTWFwOjppdGVyYXRvciBEZWNvZGVPcmRlclNh bXBsZU1hcDo6ZmluZFNhbXBsZUFmdGVyRGVjb2RlS2V5KGNvbnN0IEtleVR5cGUmIGtleSkKK3sK KyAgICByZXR1cm4gbV9zYW1wbGVzLnVwcGVyX2JvdW5kKGtleSk7Cit9CisKIFByZXNlbnRhdGlv bk9yZGVyU2FtcGxlTWFwOjpyZXZlcnNlX2l0ZXJhdG9yIFByZXNlbnRhdGlvbk9yZGVyU2FtcGxl TWFwOjpyZXZlcnNlRmluZFNhbXBsZUNvbnRhaW5pbmdQcmVzZW50YXRpb25UaW1lKGNvbnN0IE1l ZGlhVGltZSYgdGltZSkKIHsKICAgICBhdXRvIHJhbmdlID0gc3RkOjplcXVhbF9yYW5nZShyYmVn aW4oKSwgcmVuZCgpLCB0aW1lLCBTYW1wbGVJc0dyZWF0ZXJUaGFuTWVkaWFUaW1lQ29tcGFyYXRv cjxNYXBUeXBlPigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz b3VyY2UvU2FtcGxlTWFwLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL1Nh bXBsZU1hcC5oCmluZGV4IGY3ODMwODJlNmYxYTI2NDhmOGUyMDAwZjlhMDA2OGI4MjAyMmExYzMu LmVhZjQ5MzE1OTdkMjY4NTIzYzY2N2JkOWNkY2M0Y2VhNjU0MzM2OTUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU2FtcGxlTWFwLmgKKysrIGIvU291cmNl L1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9TYW1wbGVNYXAuaApAQCAtOTMsNiArOTMsNyBA QCBwdWJsaWM6CiAgICAgY29uc3RfcmV2ZXJzZV9pdGVyYXRvciByZW5kKCkgY29uc3QgeyByZXR1 cm4gbV9zYW1wbGVzLnJlbmQoKTsgfQogCiAgICAgV0VCQ09SRV9FWFBPUlQgaXRlcmF0b3IgZmlu ZFNhbXBsZVdpdGhEZWNvZGVLZXkoY29uc3QgS2V5VHlwZSYpOworICAgIFdFQkNPUkVfRVhQT1JU IGl0ZXJhdG9yIGZpbmRTYW1wbGVBZnRlckRlY29kZUtleShjb25zdCBLZXlUeXBlJik7CiAgICAg V0VCQ09SRV9FWFBPUlQgcmV2ZXJzZV9pdGVyYXRvciByZXZlcnNlRmluZFNhbXBsZVdpdGhEZWNv ZGVLZXkoY29uc3QgS2V5VHlwZSYpOwogICAgIFdFQkNPUkVfRVhQT1JUIHJldmVyc2VfaXRlcmF0 b3IgZmluZFN5bmNTYW1wbGVQcmlvclRvUHJlc2VudGF0aW9uVGltZShjb25zdCBNZWRpYVRpbWUm LCBjb25zdCBNZWRpYVRpbWUmIHRocmVzaG9sZCA9IE1lZGlhVGltZTo6cG9zaXRpdmVJbmZpbml0 ZVRpbWUoKSk7CiAgICAgV0VCQ09SRV9FWFBPUlQgcmV2ZXJzZV9pdGVyYXRvciBmaW5kU3luY1Nh bXBsZVByaW9yVG9EZWNvZGVJdGVyYXRvcihyZXZlcnNlX2l0ZXJhdG9yKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvU291cmNlQnVmZmVyLmNwcAppbmRleCBj NTExYzQyNzM4M2JlZTNhYmRkM2JhYzFhYzk0YmVhYzQ1YmQ3YzUyLi5jNThmMTVkMmFkMTI2NjVi M2Q1NDMyMTg1NjhhYWMwYzM0ODc5MDdmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc291cmNlL1NvdXJjZUJ1ZmZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXNvdXJjZS9Tb3VyY2VCdWZmZXIuY3BwCkBAIC0xNjc3LDYgKzE2NzcsMjkgQEAg dm9pZCBTb3VyY2VCdWZmZXI6OnNvdXJjZUJ1ZmZlclByaXZhdGVEaWRSZWNlaXZlU2FtcGxlKE1l ZGlhU2FtcGxlJiBzYW1wbGUpCiAgICAgICAgICAgICAgICAgZXJhc2VkU2FtcGxlcy5hZGRSYW5n ZShpdGVyX3BhaXIuZmlyc3QsIGl0ZXJfcGFpci5zZWNvbmQpOwogICAgICAgICB9CiAKKyAgICAg ICAgLy8gV2hlbiBhcHBlbmRpbmcgbWVkaWEgY29udGFpbmluZyBCLWZyYW1lcyAobWVkaWEgd2hv c2Ugc2FtcGxlcycgcHJlc2VudGF0aW9uIHRpbWVzdGFtcHMKKyAgICAgICAgLy8gZG8gbm90IGlu Y3JlYXNlIG1vbm90b25pY2FsbHksIHRoZSBwcmlvciBlcmFzZSBzdGVwcyBjb3VsZCBsZWF2ZSBh IHNhbXBsZSBpbiB0aGUgdHJhY2tCdWZmZXIKKyAgICAgICAgLy8gd2hpY2ggd2lsbCBiZSBkaXNj b25uZWN0ZWQgZnJvbSBpdHMgcHJldmlvdXMgSS1mcmFtZS4gSWYgdGhlIGluY29taW5nIGZyYW1l IGlzIGFuIEktZnJhbWUsCisgICAgICAgIC8vIHJlbW92ZSBhbGwgc2FtcGxlcyBpbiBkZWNvZGUg b3JkZXIgYmV0d2VlbiB0aGUgaW5jb21pbmcgSS1mcmFtZSdzIGRlY29kZSB0aW1lc3RhbXAgYW5k IHRoZQorICAgICAgICAvLyBuZXh0IEktZnJhbWUuIFNlZSA8aHR0cHM6Ly9naXRodWIuY29tL3cz Yy9tZWRpYS1zb3VyY2UvaXNzdWVzLzE4Nz4gZm9yIGEgZGlzY3Vzc2lvbiBvZiB3aGF0CisgICAg ICAgIC8vIHRoZSBob3cgdGhlIE1TRSBzcGVjaWZpY2F0aW9uIHNob3VsZCBoYW5kbGllIHRoaXMg c2VjbmFyaW8uCisgICAgICAgIGRvIHsKKyAgICAgICAgICAgIGlmICghc2FtcGxlLmlzU3luYygp KQorICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBEZWNvZGVPcmRlclNhbXBs ZU1hcDo6S2V5VHlwZSBkZWNvZGVLZXkoc2FtcGxlLmRlY29kZVRpbWUoKSwgc2FtcGxlLnByZXNl bnRhdGlvblRpbWUoKSk7CisgICAgICAgICAgICBhdXRvIG5leHRTYW1wbGVJbkRlY29kZU9yZGVy ID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZpbmRTYW1wbGVBZnRlckRlY29k ZUtleShkZWNvZGVLZXkpOworICAgICAgICAgICAgaWYgKG5leHRTYW1wbGVJbkRlY29kZU9yZGVy ID09IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3JkZXIoKS5lbmQoKSkKKyAgICAgICAgICAg ICAgICBicmVhazsKKworICAgICAgICAgICAgaWYgKG5leHRTYW1wbGVJbkRlY29kZU9yZGVyLT5z ZWNvbmQtPmlzU3luYygpKQorICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAgICAgICAgICBh dXRvIG5leHRTeW5jU2FtcGxlID0gdHJhY2tCdWZmZXIuc2FtcGxlcy5kZWNvZGVPcmRlcigpLmZp bmRTeW5jU2FtcGxlQWZ0ZXJEZWNvZGVJdGVyYXRvcihuZXh0U2FtcGxlSW5EZWNvZGVPcmRlcik7 CisgICAgICAgICAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAiRGlzY292ZXJlZCBvdXQtb2Yt b3JkZXIgZnJhbWVzLCBmcm9tOiAiLCAqbmV4dFNhbXBsZUluRGVjb2RlT3JkZXItPnNlY29uZCwg IiB0bzogIiwgKG5leHRTeW5jU2FtcGxlID09IHRyYWNrQnVmZmVyLnNhbXBsZXMuZGVjb2RlT3Jk ZXIoKS5lbmQoKSA/ICJbZW5kXSJfcyA6IHRvU3RyaW5nKCpuZXh0U3luY1NhbXBsZS0+c2Vjb25k KSkpOworICAgICAgICAgICAgZXJhc2VkU2FtcGxlcy5hZGRSYW5nZShuZXh0U2FtcGxlSW5EZWNv ZGVPcmRlciwgbmV4dFN5bmNTYW1wbGUpOworICAgICAgICB9IHdoaWxlIChmYWxzZSk7CisKICAg ICAgICAgLy8gVGhlcmUgYXJlIG1hbnkgZmlsZXMgb3V0IHRoZXJlIHdoZXJlIHRoZSBmcmFtZSB0 aW1lcyBhcmUgbm90IHBlcmZlY3RseSBjb250aWd1b3VzIGFuZCBtYXkgaGF2ZSBzbWFsbCBvdmVy bGFwcwogICAgICAgICAvLyBiZXR3ZWVuIHRoZSBiZWdpbm5pbmcgb2YgYSBmcmFtZSBhbmQgdGhl IGVuZCBvZiB0aGUgcHJldmlvdXMgb25lOyB0aGVyZWZvcmUgYSB0b2xlcmFuY2UgaXMgbmVlZGVk IHdoZW5ldmVyCiAgICAgICAgIC8vIGR1cmF0aW9ucyBhcmUgY29uc2lkZXJlZC4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1 MmVhOWFjODliOGQ2Njc4NjZmMmI4NmNmYzQxMWQyMmIzMDkxOWM1Li40NGJiMzk2NDc4Njg3NzM5 ODc2NTk1ZGExMDc4OTQyMzVjMjk3Yzc5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjAtMDEt MTcgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW01TRV0gRGVj b2RlIGdsaXRjaGVzIHdoZW4gd2F0Y2hpbmcgdmlkZW9zIG9uIENOTi5jb20KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNjQxMgorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTU2ODU2MzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWGFiaWVyIFJvZHJp Z3Vlei1DYWx2YXIuCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNl LXNhbXBsZXMtb3V0LW9mLW9yZGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVk aWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1zYW1wbGVzLW91dC1vZi1vcmRlci5odG1sOiBB ZGRlZC4KKwogMjAyMC0wMS0wNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAg ICAgICAgIFJlZ3Jlc3Npb24gcjI1NDAyOTogaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9kb20vZXZlbnRzL0V2ZW50VGFyZ2V0LWRpc3BhdGNoRXZlbnQuaHRtbCBpcyBmYWlsaW5nCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXNh bXBsZXMtb3V0LW9mLW9yZGVyLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlh LXNvdXJjZS9tZWRpYS1zb3VyY2Utc2FtcGxlcy1vdXQtb2Ytb3JkZXItZXhwZWN0ZWQudHh0Cm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjdlNWMxMTdmMWU5MDZmZWIyZTNkZTMwZjk4Mjg5NTE0YmQ0ZGZhYTkKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNl LXNhbXBsZXMtb3V0LW9mLW9yZGVyLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIwIEBACisKK1JV Tih2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0VVJMKHNvdXJjZSkpCitFVkVOVChzb3VyY2Vv cGVuKQorUlVOKHNvdXJjZUJ1ZmZlciA9IHNvdXJjZS5hZGRTb3VyY2VCdWZmZXIoInZpZGVvL21v Y2s7IGNvZGVjcz1tb2NrIikpCitGaXJzdCBzZWdtZW50IGhhcyBub3JtYWwsIG1vbm90b25pY2Fs bHkgaW5jcmVhc2luZyBzYW1wbGVzLgorUlVOKHNvdXJjZUJ1ZmZlci5hcHBlbmRCdWZmZXIobWVk aWFTZWdtZW50KSkKK0VWRU5UKHVwZGF0ZWVuZCkKK0VYUEVDVEVEIChidWZmZXJlZFNhbXBsZXMu bGVuZ3RoID09ICczJykgT0sKK3tQVFMoezEvMSA9IDEuMDAwMDAwfSksIERUUyh7MS8xID0gMS4w MDAwMDB9KSwgZHVyYXRpb24oezEvMSA9IDEuMDAwMDAwfSksIGZsYWdzKDEpLCBnZW5lcmF0aW9u KDApfQore1BUUyh7Mi8xID0gMi4wMDAwMDB9KSwgRFRTKHsyLzEgPSAyLjAwMDAwMH0pLCBkdXJh dGlvbih7MS8xID0gMS4wMDAwMDB9KSwgZmxhZ3MoMCksIGdlbmVyYXRpb24oMCl9Cit7UFRTKHsz LzEgPSAzLjAwMDAwMH0pLCBEVFMoezMvMSA9IDMuMDAwMDAwfSksIGR1cmF0aW9uKHsxLzEgPSAx LjAwMDAwMH0pLCBmbGFncygwKSwgZ2VuZXJhdGlvbigwKX0KK1NlY29uZCwgb3ZlcmxhcHBpbmcg c2VnbWVudCBoYXMgb3V0LW9mLWRpc3BsYXktb3JkZXIgc2FtcGxlcy4gVGhpcyBhcHBlbmQgc2hv dWxkIHJlcGxhY2UgdGhlIGxhc3Qgc2FtcGxlIGZyb20gdGhlIHByZXZpb3VzIGFwcGVuZC4KK1JV Tihzb3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKG1lZGlhU2VnbWVudCkpCitFVkVOVCh1cGRhdGVl bmQpCitFWFBFQ1RFRCAoYnVmZmVyZWRTYW1wbGVzLmxlbmd0aCA9PSAnMycpIE9LCit7UFRTKHsx LzEgPSAxLjAwMDAwMH0pLCBEVFMoezEvMSA9IDEuMDAwMDAwfSksIGR1cmF0aW9uKHsxLzEgPSAx LjAwMDAwMH0pLCBmbGFncygxKSwgZ2VuZXJhdGlvbigwKX0KK3tQVFMoezIvMSA9IDIuMDAwMDAw fSksIERUUyh7Mi8xID0gMi4wMDAwMDB9KSwgZHVyYXRpb24oezEvMSA9IDEuMDAwMDAwfSksIGZs YWdzKDApLCBnZW5lcmF0aW9uKDApfQore1BUUyh7NC8xID0gNC4wMDAwMDB9KSwgRFRTKHsyLzEg PSAyLjAwMDAwMH0pLCBkdXJhdGlvbih7MS8xID0gMS4wMDAwMDB9KSwgZmxhZ3MoMSksIGdlbmVy YXRpb24oMSl9CitFTkQgT0YgVEVTVAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRpYS9t ZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXNhbXBsZXMtb3V0LW9mLW9yZGVyLmh0bWwgYi9MYXlv dXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLXNhbXBsZXMtb3V0LW9mLW9y ZGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uYWE4YjY1ZTJhODNiZDdjZDcxZjU4NGNjZmUwNDJlN2ZiZWIw YjgwMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9t ZWRpYS1zb3VyY2Utc2FtcGxlcy1vdXQtb2Ytb3JkZXIuaHRtbApAQCAtMCwwICsxLDU3IEBACis8 IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPm1lZGlhLXNvdXJjZS1z YW1wbGVzLW91dC1vZi1vcmRlcjwvdGl0bGU+CisgICAgPHNjcmlwdCBzcmM9Im1vY2stbWVkaWEt c291cmNlLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vdmlkZW8tdGVzdC5qcyI+ PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICB2YXIgc291cmNlOworICAgIHZhciBzb3VyY2VC dWZmZXI7CisgICAgdmFyIGluaXRTZWdtZW50OworICAgIHZhciBtZWRpYVNlZ21lbnQ7CisKKyAg ICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAgaW50ZXJuYWxzLmluaXRpYWxpemVNb2Nr TWVkaWFTb3VyY2UoKTsKKworICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgYXN5 bmMgZXZlbnQgPT4geworICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisKKyAgICAgICAgc291 cmNlID0gbmV3IE1lZGlhU291cmNlKCk7CisgICAgICAgIHJ1bigndmlkZW8uc3JjID0gVVJMLmNy ZWF0ZU9iamVjdFVSTChzb3VyY2UpJyk7CisgICAgICAgIGF3YWl0IHdhaXRGb3Ioc291cmNlLCAn c291cmNlb3BlbicpOworCisgICAgICAgIHJ1bignc291cmNlQnVmZmVyID0gc291cmNlLmFkZFNv dXJjZUJ1ZmZlcigidmlkZW8vbW9jazsgY29kZWNzPW1vY2siKScpOworICAgICAgICBjb25zb2xl V3JpdGUoJ0ZpcnN0IHNlZ21lbnQgaGFzIG5vcm1hbCwgbW9ub3RvbmljYWxseSBpbmNyZWFzaW5n IHNhbXBsZXMuJykKKyAgICAgICAgbWVkaWFTZWdtZW50ID0gY29uY2F0ZW5hdGVTYW1wbGVzKFsK KyAgICAgICAgICAgIG1ha2VBSW5pdCgyLCBbbWFrZUFUcmFjaygxLCAnbW9jaycsIFRSQUNLX0tJ TkQuQVVESU8pXSksIAorICAgICAgICAgICAgbWFrZUFTYW1wbGUoMSwgMSwgMSwgMSwgMSwgU0FN UExFX0ZMQUcuU1lOQywgMCksCisgICAgICAgICAgICBtYWtlQVNhbXBsZSgyLCAyLCAxLCAxLCAx LCBTQU1QTEVfRkxBRy5OT05FLCAwKSwKKyAgICAgICAgICAgIG1ha2VBU2FtcGxlKDMsIDMsIDEs IDEsIDEsIFNBTVBMRV9GTEFHLk5PTkUsIDApLAorICAgICAgICBdKTsKKyAgICAgICAgcnVuKCdz b3VyY2VCdWZmZXIuYXBwZW5kQnVmZmVyKG1lZGlhU2VnbWVudCknKTsKKyAgICAgICAgYXdhaXQg d2FpdEZvcihzb3VyY2VCdWZmZXIsICd1cGRhdGVlbmQnKTsKKworICAgICAgICBidWZmZXJlZFNh bXBsZXMgPSBpbnRlcm5hbHMuYnVmZmVyZWRTYW1wbGVzRm9yVHJhY2tJRChzb3VyY2VCdWZmZXIs IDEpOworICAgICAgICB0ZXN0RXhwZWN0ZWQoImJ1ZmZlcmVkU2FtcGxlcy5sZW5ndGgiLCAzKTsK KyAgICAgICAgYnVmZmVyZWRTYW1wbGVzLmZvckVhY2goY29uc29sZVdyaXRlKTsKKworICAgICAg ICBjb25zb2xlV3JpdGUoJ1NlY29uZCwgb3ZlcmxhcHBpbmcgc2VnbWVudCBoYXMgb3V0LW9mLWRp c3BsYXktb3JkZXIgc2FtcGxlcy4gVGhpcyBhcHBlbmQgc2hvdWxkIHJlcGxhY2UgdGhlIGxhc3Qg c2FtcGxlIGZyb20gdGhlIHByZXZpb3VzIGFwcGVuZC4nKQorICAgICAgICBtZWRpYVNlZ21lbnQg PSBjb25jYXRlbmF0ZVNhbXBsZXMoWworICAgICAgICAgICAgbWFrZUFJbml0KDIsIFttYWtlQVRy YWNrKDEsICdtb2NrJywgVFJBQ0tfS0lORC5BVURJTyldKSwgCisgICAgICAgICAgICBtYWtlQVNh bXBsZSg0LCAyLCAxLCAxLCAxLCBTQU1QTEVfRkxBRy5TWU5DLCAxKSwKKyAgICAgICAgXSk7Cisg ICAgICAgIHJ1bignc291cmNlQnVmZmVyLmFwcGVuZEJ1ZmZlcihtZWRpYVNlZ21lbnQpJyk7Cisg ICAgICAgIGF3YWl0IHdhaXRGb3Ioc291cmNlQnVmZmVyLCAndXBkYXRlZW5kJyk7CisKKyAgICAg ICAgYnVmZmVyZWRTYW1wbGVzID0gaW50ZXJuYWxzLmJ1ZmZlcmVkU2FtcGxlc0ZvclRyYWNrSUQo c291cmNlQnVmZmVyLCAxKTsKKyAgICAgICAgdGVzdEV4cGVjdGVkKCJidWZmZXJlZFNhbXBsZXMu bGVuZ3RoIiwgMyk7CisgICAgICAgIGJ1ZmZlcmVkU2FtcGxlcy5mb3JFYWNoKGNvbnNvbGVXcml0 ZSk7CisKKyAgICAgICAgZW5kVGVzdCgpOworICAgIH0pOworICAgIDwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+CisgICAgPHZpZGVvPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg==