223260 2021-03-16 10:17:03 -0700 ANGLE Metal fixups for program generation, readPixels 2021-03-17 13:45:30 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 222239 1 kpiddington webkit-unassigned dino ews-watchlist graouts kondapallykalyan webkit-bug-importer oldest_to_newest 1740003 0 kpiddington 2021-03-16 10:17:03 -0700 ANGLE Metal fixups for program generation 1740024 1 423353 kpiddington 2021-03-16 10:44:16 -0700 Created attachment 423353 Patch 1740025 2 ews-watchlist 2021-03-16 10:45:20 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1740027 3 kpiddington 2021-03-16 10:48:57 -0700 2021-03-16 Kyle Piddington <kpiddington@apple.com> ANGLE Metal fixups for program generation, readPixels https://bugs.webkit.org/show_bug.cgi?id=223260 This diff fixes the following tests: webgl/2.0.0/conformance2/glsl3/texture-offset-uniform-texture-coordinate.html Is fixed by dropping 'thread' qualifiers on our intermediate texture sampling helper functions. Previously, any uniforms used in sampling textures would have had issues with their namespace. webgl/2.0.0/conformance2/reading/read-pixels-pack-parameters.html is fixed by correcting an issue with reading from outside the framebuffer. ANGLE Metal was previously reading to the start of the output array, rather than a proper offset. webgl/2.0.0/conformance2/glsl3/array-equality.html is fixed by adding additional equality functions for handling arrays of structs. Reviewed by NOBODY (OOPS!). * src/compiler/translator/TranslatorMetalDirect/EmitMetal.cpp: (GetOperatorString): * src/compiler/translator/TranslatorMetalDirect/ProgramPrelude.cpp: * src/libANGLE/renderer/metal/FrameBufferMtl.mm: (rx::FramebufferMtl::readPixels): 1740227 4 423353 dino 2021-03-16 14:54:38 -0700 Comment on attachment 423353 Patch You're missing a changelog. 1740779 5 423501 kpiddington 2021-03-17 10:43:00 -0700 Created attachment 423501 Patch 1740780 6 423502 kpiddington 2021-03-17 10:50:54 -0700 Created attachment 423502 Patch 1740885 7 dino 2021-03-17 13:44:42 -0700 Committed r274585 (235426@main): <https://commits.webkit.org/235426@main> 1740887 8 webkit-bug-importer 2021-03-17 13:45:22 -0700 <rdar://problem/75541805> 423353 2021-03-16 10:44:16 -0700 2021-03-17 10:42:57 -0700 Patch bug-223260-20210316104415.patch text/plain 6415 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0MDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvRW1p dE1ldGFsLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xh dG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9FbWl0TWV0YWwuY3BwCmluZGV4IDk5ZjA0ODJkYzk3 N2JmM2MzNGMzZGFkMTc2MzJmYzdiN2U4NzRmNzMuLjkyNTNmZDkzZmRiMzkzZmYzMDcxOGI2MmNh NDFlNWVkMzEzMzM4YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9j b21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9FbWl0TWV0YWwuY3BwCisr KyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5z bGF0b3JNZXRhbERpcmVjdC9FbWl0TWV0YWwuY3BwCkBAIC0zNzcsNiArMzc3LDEyIEBAIHN0YXRp YyBjb25zdCBjaGFyICpHZXRPcGVyYXRvclN0cmluZyhUT3BlcmF0b3Igb3AsCiAgICAgICAgICAg ICByZXR1cm4gIiE9IjsKIAogICAgICAgICBjYXNlIFRPcGVyYXRvcjo6RU9wRXF1YWw6CisgICAg ICAgICAgICBpZigoYXJnVHlwZTAtPmdldFN0cnVjdCgpICYmIGFyZ1R5cGUxLT5nZXRTdHJ1Y3Qo KSkgJiYKKyAgICAgICAgICAgICAgIChhcmdUeXBlMC0+aXNBcnJheSgpICYmIGFyZ1R5cGUxLT5p c0FycmF5KCkpKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldHVybiAiQU5HTEVf ZXF1YWxTdHJ1Y3RBcnJheSI7CisgICAgICAgICAgICB9CisgICAgICAgICAgIAogICAgICAgICAg ICAgaWYgKChhcmdUeXBlMC0+aXNWZWN0b3IoKSAmJiBhcmdUeXBlMS0+aXNWZWN0b3IoKSkgfHwK ICAgICAgICAgICAgICAgICAoYXJnVHlwZTAtPmdldFN0cnVjdCgpICYmIGFyZ1R5cGUxLT5nZXRT dHJ1Y3QoKSkgfHwKICAgICAgICAgICAgICAgICAoYXJnVHlwZTAtPmlzQXJyYXkoKSAmJiBhcmdU eXBlMS0+aXNBcnJheSgpKSB8fApAQCAtMzg5LDYgKzM5NSwxMiBAQCBzdGF0aWMgY29uc3QgY2hh ciAqR2V0T3BlcmF0b3JTdHJpbmcoVE9wZXJhdG9yIG9wLAogICAgICAgICAgICAgcmV0dXJuICI9 PSI7CiAKICAgICAgICAgY2FzZSBUT3BlcmF0b3I6OkVPcE5vdEVxdWFsOgorICAgICAgICAgICAg aWYoKGFyZ1R5cGUwLT5nZXRTdHJ1Y3QoKSAmJiBhcmdUeXBlMS0+Z2V0U3RydWN0KCkpICYmCisg ICAgICAgICAgICAgICAoYXJnVHlwZTAtPmlzQXJyYXkoKSAmJiBhcmdUeXBlMS0+aXNBcnJheSgp KSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gIkFOR0xFX25vdEVxdWFs U3RydWN0QXJyYXkiOworICAgICAgICAgICAgfQorICAgICAgICAgICAKICAgICAgICAgICAgIGlm ICgoYXJnVHlwZTAtPmlzVmVjdG9yKCkgJiYgYXJnVHlwZTEtPmlzVmVjdG9yKCkpIHx8CiAgICAg ICAgICAgICAgICAgKGFyZ1R5cGUwLT5pc0FycmF5KCkgJiYgYXJnVHlwZTEtPmlzQXJyYXkoKSkg fHwKICAgICAgICAgICAgICAgICAoYXJnVHlwZTAtPmlzTWF0cml4KCkgJiYgYXJnVHlwZTEtPmlz TWF0cml4KCkpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBp bGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Byb2dyYW1QcmVsdWRlLmNwcCBi L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0 b3JNZXRhbERpcmVjdC9Qcm9ncmFtUHJlbHVkZS5jcHAKaW5kZXggMzBiYjRhMjY5N2Q2MTZkZjNm MTFhM2UyZTIxMmE3YjEzYzBlMjM0MC4uYWRmNmY4ZmQ4OWM4ZGI1ZTgwZDk4NjhjNDdkMDMzZjNh ODJmM2Y2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Byb2dyYW1QcmVsdWRlLmNwcAorKysg Yi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xh dG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1ZGUuY3BwCkBAIC0xNTEsOCArMTUxLDEwIEBAIGNs YXNzIFByb2dyYW1QcmVsdWRlIDogcHVibGljIFRJbnRlcm1UcmF2ZXJzZXIKICAgICB2b2lkIGVx dWFsTWF0cml4KCk7CiAgICAgdm9pZCBub3RFcXVhbFZlY3RvcigpOwogICAgIHZvaWQgbm90RXF1 YWxTdHJ1Y3QoKTsKKyAgICB2b2lkIG5vdEVxdWFsU3RydWN0QXJyYXkoKTsKICAgICB2b2lkIG5v dEVxdWFsTWF0cml4KCk7CiAgICAgdm9pZCBlcXVhbEFycmF5KCk7CisgICAgdm9pZCBlcXVhbFN0 cnVjdEFycmF5KCk7CiAgICAgdm9pZCBub3RFcXVhbEFycmF5KCk7CiAgICAgdm9pZCBzaWduKCk7 CiAgICAgdm9pZCBwYWNrX2hhbGZfMngxNigpOwpAQCAtMTA1OCw2ICsxMDYwLDIyIEBAIEFOR0xF X0FMV0FZU19JTkxJTkUgYm9vbCBBTkdMRV9lcXVhbChtZXRhbDo6YXJyYXk8VCwgTj4gdSwgbWV0 YWw6OmFycmF5PFQsIE4+IHYpCiB9CiApIikKIAorUFJPR1JBTV9QUkVMVURFX0RFQ0xBUkUoZXF1 YWxTdHJ1Y3RBcnJheSwKKyAgICAgICAgICAgICAgICAgICAgICAgIFIiKAordGVtcGxhdGUgPHR5 cGVuYW1lIFQsIHNpemVfdCBOPgorQU5HTEVfQUxXQVlTX0lOTElORSBib29sIEFOR0xFX2VxdWFs U3RydWN0QXJyYXkobWV0YWw6OmFycmF5PFQsIE4+IHUsIG1ldGFsOjphcnJheTxULCBOPiB2KQor eworICAgIGZvcihzaXplX3QgaSA9IDA7IGkgPCBOOyBpKyspCisgICAgeworICAgICAgICBpZiAo QU5HTEVfZXF1YWwodVtpXSwgdltpXSkgPT0gZmFsc2UpIAorICAgICAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKykiKQorCisKKwogUFJPR1JBTV9QUkVM VURFX0RFQ0xBUkUobm90RXF1YWxBcnJheSwKICAgICAgICAgICAgICAgICAgICAgICAgIFIiKAog dGVtcGxhdGUgPHR5cGVuYW1lIFQsIHNpemVfdCBOPgpAQCAtMTEyNiw2ICsxMTQ0LDIxIEBAIEFO R0xFX0FMV0FZU19JTkxJTkUgYm9vbCBBTkdMRV9ub3RFcXVhbFN0cnVjdCh0aHJlYWQgY29uc3Qg VCAmYSwgdGhyZWFkIGNvbnN0IFQKICAgICAgICAgICAgICAgICAgICAgICAgIGVxdWFsVmVjdG9y KCksCiAgICAgICAgICAgICAgICAgICAgICAgICBlcXVhbE1hdHJpeCgpKQogCitQUk9HUkFNX1BS RUxVREVfREVDTEFSRShub3RFcXVhbFN0cnVjdEFycmF5LAorICAgICAgICAgICAgICAgICAgICAg ICAgUiIoCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgc2l6ZV90IE4+CitBTkdMRV9BTFdBWVNfSU5M SU5FIGJvb2wgQU5HTEVfbm90RXF1YWxTdHJ1Y3RBcnJheShtZXRhbDo6YXJyYXk8VCwgTj4gdSwg bWV0YWw6OmFycmF5PFQsIE4+IHYpCit7CisgICAgZm9yKHNpemVfdCBpID0gMDsgaSA8IE47IGkr KykKKyAgICB7CisgICAgICAgIGlmIChBTkdMRV9ub3RFcXVhbFN0cnVjdCh1W2ldLCB2W2ldKSkK KyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKyAgICByZXR1cm4gZmFsc2U7Cit9Cisp IiwKKyAgICAgICAgICAgICAgICAgICAgICAgIG5vdEVxdWFsU3RydWN0KCkpCisKIFBST0dSQU1f UFJFTFVERV9ERUNMQVJFKHZlY3RvckVsZW1SZWYsIFIiKAogdGVtcGxhdGUgPHR5cGVuYW1lIFQs IGludCBOPgogc3RydWN0IEFOR0xFX1ZlY3RvckVsZW1SZWYKQEAgLTIwNTgsOSArMjA5MSw5IEBA IHRlbXBsYXRlIDx0eXBlbmFtZSBUZXh0dXJlLCBpbnQgTj4KIEFOR0xFX0FMV0FZU19JTkxJTkUg YXV0byBBTkdMRV90ZXh0dXJlR3JhZF9pbXBsKAogICAgIHRocmVhZCBUZXh0dXJlICZ0ZXh0dXJl LAogICAgIHRocmVhZCBtZXRhbDo6c2FtcGxlciBjb25zdCAmc2FtcGxlciwKLSAgICB0aHJlYWQg bWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgJmNvb3JkLAotICAgIHRocmVhZCBtZXRhbDo6dmVj PGZsb2F0LCBOPiBjb25zdCAmZFBkeCwKLSAgICB0aHJlYWQgbWV0YWw6OnZlYzxmbG9hdCwgTj4g Y29uc3QgJmRQZHkpCisgICAgbWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgY29vcmQsCisgICAg bWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgZFBkeCwKKyAgICBtZXRhbDo6dmVjPGZsb2F0LCBO PiBjb25zdCBkUGR5KQogewogICAgIHJldHVybiB0ZXh0dXJlLnNhbXBsZShzYW1wbGVyLCBjb29y ZCwgQU5HTEVfZ3JhZGllbnQ8Tj4oZFBkeCwgZFBkeSkpOwogfQpAQCAtMjE5NCwxMCArMjIyNywx MCBAQCB0ZW1wbGF0ZSA8dHlwZW5hbWUgVGV4dHVyZSwgaW50IE4+CiBBTkdMRV9BTFdBWVNfSU5M SU5FIGF1dG8gQU5HTEVfdGV4dHVyZUdyYWRPZmZzZXRfaW1wbCgKICAgICB0aHJlYWQgVGV4dHVy ZSAmdGV4dHVyZSwKICAgICB0aHJlYWQgbWV0YWw6OnNhbXBsZXIgY29uc3QgJnNhbXBsZXIsCi0g ICAgdGhyZWFkIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0ICZjb29yZCwKLSAgICB0aHJlYWQg bWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgJmRQZHgsCi0gICAgdGhyZWFkIG1ldGFsOjp2ZWM8 ZmxvYXQsIE4+IGNvbnN0ICZkUGR5LAotICAgIHRocmVhZCBtZXRhbDo6dmVjPGludCwgTj4gY29u c3QgJm9mZnNldCkKKyAgICBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCBjb29yZCwKKyAgICBt ZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCBkUGR4LAorICAgIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+ IGNvbnN0IGRQZHksCisgICAgbWV0YWw6OnZlYzxpbnQsIE4+IGNvbnN0IG9mZnNldCkKIHsKICAg ICByZXR1cm4gdGV4dHVyZS5zYW1wbGUoc2FtcGxlciwgY29vcmQsIEFOR0xFX2dyYWRpZW50PE4+ KGRQZHgsIGRQZHkpLCBvZmZzZXQpOwogfQpAQCAtMzQzMiw2ICszNDY1LDEwIEBAIHZvaWQgUHJv Z3JhbVByZWx1ZGU6OnZpc2l0T3BlcmF0b3IoVE9wZXJhdG9yIG9wLAogICAgICAgICAgICAgewog ICAgICAgICAgICAgICAgIGVxdWFsQXJyYXkoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGlmKGFyZ1R5cGUwLT5nZXRTdHJ1Y3QoKSAmJiBhcmdUeXBlMS0+Z2V0U3RydWN0KCkgJiYgYXJn VHlwZTAtPmlzQXJyYXkoKSAmJiBhcmdUeXBlMS0+aXNBcnJheSgpKQorICAgICAgICAgICAgewor ICAgICAgICAgICAgICAgIGVxdWFsU3RydWN0QXJyYXkoKTsKKyAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGlmKGFyZ1R5cGUwLT5pc01hdHJpeCgpICYmIGFyZ1R5cGUxLT5pc01hdHJpeCgpKQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIGVxdWFsTWF0cml4KCk7CkBAIC0zNDUyLDYg KzM0ODksMTAgQEAgdm9pZCBQcm9ncmFtUHJlbHVkZTo6dmlzaXRPcGVyYXRvcihUT3BlcmF0b3Ig b3AsCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgbm90RXF1YWxBcnJheSgpOwogICAg ICAgICAgICAgfQorICAgICAgICAgICAgaWYoYXJnVHlwZTAtPmdldFN0cnVjdCgpICYmIGFyZ1R5 cGUxLT5nZXRTdHJ1Y3QoKSAmJiBhcmdUeXBlMC0+aXNBcnJheSgpICYmIGFyZ1R5cGUxLT5pc0Fy cmF5KCkpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgbm90RXF1YWxTdHJ1Y3RBcnJh eSgpOworICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYoYXJnVHlwZTAtPmlzTWF0cml4KCkg JiYgYXJnVHlwZTEtPmlzTWF0cml4KCkpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg bm90RXF1YWxNYXRyaXgoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5tbSBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5t bQppbmRleCAwOGJkYWYyYjBhYmNmN2MzNWM4YTJiOWY5ODYyNjk4MTIwYTZjYzYyLi43OGMxMWU5 MDA3NzE5Yzk0ZGRlYmE0YTE4YWQ3NTFhMjE3YmE1NDEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJhbWVCdWZmZXJNdGwu bW0KKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL0ZyYW1lQnVmZmVyTXRsLm1tCkBAIC0yNDgsNyArMjQ4LDcgQEAgYW5nbGU6OlJlc3VsdCBG cmFtZWJ1ZmZlck10bDo6cmVhZFBpeGVscyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAg ICBpZiAocGFyYW1zLnBhY2tCdWZmZXIpCiAgICAgewogICAgICAgICAvLyBJZiBQQk8gaXMgYWN0 aXZlLCBwaXhlbHMgaXMgdHJlYXRlZCBhcyBvZmZzZXQuCi0gICAgICAgIHBhcmFtcy5vZmZzZXQg PSByZWludGVycHJldF9jYXN0PHB0cmRpZmZfdD4ocGl4ZWxzKTsKKyAgICAgICAgcGFyYW1zLm9m ZnNldCA9IHJlaW50ZXJwcmV0X2Nhc3Q8cHRyZGlmZl90PihwaXhlbHMpICsgb3V0cHV0U2tpcEJ5 dGVzOwogICAgIH0KIAogICAgIGlmIChtRmxpcFkpCg== 423501 2021-03-17 10:43:00 -0700 2021-03-17 10:50:51 -0700 Patch bug-223260-20210317104259.patch text/plain 8028 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNTg1MmE1ZWY2MDg4NDYxNzg3NWIyMDUwNGQ5Yjc4Mjg0YjIwNzZkNi4uMzMyOGViM2IzODU0 YTQ1OTQzYmNhYmNiY2EyNTM5ZmJkYzhkOTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE3ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQU5HTEUgTWV0YWwgZml4dXBzIGZvciBwcm9ncmFt IGdlbmVyYXRpb24sIHJlYWRQaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMzI2MAorICAgICAgIFRoaXMgZGlmZiBmaXhlcyB0aGUgZm9sbG93 aW5nIHRlc3RzOgorICAgICAgICAgICAgICAgd2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL2dsc2wz L3RleHR1cmUtb2Zmc2V0LXVuaWZvcm0tdGV4dHVyZS1jb29yZGluYXRlLmh0bWwgSXMgZml4ZWQg YnkgZHJvcHBpbmcgJ3RocmVhZCcgcXVhbGlmaWVycyBvbiBvdXIgaW50ZXJtZWRpYXRlIHRleHR1 cmUgc2FtcGxpbmcgaGVscGVyIGZ1bmN0aW9ucy4gUHJldmlvdXNseSwgYW55IHVuaWZvcm1zIHVz ZWQgaW4gc2FtcGxpbmcgdGV4dHVyZXMgd291bGQgaGF2ZSBoYWQgaXNzdWVzIHdpdGggdGhlaXIg bmFtZXNwYWNlLgorICAgICAgICAgICAgICAgd2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL3JlYWRp bmcvcmVhZC1waXhlbHMtcGFjay1wYXJhbWV0ZXJzLmh0bWwgaXMgZml4ZWQgYnkgY29ycmVjdGlu ZyBhbiBpc3N1ZSB3aXRoIHJlYWRpbmcgZnJvbSBvdXRzaWRlIHRoZSBmcmFtZWJ1ZmZlci4gQU5H TEUgTWV0YWwgd2FzIHByZXZpb3VzbHkgcmVhZGluZyB0byB0aGUgc3RhcnQgb2YgdGhlIG91dHB1 dCBhcnJheSwgcmF0aGVyIHRoYW4gYSBwcm9wZXIgb2Zmc2V0LgorICAgICAgICAgICAgICAgIHdl YmdsLzIuMC4wL2NvbmZvcm1hbmNlMi9nbHNsMy9hcnJheS1lcXVhbGl0eS5odG1sIGlzIGZpeGVk IGJ5IGFkZGluZyBhZGRpdGlvbmFsIGVxdWFsaXR5IGZ1bmN0aW9ucyBmb3IgaGFuZGxpbmcgYXJy YXlzIG9mIHN0cnVjdHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3Qv RW1pdE1ldGFsLmNwcDoKKyAgICAgICAgKEdldE9wZXJhdG9yU3RyaW5nKToKKyAgICAgICAgKiBz cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1 ZGUuY3BwOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZl ck10bC5tbToKKyAgICAgICAgKHJ4OjpGcmFtZWJ1ZmZlck10bDo6cmVhZFBpeGVscyk6CisKIDIw MjEtMDMtMTYgIEt5bGUgUGlkZGluZ3RvbiAgPGtwaWRkaW5ndG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZWdyZXNzaW9ucyBmcm9tIEFOR0xFIE1ldGFsIGVuYWJsZW1lbnQKZGlmZiAtLWdpdCBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0 b3JNZXRhbERpcmVjdC9FbWl0TWV0YWwuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0VtaXRNZXRhbC5jcHAK aW5kZXggOWNhNTlhN2U0NmU4MThiMDQwYmU0ZTg3MzJiNDU4NDMyMjlhMGNhYS4uMjJhZGI0MjZi OGViYWM1ZDVkNDNkZGNjZmQ2MzZkNDMzNWM1MjQ1NyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0 L0VtaXRNZXRhbC5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L0VtaXRNZXRhbC5jcHAKQEAgLTM3Nyw2 ICszNzcsMTIgQEAgc3RhdGljIGNvbnN0IGNoYXIgKkdldE9wZXJhdG9yU3RyaW5nKFRPcGVyYXRv ciBvcCwKICAgICAgICAgICAgIHJldHVybiAiIT0iOwogCiAgICAgICAgIGNhc2UgVE9wZXJhdG9y OjpFT3BFcXVhbDoKKyAgICAgICAgICAgIGlmKChhcmdUeXBlMC0+Z2V0U3RydWN0KCkgJiYgYXJn VHlwZTEtPmdldFN0cnVjdCgpKSAmJgorICAgICAgICAgICAgICAgKGFyZ1R5cGUwLT5pc0FycmF5 KCkgJiYgYXJnVHlwZTEtPmlzQXJyYXkoKSkpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgcmV0dXJuICJBTkdMRV9lcXVhbFN0cnVjdEFycmF5IjsKKyAgICAgICAgICAgIH0KKyAgICAg ICAgICAgCiAgICAgICAgICAgICBpZiAoKGFyZ1R5cGUwLT5pc1ZlY3RvcigpICYmIGFyZ1R5cGUx LT5pc1ZlY3RvcigpKSB8fAogICAgICAgICAgICAgICAgIChhcmdUeXBlMC0+Z2V0U3RydWN0KCkg JiYgYXJnVHlwZTEtPmdldFN0cnVjdCgpKSB8fAogICAgICAgICAgICAgICAgIChhcmdUeXBlMC0+ aXNBcnJheSgpICYmIGFyZ1R5cGUxLT5pc0FycmF5KCkpIHx8CkBAIC0zODksNiArMzk1LDEyIEBA IHN0YXRpYyBjb25zdCBjaGFyICpHZXRPcGVyYXRvclN0cmluZyhUT3BlcmF0b3Igb3AsCiAgICAg ICAgICAgICByZXR1cm4gIj09IjsKIAogICAgICAgICBjYXNlIFRPcGVyYXRvcjo6RU9wTm90RXF1 YWw6CisgICAgICAgICAgICBpZigoYXJnVHlwZTAtPmdldFN0cnVjdCgpICYmIGFyZ1R5cGUxLT5n ZXRTdHJ1Y3QoKSkgJiYKKyAgICAgICAgICAgICAgIChhcmdUeXBlMC0+aXNBcnJheSgpICYmIGFy Z1R5cGUxLT5pc0FycmF5KCkpKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIHJldHVy biAiQU5HTEVfbm90RXF1YWxTdHJ1Y3RBcnJheSI7CisgICAgICAgICAgICB9CisgICAgICAgICAg IAogICAgICAgICAgICAgaWYgKChhcmdUeXBlMC0+aXNWZWN0b3IoKSAmJiBhcmdUeXBlMS0+aXNW ZWN0b3IoKSkgfHwKICAgICAgICAgICAgICAgICAoYXJnVHlwZTAtPmlzQXJyYXkoKSAmJiBhcmdU eXBlMS0+aXNBcnJheSgpKSB8fAogICAgICAgICAgICAgICAgIChhcmdUeXBlMC0+aXNNYXRyaXgo KSAmJiBhcmdUeXBlMS0+aXNNYXRyaXgoKSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJv Z3JhbVByZWx1ZGUuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3Ry YW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Byb2dyYW1QcmVsdWRlLmNwcAppbmRleCA4 YzI5ZTY0NzhhM2NiZWExOTVjOGIwNWNjNTE3Y2JlNWZlOTNjNTY1Li44YjA2NTZhYWYzNzZlMWU4 Mjc0YWYxZjIwYmNiNzQ3MDcwMTZmMzQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3Jh bVByZWx1ZGUuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90 cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Qcm9ncmFtUHJlbHVkZS5jcHAKQEAgLTE1 MSw4ICsxNTEsMTAgQEAgY2xhc3MgUHJvZ3JhbVByZWx1ZGUgOiBwdWJsaWMgVEludGVybVRyYXZl cnNlcgogICAgIHZvaWQgZXF1YWxNYXRyaXgoKTsKICAgICB2b2lkIG5vdEVxdWFsVmVjdG9yKCk7 CiAgICAgdm9pZCBub3RFcXVhbFN0cnVjdCgpOworICAgIHZvaWQgbm90RXF1YWxTdHJ1Y3RBcnJh eSgpOwogICAgIHZvaWQgbm90RXF1YWxNYXRyaXgoKTsKICAgICB2b2lkIGVxdWFsQXJyYXkoKTsK KyAgICB2b2lkIGVxdWFsU3RydWN0QXJyYXkoKTsKICAgICB2b2lkIG5vdEVxdWFsQXJyYXkoKTsK ICAgICB2b2lkIHNpZ24oKTsKICAgICB2b2lkIHBhY2tfaGFsZl8yeDE2KCk7CkBAIC0xMDU4LDYg KzEwNjAsMjIgQEAgQU5HTEVfQUxXQVlTX0lOTElORSBib29sIEFOR0xFX2VxdWFsKG1ldGFsOjph cnJheTxULCBOPiB1LCBtZXRhbDo6YXJyYXk8VCwgTj4gdikKIH0KICkiKQogCitQUk9HUkFNX1BS RUxVREVfREVDTEFSRShlcXVhbFN0cnVjdEFycmF5LAorICAgICAgICAgICAgICAgICAgICAgICAg UiIoCit0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgc2l6ZV90IE4+CitBTkdMRV9BTFdBWVNfSU5MSU5F IGJvb2wgQU5HTEVfZXF1YWxTdHJ1Y3RBcnJheShtZXRhbDo6YXJyYXk8VCwgTj4gdSwgbWV0YWw6 OmFycmF5PFQsIE4+IHYpCit7CisgICAgZm9yKHNpemVfdCBpID0gMDsgaSA8IE47IGkrKykKKyAg ICB7CisgICAgICAgIGlmIChBTkdMRV9lcXVhbCh1W2ldLCB2W2ldKSA9PSBmYWxzZSkgCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorICAgIHJldHVybiB0cnVlOworfQorKSIpCisK KworCiBQUk9HUkFNX1BSRUxVREVfREVDTEFSRShub3RFcXVhbEFycmF5LAogICAgICAgICAgICAg ICAgICAgICAgICAgUiIoCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVCwgc2l6ZV90IE4+CkBAIC0xMTI2 LDYgKzExNDQsMjEgQEAgQU5HTEVfQUxXQVlTX0lOTElORSBib29sIEFOR0xFX25vdEVxdWFsU3Ry dWN0KHRocmVhZCBjb25zdCBUICZhLCB0aHJlYWQgY29uc3QgVAogICAgICAgICAgICAgICAgICAg ICAgICAgZXF1YWxWZWN0b3IoKSwKICAgICAgICAgICAgICAgICAgICAgICAgIGVxdWFsTWF0cml4 KCkpCiAKK1BST0dSQU1fUFJFTFVERV9ERUNMQVJFKG5vdEVxdWFsU3RydWN0QXJyYXksCisgICAg ICAgICAgICAgICAgICAgICAgICBSIigKK3RlbXBsYXRlIDx0eXBlbmFtZSBULCBzaXplX3QgTj4K K0FOR0xFX0FMV0FZU19JTkxJTkUgYm9vbCBBTkdMRV9ub3RFcXVhbFN0cnVjdEFycmF5KG1ldGFs OjphcnJheTxULCBOPiB1LCBtZXRhbDo6YXJyYXk8VCwgTj4gdikKK3sKKyAgICBmb3Ioc2l6ZV90 IGkgPSAwOyBpIDwgTjsgaSsrKQorICAgIHsKKyAgICAgICAgaWYgKEFOR0xFX25vdEVxdWFsU3Ry dWN0KHVbaV0sIHZbaV0pKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJl dHVybiBmYWxzZTsKK30KKykiLAorICAgICAgICAgICAgICAgICAgICAgICAgbm90RXF1YWxTdHJ1 Y3QoKSkKKwogUFJPR1JBTV9QUkVMVURFX0RFQ0xBUkUodmVjdG9yRWxlbVJlZiwgUiIoCiB0ZW1w bGF0ZSA8dHlwZW5hbWUgVCwgaW50IE4+CiBzdHJ1Y3QgQU5HTEVfVmVjdG9yRWxlbVJlZgpAQCAt MjA1OCw5ICsyMDkxLDkgQEAgdGVtcGxhdGUgPHR5cGVuYW1lIFRleHR1cmUsIGludCBOPgogQU5H TEVfQUxXQVlTX0lOTElORSBhdXRvIEFOR0xFX3RleHR1cmVHcmFkX2ltcGwoCiAgICAgdGhyZWFk IFRleHR1cmUgJnRleHR1cmUsCiAgICAgdGhyZWFkIG1ldGFsOjpzYW1wbGVyIGNvbnN0ICZzYW1w bGVyLAotICAgIHRocmVhZCBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCAmY29vcmQsCi0gICAg dGhyZWFkIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0ICZkUGR4LAotICAgIHRocmVhZCBtZXRh bDo6dmVjPGZsb2F0LCBOPiBjb25zdCAmZFBkeSkKKyAgICBtZXRhbDo6dmVjPGZsb2F0LCBOPiBj b25zdCBjb29yZCwKKyAgICBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCBkUGR4LAorICAgIG1l dGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0IGRQZHkpCiB7CiAgICAgcmV0dXJuIHRleHR1cmUuc2Ft cGxlKHNhbXBsZXIsIGNvb3JkLCBBTkdMRV9ncmFkaWVudDxOPihkUGR4LCBkUGR5KSk7CiB9CkBA IC0yMTk0LDEwICsyMjI3LDEwIEBAIHRlbXBsYXRlIDx0eXBlbmFtZSBUZXh0dXJlLCBpbnQgTj4K IEFOR0xFX0FMV0FZU19JTkxJTkUgYXV0byBBTkdMRV90ZXh0dXJlR3JhZE9mZnNldF9pbXBsKAog ICAgIHRocmVhZCBUZXh0dXJlICZ0ZXh0dXJlLAogICAgIHRocmVhZCBtZXRhbDo6c2FtcGxlciBj b25zdCAmc2FtcGxlciwKLSAgICB0aHJlYWQgbWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgJmNv b3JkLAotICAgIHRocmVhZCBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCAmZFBkeCwKLSAgICB0 aHJlYWQgbWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgJmRQZHksCi0gICAgdGhyZWFkIG1ldGFs Ojp2ZWM8aW50LCBOPiBjb25zdCAmb2Zmc2V0KQorICAgIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNv bnN0IGNvb3JkLAorICAgIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0IGRQZHgsCisgICAgbWV0 YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgZFBkeSwKKyAgICBtZXRhbDo6dmVjPGludCwgTj4gY29u c3Qgb2Zmc2V0KQogewogICAgIHJldHVybiB0ZXh0dXJlLnNhbXBsZShzYW1wbGVyLCBjb29yZCwg QU5HTEVfZ3JhZGllbnQ8Tj4oZFBkeCwgZFBkeSksIG9mZnNldCk7CiB9CkBAIC0zNDMyLDYgKzM0 NjUsMTAgQEAgdm9pZCBQcm9ncmFtUHJlbHVkZTo6dmlzaXRPcGVyYXRvcihUT3BlcmF0b3Igb3As CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgZXF1YWxBcnJheSgpOwogICAgICAgICAg ICAgfQorICAgICAgICAgICAgaWYoYXJnVHlwZTAtPmdldFN0cnVjdCgpICYmIGFyZ1R5cGUxLT5n ZXRTdHJ1Y3QoKSAmJiBhcmdUeXBlMC0+aXNBcnJheSgpICYmIGFyZ1R5cGUxLT5pc0FycmF5KCkp CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgZXF1YWxTdHJ1Y3RBcnJheSgpOworICAg ICAgICAgICAgfQogICAgICAgICAgICAgaWYoYXJnVHlwZTAtPmlzTWF0cml4KCkgJiYgYXJnVHlw ZTEtPmlzTWF0cml4KCkpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgZXF1YWxNYXRy aXgoKTsKQEAgLTM0NTIsNiArMzQ4OSwxMCBAQCB2b2lkIFByb2dyYW1QcmVsdWRlOjp2aXNpdE9w ZXJhdG9yKFRPcGVyYXRvciBvcCwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBub3RF cXVhbEFycmF5KCk7CiAgICAgICAgICAgICB9CisgICAgICAgICAgICBpZihhcmdUeXBlMC0+Z2V0 U3RydWN0KCkgJiYgYXJnVHlwZTEtPmdldFN0cnVjdCgpICYmIGFyZ1R5cGUwLT5pc0FycmF5KCkg JiYgYXJnVHlwZTEtPmlzQXJyYXkoKSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBu b3RFcXVhbFN0cnVjdEFycmF5KCk7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZihhcmdU eXBlMC0+aXNNYXRyaXgoKSAmJiBhcmdUeXBlMS0+aXNNYXRyaXgoKSkKICAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICBub3RFcXVhbE1hdHJpeCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0ZyYW1lQnVmZmVyTXRs Lm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L0ZyYW1lQnVmZmVyTXRsLm1tCmluZGV4IDA4YmRhZjJiMGFiY2Y3YzM1YzhhMmI5Zjk4NjI2OTgx MjBhNmNjNjIuLjc4YzExZTkwMDc3MTljOTRkZGViYTRhMThhZDc1MWEyMTdiYTU0MTAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRh bC9GcmFtZUJ1ZmZlck10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJhbWVCdWZmZXJNdGwubW0KQEAgLTI0OCw3ICsyNDgsNyBA QCBhbmdsZTo6UmVzdWx0IEZyYW1lYnVmZmVyTXRsOjpyZWFkUGl4ZWxzKGNvbnN0IGdsOjpDb250 ZXh0ICpjb250ZXh0LAogICAgIGlmIChwYXJhbXMucGFja0J1ZmZlcikKICAgICB7CiAgICAgICAg IC8vIElmIFBCTyBpcyBhY3RpdmUsIHBpeGVscyBpcyB0cmVhdGVkIGFzIG9mZnNldC4KLSAgICAg ICAgcGFyYW1zLm9mZnNldCA9IHJlaW50ZXJwcmV0X2Nhc3Q8cHRyZGlmZl90PihwaXhlbHMpOwor ICAgICAgICBwYXJhbXMub2Zmc2V0ID0gcmVpbnRlcnByZXRfY2FzdDxwdHJkaWZmX3Q+KHBpeGVs cykgKyBvdXRwdXRTa2lwQnl0ZXM7CiAgICAgfQogCiAgICAgaWYgKG1GbGlwWSkK 423502 2021-03-17 10:50:54 -0700 2021-03-17 13:45:30 -0700 Patch bug-223260-20210317105053.patch text/plain 9683 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggNTg1MmE1ZWY2MDg4NDYxNzg3NWIyMDUwNGQ5Yjc4Mjg0YjIwNzZkNi4uMzMyOGViM2IzODU0 YTQ1OTQzYmNhYmNiY2EyNTM5ZmJkYzhkOTc3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDIxLTAzLTE3ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQU5HTEUgTWV0YWwgZml4dXBzIGZvciBwcm9ncmFt IGdlbmVyYXRpb24sIHJlYWRQaXhlbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIyMzI2MAorICAgICAgIFRoaXMgZGlmZiBmaXhlcyB0aGUgZm9sbG93 aW5nIHRlc3RzOgorICAgICAgICAgICAgICAgd2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL2dsc2wz L3RleHR1cmUtb2Zmc2V0LXVuaWZvcm0tdGV4dHVyZS1jb29yZGluYXRlLmh0bWwgSXMgZml4ZWQg YnkgZHJvcHBpbmcgJ3RocmVhZCcgcXVhbGlmaWVycyBvbiBvdXIgaW50ZXJtZWRpYXRlIHRleHR1 cmUgc2FtcGxpbmcgaGVscGVyIGZ1bmN0aW9ucy4gUHJldmlvdXNseSwgYW55IHVuaWZvcm1zIHVz ZWQgaW4gc2FtcGxpbmcgdGV4dHVyZXMgd291bGQgaGF2ZSBoYWQgaXNzdWVzIHdpdGggdGhlaXIg bmFtZXNwYWNlLgorICAgICAgICAgICAgICAgd2ViZ2wvMi4wLjAvY29uZm9ybWFuY2UyL3JlYWRp bmcvcmVhZC1waXhlbHMtcGFjay1wYXJhbWV0ZXJzLmh0bWwgaXMgZml4ZWQgYnkgY29ycmVjdGlu ZyBhbiBpc3N1ZSB3aXRoIHJlYWRpbmcgZnJvbSBvdXRzaWRlIHRoZSBmcmFtZWJ1ZmZlci4gQU5H TEUgTWV0YWwgd2FzIHByZXZpb3VzbHkgcmVhZGluZyB0byB0aGUgc3RhcnQgb2YgdGhlIG91dHB1 dCBhcnJheSwgcmF0aGVyIHRoYW4gYSBwcm9wZXIgb2Zmc2V0LgorICAgICAgICAgICAgICAgIHdl YmdsLzIuMC4wL2NvbmZvcm1hbmNlMi9nbHNsMy9hcnJheS1lcXVhbGl0eS5odG1sIGlzIGZpeGVk IGJ5IGFkZGluZyBhZGRpdGlvbmFsIGVxdWFsaXR5IGZ1bmN0aW9ucyBmb3IgaGFuZGxpbmcgYXJy YXlzIG9mIHN0cnVjdHMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBzcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3Qv RW1pdE1ldGFsLmNwcDoKKyAgICAgICAgKEdldE9wZXJhdG9yU3RyaW5nKToKKyAgICAgICAgKiBz cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1 ZGUuY3BwOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZl ck10bC5tbToKKyAgICAgICAgKHJ4OjpGcmFtZWJ1ZmZlck10bDo6cmVhZFBpeGVscyk6CisKIDIw MjEtMDMtMTYgIEt5bGUgUGlkZGluZ3RvbiAgPGtwaWRkaW5ndG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBSZWdyZXNzaW9ucyBmcm9tIEFOR0xFIE1ldGFsIGVuYWJsZW1lbnQKZGlmZiAtLWdpdCBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0 b3JNZXRhbERpcmVjdC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3Ry YW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0LmgKaW5kZXggMzBhODg2N2RmNTczZmVmZjRm ZmYyNDNkNWQ2YzIxYzY2YjQ0Mzk2ZC4uNjY0Yjk0ZmNjYTM1ZWQxOWQwNTU2NDViZDQyZjk0Y2Vj MGQwMmE5MiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0LmgKKysrIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0LmgK QEAgLTgwLDYgKzgwLDcgQEAgY2xhc3MgVHJhbnNsYXRvck1ldGFsUmVmbGVjdGlvbgogICAgICAg ICB7CiAgICAgICAgICAgICByZXR1cm4gaXQtPnNlY29uZDsKICAgICAgICAgfQorICAgICAgICAv L0lmIHdlIGNhbid0IGZpbmQgYSBtYXRjaGluZyBzYW1wbGVyLCBhc3NlcnQgb3V0IG9uIERlYnVn LCBhbmQgcmV0dXJuIGFuIGludmFsaWQgdmFsdWUgb24gcmVsZWFzZS4KICAgICAgICAgQVNTRVJU KDApOwogICAgICAgICByZXR1cm4gc3RkOjpudW1lcmljX2xpbWl0czxzaXplX3Q+OjptYXgoKTsK ICAgICB9CkBAIC05MCw2ICs5MSw3IEBAIGNsYXNzIFRyYW5zbGF0b3JNZXRhbFJlZmxlY3Rpb24K ICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIGl0LT5zZWNvbmQ7CiAgICAgICAgIH0KKyAg ICAgICAgLy9JZiB3ZSBjYW4ndCBmaW5kIGEgbWF0Y2hpbmcgdGV4dHVyZSwgYXNzZXJ0IG91dCBv biBEZWJ1ZywgYW5kIHJldHVybiBhbiBpbnZhbGlkIHZhbHVlIG9uIHJlbGVhc2UuCiAgICAgICAg IEFTU0VSVCgwKTsKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6 bWF4KCk7CiAgICAgfQpAQCAtMTAwLDYgKzEwMiw3IEBAIGNsYXNzIFRyYW5zbGF0b3JNZXRhbFJl ZmxlY3Rpb24KICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIGl0LT5zZWNvbmQ7CiAgICAg ICAgIH0KKyAgICAgICAgLy9JZiB3ZSBjYW4ndCBmaW5kIGEgbWF0Y2hpbmcgVW5pZm9ybSBiaW5k aW5nLCBhc3NlcnQgb3V0IG9uIERlYnVnLCBhbmQgcmV0dXJuIGFuIGludmFsaWQgdmFsdWUuCiAg ICAgICAgIEFTU0VSVCgwKTsKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6 ZV90Pjo6bWF4KCk7CiAgICAgfQpAQCAtMTEwLDYgKzExMyw3IEBAIGNsYXNzIFRyYW5zbGF0b3JN ZXRhbFJlZmxlY3Rpb24KICAgICAgICAgewogICAgICAgICAgICAgcmV0dXJuIGl0LT5zZWNvbmQ7 CiAgICAgICAgIH0KKyAgICAgICAgLy9JZiB3ZSBjYW4ndCBmaW5kIGEgbWF0Y2hpbmcgVUJPIGJp bmRpbmcgYnkgbmFtZSwgYXNzZXJ0IG91dCBvbiBEZWJ1ZywgYW5kIHJldHVybiBhbiBpbnZhbGlk IHZhbHVlLgogICAgICAgICBBU1NFUlQoMCk7CiAgICAgICAgIHJldHVybiB7LmJpbmRJbmRleCA9 IHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6bWF4KCksCiAgICAgICAgICAgICAgICAgLmFy cmF5U2l6ZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8c2l6ZV90Pjo6bWF4KCl9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVyL3RyYW5zbGF0b3IvVHJhbnNs YXRvck1ldGFsRGlyZWN0L0VtaXRNZXRhbC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvRW1pdE1ldGFsLmNw cAppbmRleCA5Y2E1OWE3ZTQ2ZTgxOGIwNDBiZTRlODczMmI0NTg0MzIyOWEwY2FhLi4yMmFkYjQy NmI4ZWJhYzVkNWQ0M2RkY2NmZDYzNmQ0MzM1YzUyNDU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJl Y3QvRW1pdE1ldGFsLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGls ZXIvdHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvRW1pdE1ldGFsLmNwcApAQCAtMzc3 LDYgKzM3NywxMiBAQCBzdGF0aWMgY29uc3QgY2hhciAqR2V0T3BlcmF0b3JTdHJpbmcoVE9wZXJh dG9yIG9wLAogICAgICAgICAgICAgcmV0dXJuICIhPSI7CiAKICAgICAgICAgY2FzZSBUT3BlcmF0 b3I6OkVPcEVxdWFsOgorICAgICAgICAgICAgaWYoKGFyZ1R5cGUwLT5nZXRTdHJ1Y3QoKSAmJiBh cmdUeXBlMS0+Z2V0U3RydWN0KCkpICYmCisgICAgICAgICAgICAgICAoYXJnVHlwZTAtPmlzQXJy YXkoKSAmJiBhcmdUeXBlMS0+aXNBcnJheSgpKSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAg ICAgICByZXR1cm4gIkFOR0xFX2VxdWFsU3RydWN0QXJyYXkiOworICAgICAgICAgICAgfQorICAg ICAgICAgICAKICAgICAgICAgICAgIGlmICgoYXJnVHlwZTAtPmlzVmVjdG9yKCkgJiYgYXJnVHlw ZTEtPmlzVmVjdG9yKCkpIHx8CiAgICAgICAgICAgICAgICAgKGFyZ1R5cGUwLT5nZXRTdHJ1Y3Qo KSAmJiBhcmdUeXBlMS0+Z2V0U3RydWN0KCkpIHx8CiAgICAgICAgICAgICAgICAgKGFyZ1R5cGUw LT5pc0FycmF5KCkgJiYgYXJnVHlwZTEtPmlzQXJyYXkoKSkgfHwKQEAgLTM4OSw2ICszOTUsMTIg QEAgc3RhdGljIGNvbnN0IGNoYXIgKkdldE9wZXJhdG9yU3RyaW5nKFRPcGVyYXRvciBvcCwKICAg ICAgICAgICAgIHJldHVybiAiPT0iOwogCiAgICAgICAgIGNhc2UgVE9wZXJhdG9yOjpFT3BOb3RF cXVhbDoKKyAgICAgICAgICAgIGlmKChhcmdUeXBlMC0+Z2V0U3RydWN0KCkgJiYgYXJnVHlwZTEt PmdldFN0cnVjdCgpKSAmJgorICAgICAgICAgICAgICAgKGFyZ1R5cGUwLT5pc0FycmF5KCkgJiYg YXJnVHlwZTEtPmlzQXJyYXkoKSkpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgcmV0 dXJuICJBTkdMRV9ub3RFcXVhbFN0cnVjdEFycmF5IjsKKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgCiAgICAgICAgICAgICBpZiAoKGFyZ1R5cGUwLT5pc1ZlY3RvcigpICYmIGFyZ1R5cGUxLT5p c1ZlY3RvcigpKSB8fAogICAgICAgICAgICAgICAgIChhcmdUeXBlMC0+aXNBcnJheSgpICYmIGFy Z1R5cGUxLT5pc0FycmF5KCkpIHx8CiAgICAgICAgICAgICAgICAgKGFyZ1R5cGUwLT5pc01hdHJp eCgpICYmIGFyZ1R5cGUxLT5pc01hdHJpeCgpKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Q cm9ncmFtUHJlbHVkZS5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvY29tcGlsZXIv dHJhbnNsYXRvci9UcmFuc2xhdG9yTWV0YWxEaXJlY3QvUHJvZ3JhbVByZWx1ZGUuY3BwCmluZGV4 IDhjMjllNjQ3OGEzY2JlYTE5NWM4YjA1Y2M1MTdjYmU1ZmU5M2M1NjUuLjhiMDY1NmFhZjM3NmUx ZTgyNzRhZjFmMjBiY2I3NDcwNzAxNmYzNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9jb21waWxlci90cmFuc2xhdG9yL1RyYW5zbGF0b3JNZXRhbERpcmVjdC9Qcm9n cmFtUHJlbHVkZS5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2NvbXBpbGVy L3RyYW5zbGF0b3IvVHJhbnNsYXRvck1ldGFsRGlyZWN0L1Byb2dyYW1QcmVsdWRlLmNwcApAQCAt MTUxLDggKzE1MSwxMCBAQCBjbGFzcyBQcm9ncmFtUHJlbHVkZSA6IHB1YmxpYyBUSW50ZXJtVHJh dmVyc2VyCiAgICAgdm9pZCBlcXVhbE1hdHJpeCgpOwogICAgIHZvaWQgbm90RXF1YWxWZWN0b3Io KTsKICAgICB2b2lkIG5vdEVxdWFsU3RydWN0KCk7CisgICAgdm9pZCBub3RFcXVhbFN0cnVjdEFy cmF5KCk7CiAgICAgdm9pZCBub3RFcXVhbE1hdHJpeCgpOwogICAgIHZvaWQgZXF1YWxBcnJheSgp OworICAgIHZvaWQgZXF1YWxTdHJ1Y3RBcnJheSgpOwogICAgIHZvaWQgbm90RXF1YWxBcnJheSgp OwogICAgIHZvaWQgc2lnbigpOwogICAgIHZvaWQgcGFja19oYWxmXzJ4MTYoKTsKQEAgLTEwNTgs NiArMTA2MCwyMiBAQCBBTkdMRV9BTFdBWVNfSU5MSU5FIGJvb2wgQU5HTEVfZXF1YWwobWV0YWw6 OmFycmF5PFQsIE4+IHUsIG1ldGFsOjphcnJheTxULCBOPiB2KQogfQogKSIpCiAKK1BST0dSQU1f UFJFTFVERV9ERUNMQVJFKGVxdWFsU3RydWN0QXJyYXksCisgICAgICAgICAgICAgICAgICAgICAg ICBSIigKK3RlbXBsYXRlIDx0eXBlbmFtZSBULCBzaXplX3QgTj4KK0FOR0xFX0FMV0FZU19JTkxJ TkUgYm9vbCBBTkdMRV9lcXVhbFN0cnVjdEFycmF5KG1ldGFsOjphcnJheTxULCBOPiB1LCBtZXRh bDo6YXJyYXk8VCwgTj4gdikKK3sKKyAgICBmb3Ioc2l6ZV90IGkgPSAwOyBpIDwgTjsgaSsrKQor ICAgIHsKKyAgICAgICAgaWYgKEFOR0xFX2VxdWFsKHVbaV0sIHZbaV0pID09IGZhbHNlKSAKKyAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisgICAgcmV0dXJuIHRydWU7Cit9CispIikK KworCisKIFBST0dSQU1fUFJFTFVERV9ERUNMQVJFKG5vdEVxdWFsQXJyYXksCiAgICAgICAgICAg ICAgICAgICAgICAgICBSIigKIHRlbXBsYXRlIDx0eXBlbmFtZSBULCBzaXplX3QgTj4KQEAgLTEx MjYsNiArMTE0NCwyMSBAQCBBTkdMRV9BTFdBWVNfSU5MSU5FIGJvb2wgQU5HTEVfbm90RXF1YWxT dHJ1Y3QodGhyZWFkIGNvbnN0IFQgJmEsIHRocmVhZCBjb25zdCBUCiAgICAgICAgICAgICAgICAg ICAgICAgICBlcXVhbFZlY3RvcigpLAogICAgICAgICAgICAgICAgICAgICAgICAgZXF1YWxNYXRy aXgoKSkKIAorUFJPR1JBTV9QUkVMVURFX0RFQ0xBUkUobm90RXF1YWxTdHJ1Y3RBcnJheSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIFIiKAordGVtcGxhdGUgPHR5cGVuYW1lIFQsIHNpemVfdCBO PgorQU5HTEVfQUxXQVlTX0lOTElORSBib29sIEFOR0xFX25vdEVxdWFsU3RydWN0QXJyYXkobWV0 YWw6OmFycmF5PFQsIE4+IHUsIG1ldGFsOjphcnJheTxULCBOPiB2KQoreworICAgIGZvcihzaXpl X3QgaSA9IDA7IGkgPCBOOyBpKyspCisgICAgeworICAgICAgICBpZiAoQU5HTEVfbm90RXF1YWxT dHJ1Y3QodVtpXSwgdltpXSkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAg cmV0dXJuIGZhbHNlOworfQorKSIsCisgICAgICAgICAgICAgICAgICAgICAgICBub3RFcXVhbFN0 cnVjdCgpKQorCiBQUk9HUkFNX1BSRUxVREVfREVDTEFSRSh2ZWN0b3JFbGVtUmVmLCBSIigKIHRl bXBsYXRlIDx0eXBlbmFtZSBULCBpbnQgTj4KIHN0cnVjdCBBTkdMRV9WZWN0b3JFbGVtUmVmCkBA IC0yMDU4LDkgKzIwOTEsOSBAQCB0ZW1wbGF0ZSA8dHlwZW5hbWUgVGV4dHVyZSwgaW50IE4+CiBB TkdMRV9BTFdBWVNfSU5MSU5FIGF1dG8gQU5HTEVfdGV4dHVyZUdyYWRfaW1wbCgKICAgICB0aHJl YWQgVGV4dHVyZSAmdGV4dHVyZSwKICAgICB0aHJlYWQgbWV0YWw6OnNhbXBsZXIgY29uc3QgJnNh bXBsZXIsCi0gICAgdGhyZWFkIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0ICZjb29yZCwKLSAg ICB0aHJlYWQgbWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgJmRQZHgsCi0gICAgdGhyZWFkIG1l dGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0ICZkUGR5KQorICAgIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+ IGNvbnN0IGNvb3JkLAorICAgIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0IGRQZHgsCisgICAg bWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgZFBkeSkKIHsKICAgICByZXR1cm4gdGV4dHVyZS5z YW1wbGUoc2FtcGxlciwgY29vcmQsIEFOR0xFX2dyYWRpZW50PE4+KGRQZHgsIGRQZHkpKTsKIH0K QEAgLTIxOTQsMTAgKzIyMjcsMTAgQEAgdGVtcGxhdGUgPHR5cGVuYW1lIFRleHR1cmUsIGludCBO PgogQU5HTEVfQUxXQVlTX0lOTElORSBhdXRvIEFOR0xFX3RleHR1cmVHcmFkT2Zmc2V0X2ltcGwo CiAgICAgdGhyZWFkIFRleHR1cmUgJnRleHR1cmUsCiAgICAgdGhyZWFkIG1ldGFsOjpzYW1wbGVy IGNvbnN0ICZzYW1wbGVyLAotICAgIHRocmVhZCBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCAm Y29vcmQsCi0gICAgdGhyZWFkIG1ldGFsOjp2ZWM8ZmxvYXQsIE4+IGNvbnN0ICZkUGR4LAotICAg IHRocmVhZCBtZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCAmZFBkeSwKLSAgICB0aHJlYWQgbWV0 YWw6OnZlYzxpbnQsIE4+IGNvbnN0ICZvZmZzZXQpCisgICAgbWV0YWw6OnZlYzxmbG9hdCwgTj4g Y29uc3QgY29vcmQsCisgICAgbWV0YWw6OnZlYzxmbG9hdCwgTj4gY29uc3QgZFBkeCwKKyAgICBt ZXRhbDo6dmVjPGZsb2F0LCBOPiBjb25zdCBkUGR5LAorICAgIG1ldGFsOjp2ZWM8aW50LCBOPiBj b25zdCBvZmZzZXQpCiB7CiAgICAgcmV0dXJuIHRleHR1cmUuc2FtcGxlKHNhbXBsZXIsIGNvb3Jk LCBBTkdMRV9ncmFkaWVudDxOPihkUGR4LCBkUGR5KSwgb2Zmc2V0KTsKIH0KQEAgLTM0MzIsNiAr MzQ2NSwxMCBAQCB2b2lkIFByb2dyYW1QcmVsdWRlOjp2aXNpdE9wZXJhdG9yKFRPcGVyYXRvciBv cCwKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBlcXVhbEFycmF5KCk7CiAgICAgICAg ICAgICB9CisgICAgICAgICAgICBpZihhcmdUeXBlMC0+Z2V0U3RydWN0KCkgJiYgYXJnVHlwZTEt PmdldFN0cnVjdCgpICYmIGFyZ1R5cGUwLT5pc0FycmF5KCkgJiYgYXJnVHlwZTEtPmlzQXJyYXko KSkKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBlcXVhbFN0cnVjdEFycmF5KCk7Cisg ICAgICAgICAgICB9CiAgICAgICAgICAgICBpZihhcmdUeXBlMC0+aXNNYXRyaXgoKSAmJiBhcmdU eXBlMS0+aXNNYXRyaXgoKSkKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBlcXVhbE1h dHJpeCgpOwpAQCAtMzQ1Miw2ICszNDg5LDEwIEBAIHZvaWQgUHJvZ3JhbVByZWx1ZGU6OnZpc2l0 T3BlcmF0b3IoVE9wZXJhdG9yIG9wLAogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIG5v dEVxdWFsQXJyYXkoKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmKGFyZ1R5cGUwLT5n ZXRTdHJ1Y3QoKSAmJiBhcmdUeXBlMS0+Z2V0U3RydWN0KCkgJiYgYXJnVHlwZTAtPmlzQXJyYXko KSAmJiBhcmdUeXBlMS0+aXNBcnJheSgpKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IG5vdEVxdWFsU3RydWN0QXJyYXkoKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmKGFy Z1R5cGUwLT5pc01hdHJpeCgpICYmIGFyZ1R5cGUxLT5pc01hdHJpeCgpKQogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIG5vdEVxdWFsTWF0cml4KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvRnJhbWVCdWZmZXJN dGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvRnJhbWVCdWZmZXJNdGwubW0KaW5kZXggMDhiZGFmMmIwYWJjZjdjMzVjOGEyYjlmOTg2MjY5 ODEyMGE2Y2M2Mi4uNzhjMTFlOTAwNzcxOWM5NGRkZWJhNGExOGFkNzUxYTIxN2JhNTQxMCAxMDA2 NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21l dGFsL0ZyYW1lQnVmZmVyTXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9GcmFtZUJ1ZmZlck10bC5tbQpAQCAtMjQ4LDcgKzI0OCw3 IEBAIGFuZ2xlOjpSZXN1bHQgRnJhbWVidWZmZXJNdGw6OnJlYWRQaXhlbHMoY29uc3QgZ2w6OkNv bnRleHQgKmNvbnRleHQsCiAgICAgaWYgKHBhcmFtcy5wYWNrQnVmZmVyKQogICAgIHsKICAgICAg ICAgLy8gSWYgUEJPIGlzIGFjdGl2ZSwgcGl4ZWxzIGlzIHRyZWF0ZWQgYXMgb2Zmc2V0LgotICAg ICAgICBwYXJhbXMub2Zmc2V0ID0gcmVpbnRlcnByZXRfY2FzdDxwdHJkaWZmX3Q+KHBpeGVscyk7 CisgICAgICAgIHBhcmFtcy5vZmZzZXQgPSByZWludGVycHJldF9jYXN0PHB0cmRpZmZfdD4ocGl4 ZWxzKSArIG91dHB1dFNraXBCeXRlczsKICAgICB9CiAKICAgICBpZiAobUZsaXBZKQo=