226285 2021-05-26 12:31:15 -0700 [Metal ANGLE] transformFeedback samples on webglsamples.org do not render correctly 2021-06-01 18:01:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kpiddington kpiddington dino ews-watchlist graouts johncunningham kondapallykalyan sam webkit-bug-importer oldest_to_newest 1764005 0 kpiddington 2021-05-26 12:31:15 -0700 [Metal ANGLE] transformFeedback samples on webglsamples.org do not render correctly 1764006 1 429782 kpiddington 2021-05-26 12:34:50 -0700 Created attachment 429782 Patch 1764007 2 kpiddington 2021-05-26 12:34:53 -0700 <rdar://problem/78524773> 1764008 3 ews-watchlist 2021-05-26 12:35:55 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1764123 4 dino 2021-05-26 16:51:32 -0700 Pasting from an internal discussion (John Cunningham): lgtm though I’d rather see memoryBarrier on macos if not difficult to add on AGX macos it just ends and starts a new render pass anyways, but I think it is more efficient on nonagx 1764124 5 429782 dino 2021-05-26 16:52:26 -0700 Comment on attachment 429782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429782&action=review > Source/ThirdParty/ANGLE/ChangeLog:11 > + for transsform_feedback-seperated_2, we need to invalidate the current render pass descriptor in order to switch to the rasterizer-enabled version of the shader. typo transsform 1764137 6 429782 ap 2021-05-26 17:13:32 -0700 Comment on attachment 429782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429782&action=review >> Source/ThirdParty/ANGLE/ChangeLog:11 >> + for transsform_feedback-seperated_2, we need to invalidate the current render pass descriptor in order to switch to the rasterizer-enabled version of the shader. > > typo transsform And seperated (found it at http://webglsamples.org/WebGL2Samples/#transform_feedback_separated_2) 1764157 7 429782 johncunningham 2021-05-26 18:10:40 -0700 Comment on attachment 429782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429782&action=review Is the prepareForTransformFeedbackPassTwo not needed in drawTriFanArraysLegacy and drawLineLoopArrays > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ContextMtl.mm:1405 > +void ContextMtl::onEndTransformFeedback(const gl::Context *context) context isn't used in this function > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/TransformFeedbackMtl.mm:96 > + contextMtl->onEndTransformFeedback(context); not needed if context isn't used in onEndTransformFeedback 1764524 8 429936 kpiddington 2021-05-27 15:07:18 -0700 Created attachment 429936 Patch 1764938 9 430054 kpiddington 2021-05-28 14:41:37 -0700 Created attachment 430054 Patch 1764980 10 430054 johncunningham 2021-05-28 15:55:11 -0700 Comment on attachment 430054 Patch LGTM 1765839 11 ews-feeder 2021-06-01 18:01:14 -0700 Committed r278335 (238368@main): <https://commits.webkit.org/238368@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430054. 429782 2021-05-26 12:34:50 -0700 2021-05-27 15:07:17 -0700 Patch bug-226285-20210526123449.patch text/plain 7547 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYzZiYjU5MjdjMjQ5ODI5OTk4YzI3NmU2MDMyMmQ4ZmNiOTVkZmM0Ny4uNTA3MjcyNWI1MGU1 NzUxMmQ3YjZlZjE1NjVmMGRhYTNlYTgxM2I1YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI2ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01ldGFsIEFOR0xFXSB0cmFuc2Zvcm1GZWVkYmFj ayBzYW1wbGVzIG9uIHdlYmdsc2FtcGxlcy5vcmcgZG8gbm90IHJlbmRlciBjb3JyZWN0bHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjI4NQorICAg ICAgICA8cmRhcjovLzc4NTI0NzczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ldGFsIEFOR0xFIGRvZXMgbm90IHJlbmRlciB0aGVzZSBzYW1wbGVz IGNvcnJlY3RseSwgZm9yIGEgbnVtYmVyIG9mIHJlYXNvbnMuIAorICAgICAgICBGb3IgdHJhbnNm b3JtX2ZlZWRiYWNrX2ludGVybGVhdmVkIGFuZCBzZXBlcmF0ZWQsIFdlIG5lZWQgdG8gc3RhcnQg YSBuZXcgcmVuZGVyRW5jb2RlciB0byBnZXQgdGhlIHJlc3VsdHMgZnJvbSB0aGUgdHJhbnNmb3Jt IGZlZWRiYWNrLiAKKyAgICAgICAgZm9yIHRyYW5zc2Zvcm1fZmVlZGJhY2stc2VwZXJhdGVkXzIs IHdlIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgY3VycmVudCByZW5kZXIgcGFzcyBkZXNjcmlwdG9y IGluIG9yZGVyIHRvIHN3aXRjaCB0byB0aGUgcmFzdGVyaXplci1lbmFibGVkIHZlcnNpb24gb2Yg dGhlIHNoYWRlci4KKyAgICAgICAgVGVzdGluZzogUmFuIGFsbCB0cmFuc2Zvcm0gZmVlZGJhY2sg dGVzdHMgZnJvbSBkZXFwIHN1aXRlIHRvIGVuc3VyZSBubyByZWdyZXNzaW9ucyBhcmUgcHJlc2Vu dC4KKworICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLmg6 CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwubW06Cisg ICAgICAgIChyeDo6Q29udGV4dE10bDo6ZHJhd1RyaUZhbkFycmF5c1dpdGhCYXNlVmVydGV4KToK KyAgICAgICAgKHJ4OjpDb250ZXh0TXRsOjpkcmF3QXJyYXlzSW1wbCk6CisgICAgICAgIChyeDo6 Q29udGV4dE10bDo6ZHJhd1RyaUZhbkVsZW1lbnRzKToKKyAgICAgICAgKHJ4OjpDb250ZXh0TXRs OjpwcmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNzVHdvKToKKyAgICAgICAgKHJ4OjpDb250 ZXh0TXRsOjpkcmF3TGluZUxvb3BFbGVtZW50cyk6CisgICAgICAgIChyeDo6Q29udGV4dE10bDo6 ZHJhd0VsZW1lbnRzSW1wbCk6CisgICAgICAgIChyeDo6Q29udGV4dE10bDo6b25FbmRUcmFuc2Zv cm1GZWVkYmFjayk6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RyYW5z Zm9ybUZlZWRiYWNrTXRsLm1tOgorICAgICAgICAocng6OlRyYW5zZm9ybUZlZWRiYWNrTXRsOjpl bmQpOgorCiAyMDIxLTA1LTIwICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGluZ3RvbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmVkIGZsYXNoZXMgem9vbWluZyBvbiBHb29nbGUgTWFwcyB3aGVuIHVz aW5nIGV4dGVybmFsIG1vbml0b3Igb24gbXVsdGktZ3B1IHN5c3RlbXMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0 TXRsLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0 YWwvQ29udGV4dE10bC5oCmluZGV4IDZmODY3MTFiZWQ4MzM3MWNiNmY0ODMxYzFlNTVkMDk0ZDhi MzQ3YWEuLmZiOWNiMjc5MjdlNmM4ZDk2ZTBkMDhlNDY2YmQzYWY5YWFmZjhhMWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9D b250ZXh0TXRsLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL0NvbnRleHRNdGwuaApAQCAtMjU2LDcgKzI1Niw3IEBAIGNsYXNzIENvbnRl eHRNdGwgOiBwdWJsaWMgQ29udGV4dEltcGwsIHB1YmxpYyBtdGw6OkNvbnRleHQKICAgICAgICAg c2l6ZV90IGJ1ZmZlckNvdW50LAogICAgICAgICBjb25zdCBnbDo6VHJhbnNmb3JtRmVlZGJhY2tC dWZmZXJzQXJyYXk8QnVmZmVyTXRsICo+ICZidWZmZXJzKTsKIAotICAgIHZvaWQgb25FbmRUcmFu c2Zvcm1GZWVkYmFjaygpOworICAgIHZvaWQgb25FbmRUcmFuc2Zvcm1GZWVkYmFjayhjb25zdCBn bDo6Q29udGV4dCAqIGNvbnRleHQpOwogICAgIGFuZ2xlOjpSZXN1bHQgb25QYXVzZVRyYW5zZm9y bUZlZWRiYWNrKCk7CiAKICAgICB2b2lkIHBvcHVsYXRlVHJhbnNmb3JtRmVlZGJhY2tCdWZmZXJT ZXQoCkBAIC0yODAsNyArMjgwLDcgQEAgY2xhc3MgQ29udGV4dE10bCA6IHB1YmxpYyBDb250ZXh0 SW1wbCwgcHVibGljIG10bDo6Q29udGV4dAogICAgIHZvaWQgaW52YWxpZGF0ZUN1cnJlbnRUZXh0 dXJlcygpOwogICAgIHZvaWQgaW52YWxpZGF0ZURyaXZlclVuaWZvcm1zKCk7CiAgICAgdm9pZCBp bnZhbGlkYXRlUmVuZGVyUGlwZWxpbmUoKTsKLQorICAgIHZvaWQgcHJlcGFyZUZvclRyYW5zZm9y bUZlZWRiYWNrUGFzc1R3bygpOwogICAgIC8vIENhbGwgdGhpcyB0byBub3RpZnkgQ29udGV4dE10 bCB3aGVuZXZlciBGcmFtZWJ1ZmZlck10bCdzIHN0YXRlIGNoYW5nZWQKICAgICB2b2lkIG9uRHJh d0ZyYW1lQnVmZmVyQ2hhbmdlZFN0YXRlKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRnJhbWVidWZmZXJNdGwgKmZyYW1l YnVmZmVyLApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbQppbmRleCA0NjQ5MGMyMGJm OGIyMThiYjRkOGU3ZmJhN2I2ZGQxZjNmMGRhY2FiLi5jNzJjMGM0N2EwM2JmOGZjYTQ4NWJlODQx NzBlZTlhMGMzYTI1ZGQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbQpAQCAt MjY2LDYgKzI2Niw3IEBAIGFuZ2xlOjpSZXN1bHQgQ29udGV4dE10bDo6ZHJhd1RyaUZhbkFycmF5 c1dpdGhCYXNlVmVydGV4KGNvbnN0IGdsOjpDb250ZXh0ICpjb250CiAgICAgICAgIG1SZW5kZXJF bmNvZGVyLmRyYXdJbmRleGVkSW5zdGFuY2VkQmFzZVZlcnRleChNVExQcmltaXRpdmVUeXBlVHJp YW5nbGUsIGdlbkluZGljZXNDb3VudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE1UTEluZGV4VHlwZVVJbnQzMiwgbVRyaUZhbkFycmF5c0lu ZGV4QnVmZmVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgMCwgaW5zdGFuY2VzLCBmaXJzdCk7CisgICAgICAgIHByZXBhcmVGb3JUcmFuc2Zv cm1GZWVkYmFja1Bhc3NUd28oKTsKICAgICB9CiAKICAgICBBTkdMRV9UUlkoc2V0dXBEcmF3KGNv bnRleHQsIGdsOjpQcmltaXRpdmVNb2RlOjpUcmlhbmdsZUZhbiwgZmlyc3QsIGNvdW50LCBpbnN0 YW5jZXMsCkBAIC00MjMsNiArNDI0LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3 QXJyYXlzSW1wbChjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgewogICAgICAg ICAgICAgZXhlY0RyYXdJbnN0YW5jZWQobXRsVHlwZSwgZmlyc3QsIGNvdW50LCBpbnN0YW5jZUNv dW50KTsKICAgICAgICAgfQorICAgICAgICBwcmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNz VHdvKCk7CiAgICAgfQogICAgIEFOR0xFX1RSWShzZXR1cERyYXcoY29udGV4dCwgbW9kZSwgZmly c3QsIGNvdW50LCBpbnN0YW5jZXMsIGdsOjpEcmF3RWxlbWVudHNUeXBlOjpJbnZhbGlkRW51bSwK ICAgICAgICAgICAgICAgICAgICAgICAgIG51bGxwdHIsIGZhbHNlKSk7CkBAIC01MDAsNiArNTAy LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3VHJpRmFuRWxlbWVudHMoY29uc3Qg Z2w6OkNvbnRleHQgKmNvbnRleHQsCiAKICAgICAgICAgICAgIGV4ZWNEcmF3SW5kZXhlZEluc3Rh bmNlZChNVExQcmltaXRpdmVUeXBlVHJpYW5nbGUsIGdlbkluZGljZXNDb3VudCwgTVRMSW5kZXhU eXBlVUludDMyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbklkeEJ1 ZmZlciwgZ2VuSWR4QnVmZmVyT2Zmc2V0LCBpbnN0YW5jZXMpOworICAgICAgICAgICAgcHJlcGFy ZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3bygpOwogICAgICAgICB9CiAKICAgICAgICAgQU5H TEVfVFJZKHNldHVwRHJhdyhjb250ZXh0LCBnbDo6UHJpbWl0aXZlTW9kZTo6VHJpYW5nbGVGYW4s IDAsIGNvdW50LCBpbnN0YW5jZXMsIHR5cGUsCkBAIC01MjksNiArNTMyLDE1IEBAIGFuZ2xlOjpS ZXN1bHQgQ29udGV4dE10bDo6ZHJhd0xpbmVMb29wRWxlbWVudHNOb25JbnN0YW5jZWROb1ByaW1p dGl2ZVJlc3RhcnQoCiAgICAgcmV0dXJuIGRyYXdFbGVtZW50c0ltcGwoY29udGV4dCwgZ2w6OlBy aW1pdGl2ZU1vZGU6OkxpbmVTdHJpcCwgY291bnQsIHR5cGUsIGluZGljZXMsIDApOwogfQogCit2 b2lkIENvbnRleHRNdGw6OnByZXBhcmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKQorewor ICAgIC8vSWYgd2UgZG9uJ3QgaGF2ZSByYXN0ZXJpemF0aW9uIGVuYWJsZWQsIHdlIGNhbiByZS1y dW4gdGhlIHNhbWUgdmVydGV4IHNoYWRlci4gT3RoZXJ3aXNlLAorICAgIC8vV2UgbmVlZCB0byBp bnZhbGlkYXRlIHRoZSByZW5kZXIgcGlwZWxpbmUgc3RhdGUuCisgICAgaWYoIW1TdGF0ZS5pc1Jh c3Rlcml6ZXJEaXNjYXJkRW5hYmxlZCgpKQorICAgIHsKKyAgICAgICAgaW52YWxpZGF0ZVJlbmRl clBpcGVsaW5lKCk7CisgICAgfQorfQogYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3TGlu ZUxvb3BFbGVtZW50cyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xzaXplaSBjb3VudCwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5 cGUgdHlwZSwKQEAgLTU2NSw2ICs1NzcsNyBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRy YXdMaW5lTG9vcEVsZW1lbnRzKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogCiAgICAgICAg ICAgICBleGVjRHJhd0luZGV4ZWRJbnN0YW5jZWQoTVRMUHJpbWl0aXZlVHlwZUxpbmVTdHJpcCwg Z2VuSW5kaWNlc0NvdW50LCBNVExJbmRleFR5cGVVSW50MzIsCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2VuSWR4QnVmZmVyLCBnZW5JZHhCdWZmZXJPZmZzZXQsIGluc3Rh bmNlcyk7CisgICAgICAgICAgICBwcmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNzVHdvKCk7 CiAgICAgICAgIH0KIAogICAgICAgICBBTkdMRV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIGdsOjpQ cmltaXRpdmVNb2RlOjpMaW5lTG9vcCwgMCwgY291bnQsIGluc3RhbmNlcywgdHlwZSwKQEAgLTY2 MCw2ICs2NzMsNyBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRyYXdFbGVtZW50c0ltcGwo Y29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgY29tbWFuZC5vZmZzZXQsIGluc3RhbmNlQ291bnQpOwogICAgICAgICAgICAgfQog ICAgICAgICB9CisgICAgICAgIHByZXBhcmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKTsK ICAgICB9CiAKICAgICBBTkdMRV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIG1vZGUsIDAsIGNvbnZl cnRlZENvdW50aTMyLCBpbnN0YW5jZXMsIHR5cGUsIGluZGljZXMsIGZhbHNlKSk7CkBAIC0xMzg4 LDEyICsxNDAyLDE0IEBAIHZvaWQgQ29udGV4dE10bDo6cG9wdWxhdGVUcmFuc2Zvcm1GZWVkYmFj a0J1ZmZlclNldCgKICAgICB9CiB9CiAKLXZvaWQgQ29udGV4dE10bDo6b25FbmRUcmFuc2Zvcm1G ZWVkYmFjaygpCit2b2lkIENvbnRleHRNdGw6Om9uRW5kVHJhbnNmb3JtRmVlZGJhY2soY29uc3Qg Z2w6OkNvbnRleHQgKmNvbnRleHQpCiB7CiAgICAgaWYgKGdldERpc3BsYXkoKS0+Z2V0RmVhdHVy ZXMoKS5lbXVsYXRlVHJhbnNmb3JtRmVlZGJhY2suZW5hYmxlZCkKICAgICB7CiAgICAgICAgIG9u VHJhbnNmb3JtRmVlZGJhY2tTdGF0ZUNoYW5nZWQoKTsKICAgICB9CisgICAgLy9FbmQgdGhlIGNv bW1hbmQgZW5jb2Rlciwgc28gYW55IFRyYW5zZm9ybSBGZWVkYmFjayBjaGFuZ2VzIGFyZSBhdmFp bGFibGUgdG8gc3Vic2VxdWVudCBkcmF3IGNhbGxzLgorICAgIGVuZEVuY29kaW5nKGZhbHNlKTsK IH0KIAogYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpvblBhdXNlVHJhbnNmb3JtRmVlZGJhY2so KQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRl cmVyL21ldGFsL1RyYW5zZm9ybUZlZWRiYWNrTXRsLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5H TEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RyYW5zZm9ybUZlZWRiYWNrTXRsLm1tCmlu ZGV4IGFjZjljY2FhMGY4YTZlMWU4ZDA4OTZiNjhmMDQzNWExZWY0YWNlMTkuLjY3YjhiMjRlNjUz ODYyMTdlZTdmNjBlNTE1NTBiMDJhNzlkYjFiZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9UcmFuc2Zvcm1GZWVkYmFja010 bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIv bWV0YWwvVHJhbnNmb3JtRmVlZGJhY2tNdGwubW0KQEAgLTkzLDcgKzkzLDcgQEAgYW5nbGU6OlJl c3VsdCBUcmFuc2Zvcm1GZWVkYmFja010bDo6ZW5kKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0 KQogICAgIHsKICAgICAgICAgbXRsOjpHZXRJbXBsKHRyYW5zZm9ybUZlZWRiYWNrUXVlcnkpLT5v blRyYW5zZm9ybUZlZWRiYWNrRW5kKG1TdGF0ZS5nZXRQcmltaXRpdmVzRHJhd24oKSk7CiAgICAg fQotICAgIGNvbnRleHRNdGwtPm9uRW5kVHJhbnNmb3JtRmVlZGJhY2soKTsKKyAgICBjb250ZXh0 TXRsLT5vbkVuZFRyYW5zZm9ybUZlZWRiYWNrKGNvbnRleHQpOwogICAgIHJldHVybiBhbmdsZTo6 UmVzdWx0OjpDb250aW51ZTsKIH0KIAo= 429936 2021-05-27 15:07:18 -0700 2021-05-28 14:41:35 -0700 Patch bug-226285-20210527150718.patch text/plain 9929 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYzZiYjU5MjdjMjQ5ODI5OTk4YzI3NmU2MDMyMmQ4ZmNiOTVkZmM0Ny4uZmQyMTE0OTQ0NGZj MGI5YTlkZjZmZDY4YWU1ZGYzNTg4MGU2MzljNiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI2ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01ldGFsIEFOR0xFXSB0cmFuc2Zvcm1GZWVkYmFj ayBzYW1wbGVzIG9uIHdlYmdsc2FtcGxlcy5vcmcgZG8gbm90IHJlbmRlciBjb3JyZWN0bHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjI4NQorICAg ICAgICA8cmRhcjovLzc4NTI0NzczPgorCisgICAgICAgIFJldmlld2VkIGJ5IERlYW4gSmFja3Nv bi4KKworICAgICAgICBNZXRhbCBBTkdMRSBkb2VzIG5vdCByZW5kZXIgdGhlc2Ugc2FtcGxlcyBj b3JyZWN0bHksIGZvciBhIG51bWJlciBvZiByZWFzb25zLiAKKyAgICAgICAgRm9yIHRyYW5zZm9y bV9mZWVkYmFja19pbnRlcmxlYXZlZCBhbmQgc2VwZXJhdGVkLCBXZSBuZWVkIHRvIHN0YXJ0IGEg bmV3IHJlbmRlckVuY29kZXIgdG8gZ2V0IHRoZSByZXN1bHRzIGZyb20gdGhlIHRyYW5zZm9ybSBm ZWVkYmFjay4gCisgICAgICAgIGZvciB0cmFuc3Nmb3JtX2ZlZWRiYWNrLXNlcGVyYXRlZF8yLCB3 ZSBuZWVkIHRvIGludmFsaWRhdGUgdGhlIGN1cnJlbnQgcmVuZGVyIHBhc3MgZGVzY3JpcHRvciBp biBvcmRlciB0byBzd2l0Y2ggdG8gdGhlIHJhc3Rlcml6ZXItZW5hYmxlZCB2ZXJzaW9uIG9mIHRo ZSBzaGFkZXIuCisgICAgICAgIFRlc3Rpbmc6IFJhbiBhbGwgdHJhbnNmb3JtIGZlZWRiYWNrIHRl c3RzIGZyb20gZGVxcCBzdWl0ZSB0byBlbnN1cmUgbm8gcmVncmVzc2lvbnMgYXJlIHByZXNlbnQu CisKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5oOgor ICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLm1tOgorICAg ICAgICAocng6OkNvbnRleHRNdGw6OmRyYXdUcmlGYW5BcnJheXNXaXRoQmFzZVZlcnRleCk6Cisg ICAgICAgIChyeDo6Q29udGV4dE10bDo6ZHJhd0FycmF5c0ltcGwpOgorICAgICAgICAocng6OkNv bnRleHRNdGw6OmRyYXdUcmlGYW5FbGVtZW50cyk6CisgICAgICAgIChyeDo6Q29udGV4dE10bDo6 cHJlcGFyZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3byk6CisgICAgICAgIChyeDo6Q29udGV4 dE10bDo6ZHJhd0xpbmVMb29wRWxlbWVudHMpOgorICAgICAgICAocng6OkNvbnRleHRNdGw6OmRy YXdFbGVtZW50c0ltcGwpOgorICAgICAgICAocng6OkNvbnRleHRNdGw6Om9uRW5kVHJhbnNmb3Jt RmVlZGJhY2spOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9UcmFuc2Zv cm1GZWVkYmFja010bC5tbToKKyAgICAgICAgKHJ4OjpUcmFuc2Zvcm1GZWVkYmFja010bDo6ZW5k KToKKwogMjAyMS0wNS0yMCAgS3lsZSBQaWRkaW5ndG9uICA8a3BpZGRpbmd0b25AYXBwbGUuY29t PgogCiAgICAgICAgIFJlZCBmbGFzaGVzIHpvb21pbmcgb24gR29vZ2xlIE1hcHMgd2hlbiB1c2lu ZyBleHRlcm5hbCBtb25pdG9yIG9uIG11bHRpLWdwdSBzeXN0ZW1zCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQnVmZmVyTXRs LmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwv QnVmZmVyTXRsLmgKaW5kZXggMTQ0YWViZmZmMzA5ZGU3NGZjNWVkZDZkMjg2NmZmNmMxNjVmYzZl YS4uY2ZmODFlMDIzYzMxOGVmZmJiNmMyYjY2YjViYzA3NWU0MzJkZGNlNSAxMDA2NDQKLS0tIGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0J1ZmZl ck10bC5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9tZXRhbC9CdWZmZXJNdGwuaApAQCAtOTUsNyArOTUsNyBAQCBjbGFzcyBCdWZmZXJIb2xkZXJN dGwKICAgICAvLyBhIHF1ZXVlIG9mIG10bDo6QnVmZmVyIGFuZCBvbmx5IGxldCBDUFUgbW9kaWZp ZXMgYSBmcmVlIG10bDo6QnVmZmVyLgogICAgIC8vIFNvLCBpbiBvcmRlciB0byBsZXQgR1BVIHVz ZSB0aGUgbW9zdCByZWNlbnQgbW9kaWZpZWQgY29udGVudCwgb25lIG11c3QgY2FsbCB0aGlzIG1l dGhvZAogICAgIC8vIHJpZ2h0IGJlZm9yZSB0aGUgZHJhdyBjYWxsIHRvIHJldHJpZXZlZCB0aGUg bW9zdCB1cC10by1kYXRlIG10bDo6QnVmZmVyLgotICAgIG10bDo6QnVmZmVyUmVmIGdldEN1cnJl bnRCdWZmZXIoKSB7IHJldHVybiBtSXNXZWFrID8gbUJ1ZmZlcldlYWtSZWYubG9jaygpIDogbUJ1 ZmZlcjsgfQorICAgIG10bDo6QnVmZmVyUmVmIGdldEN1cnJlbnRCdWZmZXIoKSBjb25zdCB7IHJl dHVybiBtSXNXZWFrID8gbUJ1ZmZlcldlYWtSZWYubG9jaygpIDogbUJ1ZmZlcjsgfQogCiAgIHBy b3RlY3RlZDoKICAgICBtdGw6OkJ1ZmZlclJlZiBtQnVmZmVyOwpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwu aCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9D b250ZXh0TXRsLmgKaW5kZXggNmY4NjcxMWJlZDgzMzcxY2I2ZjQ4MzFjMWU1NWQwOTRkOGIzNDdh YS4uZmI5Y2IyNzkyN2U2YzhkOTZlMGQwOGU0NjZiZDNhZjlhYWZmOGExZiAxMDA2NDQKLS0tIGEv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRl eHRNdGwuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVy ZXIvbWV0YWwvQ29udGV4dE10bC5oCkBAIC0yNTYsNyArMjU2LDcgQEAgY2xhc3MgQ29udGV4dE10 bCA6IHB1YmxpYyBDb250ZXh0SW1wbCwgcHVibGljIG10bDo6Q29udGV4dAogICAgICAgICBzaXpl X3QgYnVmZmVyQ291bnQsCiAgICAgICAgIGNvbnN0IGdsOjpUcmFuc2Zvcm1GZWVkYmFja0J1ZmZl cnNBcnJheTxCdWZmZXJNdGwgKj4gJmJ1ZmZlcnMpOwogCi0gICAgdm9pZCBvbkVuZFRyYW5zZm9y bUZlZWRiYWNrKCk7CisgICAgdm9pZCBvbkVuZFRyYW5zZm9ybUZlZWRiYWNrKGNvbnN0IGdsOjpD b250ZXh0ICogY29udGV4dCk7CiAgICAgYW5nbGU6OlJlc3VsdCBvblBhdXNlVHJhbnNmb3JtRmVl ZGJhY2soKTsKIAogICAgIHZvaWQgcG9wdWxhdGVUcmFuc2Zvcm1GZWVkYmFja0J1ZmZlclNldCgK QEAgLTI4MCw3ICsyODAsNyBAQCBjbGFzcyBDb250ZXh0TXRsIDogcHVibGljIENvbnRleHRJbXBs LCBwdWJsaWMgbXRsOjpDb250ZXh0CiAgICAgdm9pZCBpbnZhbGlkYXRlQ3VycmVudFRleHR1cmVz KCk7CiAgICAgdm9pZCBpbnZhbGlkYXRlRHJpdmVyVW5pZm9ybXMoKTsKICAgICB2b2lkIGludmFs aWRhdGVSZW5kZXJQaXBlbGluZSgpOwotCisgICAgdm9pZCBwcmVwYXJlRm9yVHJhbnNmb3JtRmVl ZGJhY2tQYXNzVHdvKCk7CiAgICAgLy8gQ2FsbCB0aGlzIHRvIG5vdGlmeSBDb250ZXh0TXRsIHdo ZW5ldmVyIEZyYW1lYnVmZmVyTXRsJ3Mgc3RhdGUgY2hhbmdlZAogICAgIHZvaWQgb25EcmF3RnJh bWVCdWZmZXJDaGFuZ2VkU3RhdGUoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGcmFtZWJ1ZmZlck10bCAqZnJhbWVidWZm ZXIsCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLm1tCmluZGV4IDQ2NDkwYzIwYmY4YjIx OGJiNGQ4ZTdmYmE3YjZkZDFmM2YwZGFjYWIuLmFmZmJjNjcwYzFkYTQ0NTVkMDlmYTQ1NmZiZGQw OTBiZWRjNjgzZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJB TkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLm1tCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLm1tCkBAIC0yNjYs NiArMjY2LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3VHJpRmFuQXJyYXlzV2l0 aEJhc2VWZXJ0ZXgoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnQKICAgICAgICAgbVJlbmRlckVuY29k ZXIuZHJhd0luZGV4ZWRJbnN0YW5jZWRCYXNlVmVydGV4KE1UTFByaW1pdGl2ZVR5cGVUcmlhbmds ZSwgZ2VuSW5kaWNlc0NvdW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgTVRMSW5kZXhUeXBlVUludDMyLCBtVHJpRmFuQXJyYXlzSW5kZXhC dWZmZXIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAwLCBpbnN0YW5jZXMsIGZpcnN0KTsKKyAgICAgICAgcHJlcGFyZUZvclRyYW5zZm9ybUZl ZWRiYWNrUGFzc1R3bygpOwogICAgIH0KIAogICAgIEFOR0xFX1RSWShzZXR1cERyYXcoY29udGV4 dCwgZ2w6OlByaW1pdGl2ZU1vZGU6OlRyaWFuZ2xlRmFuLCBmaXJzdCwgY291bnQsIGluc3RhbmNl cywKQEAgLTMwNSw2ICszMDYsNyBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRyYXdUcmlG YW5BcnJheXNMZWdhY3koY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAKICAgICAgICAgZXhl Y0RyYXdJbmRleGVkSW5zdGFuY2VkKE1UTFByaW1pdGl2ZVR5cGVUcmlhbmdsZSwgZ2VuSW5kaWNl c0NvdW50LCBNVExJbmRleFR5cGVVSW50MzIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnZW5JZHhCdWZmZXIsIGdlbklkeEJ1ZmZlck9mZnNldCwgaW5zdGFuY2VzKTsKKyAgICAg ICAgcHJlcGFyZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3bygpOwogICAgIH0KICAgICBBTkdM RV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIGdsOjpQcmltaXRpdmVNb2RlOjpUcmlhbmdsZUZhbiwg Zmlyc3QsIGNvdW50LCBpbnN0YW5jZXMsCiAgICAgICAgICAgICAgICAgICAgICAgICBnbDo6RHJh d0VsZW1lbnRzVHlwZTo6SW52YWxpZEVudW0sIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCAq PigwKSwKQEAgLTM3NCw2ICszNzYsNyBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRyYXdM aW5lTG9vcEFycmF5cyhjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKIAogICAgICAgICBleGVj RHJhd0luZGV4ZWRJbnN0YW5jZWQoTVRMUHJpbWl0aXZlVHlwZUxpbmVTdHJpcCwgZ2VuSW5kaWNl c0NvdW50LCBNVExJbmRleFR5cGVVSW50MzIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBnZW5JZHhCdWZmZXIsIGdlbklkeEJ1ZmZlck9mZnNldCwgaW5zdGFuY2VzKTsKKyAgICAg ICAgcHJlcGFyZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3bygpOwogICAgIH0KICAgICBBTkdM RV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIGdsOjpQcmltaXRpdmVNb2RlOjpMaW5lTG9vcCwgZmly c3QsIGNvdW50LCBpbnN0YW5jZXMsCiAgICAgICAgICAgICAgICAgICAgICAgICBnbDo6RHJhd0Vs ZW1lbnRzVHlwZTo6SW52YWxpZEVudW0sIG51bGxwdHIsIGZhbHNlKSk7CkBAIC00MjMsNiArNDI2 LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3QXJyYXlzSW1wbChjb25zdCBnbDo6 Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgewogICAgICAgICAgICAgZXhlY0RyYXdJbnN0YW5j ZWQobXRsVHlwZSwgZmlyc3QsIGNvdW50LCBpbnN0YW5jZUNvdW50KTsKICAgICAgICAgfQorICAg ICAgICBwcmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNzVHdvKCk7CiAgICAgfQogICAgIEFO R0xFX1RSWShzZXR1cERyYXcoY29udGV4dCwgbW9kZSwgZmlyc3QsIGNvdW50LCBpbnN0YW5jZXMs IGdsOjpEcmF3RWxlbWVudHNUeXBlOjpJbnZhbGlkRW51bSwKICAgICAgICAgICAgICAgICAgICAg ICAgIG51bGxwdHIsIGZhbHNlKSk7CkBAIC01MDAsNiArNTA0LDcgQEAgYW5nbGU6OlJlc3VsdCBD b250ZXh0TXRsOjpkcmF3VHJpRmFuRWxlbWVudHMoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQs CiAKICAgICAgICAgICAgIGV4ZWNEcmF3SW5kZXhlZEluc3RhbmNlZChNVExQcmltaXRpdmVUeXBl VHJpYW5nbGUsIGdlbkluZGljZXNDb3VudCwgTVRMSW5kZXhUeXBlVUludDMyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbklkeEJ1ZmZlciwgZ2VuSWR4QnVmZmVyT2Zm c2V0LCBpbnN0YW5jZXMpOworICAgICAgICAgICAgcHJlcGFyZUZvclRyYW5zZm9ybUZlZWRiYWNr UGFzc1R3bygpOwogICAgICAgICB9CiAKICAgICAgICAgQU5HTEVfVFJZKHNldHVwRHJhdyhjb250 ZXh0LCBnbDo6UHJpbWl0aXZlTW9kZTo6VHJpYW5nbGVGYW4sIDAsIGNvdW50LCBpbnN0YW5jZXMs IHR5cGUsCkBAIC01MjksNiArNTM0LDE1IEBAIGFuZ2xlOjpSZXN1bHQgQ29udGV4dE10bDo6ZHJh d0xpbmVMb29wRWxlbWVudHNOb25JbnN0YW5jZWROb1ByaW1pdGl2ZVJlc3RhcnQoCiAgICAgcmV0 dXJuIGRyYXdFbGVtZW50c0ltcGwoY29udGV4dCwgZ2w6OlByaW1pdGl2ZU1vZGU6OkxpbmVTdHJp cCwgY291bnQsIHR5cGUsIGluZGljZXMsIDApOwogfQogCit2b2lkIENvbnRleHRNdGw6OnByZXBh cmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKQoreworICAgIC8vSWYgd2UgZG9uJ3QgaGF2 ZSByYXN0ZXJpemF0aW9uIGVuYWJsZWQsIHdlIGNhbiByZS1ydW4gdGhlIHNhbWUgdmVydGV4IHNo YWRlci4gT3RoZXJ3aXNlLAorICAgIC8vV2UgbmVlZCB0byBpbnZhbGlkYXRlIHRoZSByZW5kZXIg cGlwZWxpbmUgc3RhdGUuCisgICAgaWYoIW1TdGF0ZS5pc1Jhc3Rlcml6ZXJEaXNjYXJkRW5hYmxl ZCgpKQorICAgIHsKKyAgICAgICAgaW52YWxpZGF0ZVJlbmRlclBpcGVsaW5lKCk7CisgICAgfQor fQogYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3TGluZUxvb3BFbGVtZW50cyhjb25zdCBn bDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR0xzaXplaSBjb3VudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGUgdHlwZSwKQEAgLTU2NSw2ICs1 NzksNyBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRyYXdMaW5lTG9vcEVsZW1lbnRzKGNv bnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogCiAgICAgICAgICAgICBleGVjRHJhd0luZGV4ZWRJ bnN0YW5jZWQoTVRMUHJpbWl0aXZlVHlwZUxpbmVTdHJpcCwgZ2VuSW5kaWNlc0NvdW50LCBNVExJ bmRleFR5cGVVSW50MzIsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2Vu SWR4QnVmZmVyLCBnZW5JZHhCdWZmZXJPZmZzZXQsIGluc3RhbmNlcyk7CisgICAgICAgICAgICBw cmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNzVHdvKCk7CiAgICAgICAgIH0KIAogICAgICAg ICBBTkdMRV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIGdsOjpQcmltaXRpdmVNb2RlOjpMaW5lTG9v cCwgMCwgY291bnQsIGluc3RhbmNlcywgdHlwZSwKQEAgLTY2MCw2ICs2NzUsNyBAQCBhbmdsZTo6 UmVzdWx0IENvbnRleHRNdGw6OmRyYXdFbGVtZW50c0ltcGwoY29uc3QgZ2w6OkNvbnRleHQgKmNv bnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tbWFuZC5vZmZz ZXQsIGluc3RhbmNlQ291bnQpOwogICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIHBy ZXBhcmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKTsKICAgICB9CiAKICAgICBBTkdMRV9U Ulkoc2V0dXBEcmF3KGNvbnRleHQsIG1vZGUsIDAsIGNvbnZlcnRlZENvdW50aTMyLCBpbnN0YW5j ZXMsIHR5cGUsIGluZGljZXMsIGZhbHNlKSk7CkBAIC0xMzg4LDEyICsxNDA0LDI3IEBAIHZvaWQg Q29udGV4dE10bDo6cG9wdWxhdGVUcmFuc2Zvcm1GZWVkYmFja0J1ZmZlclNldCgKICAgICB9CiB9 CiAKLXZvaWQgQ29udGV4dE10bDo6b25FbmRUcmFuc2Zvcm1GZWVkYmFjaygpCit2b2lkIENvbnRl eHRNdGw6Om9uRW5kVHJhbnNmb3JtRmVlZGJhY2soY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQp CiB7CiAgICAgaWYgKGdldERpc3BsYXkoKS0+Z2V0RmVhdHVyZXMoKS5lbXVsYXRlVHJhbnNmb3Jt RmVlZGJhY2suZW5hYmxlZCkKICAgICB7CiAgICAgICAgIG9uVHJhbnNmb3JtRmVlZGJhY2tTdGF0 ZUNoYW5nZWQoKTsKICAgICB9CisjaWYgZGVmaW5lZChfX01BQ18xMF8xNCkgJiYgKFRBUkdFVF9P U19PU1ggfHwgVEFSR0VUX09TX01BQ0NBVEFMWVNUKQorICAgIGlmIChBTkdMRV9BUFBMRV9BVkFJ TEFCTEVfWEMoMTAuMTQsIDEzLjApKQorICAgIHsKKyAgICAgICAgZm9yKGF1dG8gJiBidWZmZXJS ZWYgOiBtQ3VycmVudFRyYW5zZm9ybUZlZWRiYWNrQnVmZmVycykKKyAgICAgICAgeworICAgICAg ICAgICAgY29uc3QgbXRsOjpCdWZmZXJSZWYgJiBjb25zdEJ1ZmZlclJlZiA9IGJ1ZmZlclJlZi0+ Z2V0Q3VycmVudEJ1ZmZlcigpOworICAgICAgICAgICAgbVJlbmRlckVuY29kZXIubWVtb3J5QmFy cmllcldpdGhSZXNvdXJjZShjb25zdEJ1ZmZlclJlZiwgbXRsOjprUmVuZGVyU3RhZ2VWZXJ0ZXgs IG10bDo6a1JlbmRlclN0YWdlVmVydGV4KTsKKyAgICAgICAgfQorICAgIH0KKyAgICBlbHNlCisj ZW5kaWYKKyAgICB7CisgICAgICAgIC8vRW5kIHRoZSBjb21tYW5kIGVuY29kZXIsIHNvIGFueSBU cmFuc2Zvcm0gRmVlZGJhY2sgY2hhbmdlcyBhcmUgYXZhaWxhYmxlIHRvIHN1YnNlcXVlbnQgZHJh dyBjYWxscy4KKyAgICAgICAgZW5kRW5jb2RpbmcoZmFsc2UpOworICAgIH0KIH0KIAogYW5nbGU6 OlJlc3VsdCBDb250ZXh0TXRsOjpvblBhdXNlVHJhbnNmb3JtRmVlZGJhY2soKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Ry YW5zZm9ybUZlZWRiYWNrTXRsLm1tIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL1RyYW5zZm9ybUZlZWRiYWNrTXRsLm1tCmluZGV4IGFjZjljY2Fh MGY4YTZlMWU4ZDA4OTZiNjhmMDQzNWExZWY0YWNlMTkuLjY3YjhiMjRlNjUzODYyMTdlZTdmNjBl NTE1NTBiMDJhNzlkYjFiZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9UcmFuc2Zvcm1GZWVkYmFja010bC5tbQorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvVHJhbnNm b3JtRmVlZGJhY2tNdGwubW0KQEAgLTkzLDcgKzkzLDcgQEAgYW5nbGU6OlJlc3VsdCBUcmFuc2Zv cm1GZWVkYmFja010bDo6ZW5kKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0KQogICAgIHsKICAg ICAgICAgbXRsOjpHZXRJbXBsKHRyYW5zZm9ybUZlZWRiYWNrUXVlcnkpLT5vblRyYW5zZm9ybUZl ZWRiYWNrRW5kKG1TdGF0ZS5nZXRQcmltaXRpdmVzRHJhd24oKSk7CiAgICAgfQotICAgIGNvbnRl eHRNdGwtPm9uRW5kVHJhbnNmb3JtRmVlZGJhY2soKTsKKyAgICBjb250ZXh0TXRsLT5vbkVuZFRy YW5zZm9ybUZlZWRiYWNrKGNvbnRleHQpOwogICAgIHJldHVybiBhbmdsZTo6UmVzdWx0OjpDb250 aW51ZTsKIH0KIAo= 430054 2021-05-28 14:41:37 -0700 2021-06-01 18:01:15 -0700 Patch bug-226285-20210528144136.patch text/plain 8489 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggN2U1MGE5ZWY2MzM2YjUxNmFiN2U3ZjliZDQzNjllMzM5YjM3ODAzZC4uYjg1OWJmN2NjODA2 ZmZkZWViZWUyZDRlMTkwZmNlODA1OGFjMGUxYSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTA1LTI4ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgW01ldGFsIEFOR0xFXSB0cmFuc2Zvcm1GZWVkYmFj ayBzYW1wbGVzIG9uIHdlYmdsc2FtcGxlcy5vcmcgZG8gbm90IHJlbmRlciBjb3JyZWN0bHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjI4NQorICAg ICAgICA8cmRhcjovLzc4NTI0NzczPgorCisgICAgICAgIFJldmlld2VkIGJ5IERlYW4gSmFja3Nv bi4KKworICAgICAgICBNZXRhbCBBTkdMRSBkb2VzIG5vdCByZW5kZXIgdGhlc2Ugc2FtcGxlcyBj b3JyZWN0bHksIGZvciBhIG51bWJlciBvZiByZWFzb25zLiAKKyAgICAgICAgRm9yIHRyYW5zZm9y bV9mZWVkYmFja19pbnRlcmxlYXZlZCBhbmQgc2VwZXJhdGVkLCBXZSBuZWVkIHRvIHN0YXJ0IGEg bmV3IHJlbmRlckVuY29kZXIgdG8gZ2V0IHRoZSByZXN1bHRzIGZyb20gdGhlIHRyYW5zZm9ybSBm ZWVkYmFjay4gCisgICAgICAgIGZvciB0cmFuc2Zvcm1fZmVlZGJhY2stc2VwZXJhdGVkXzIsIHdl IG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgY3VycmVudCByZW5kZXIgcGFzcyBkZXNjcmlwdG9yIGlu IG9yZGVyIHRvIHN3aXRjaCB0byB0aGUgcmFzdGVyaXplci1lbmFibGVkIHZlcnNpb24gb2YgdGhl IHNoYWRlci4KKyAgICAgICAgVGVzdGluZzogUmFuIGFsbCB0cmFuc2Zvcm0gZmVlZGJhY2sgdGVz dHMgZnJvbSBkZXFwIHN1aXRlIHRvIGVuc3VyZSBubyByZWdyZXNzaW9ucyBhcmUgcHJlc2VudC4K KworICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLmg6Cisg ICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwubW06CisgICAg ICAgIChyeDo6Q29udGV4dE10bDo6ZHJhd1RyaUZhbkFycmF5c1dpdGhCYXNlVmVydGV4KToKKyAg ICAgICAgKHJ4OjpDb250ZXh0TXRsOjpkcmF3QXJyYXlzSW1wbCk6CisgICAgICAgIChyeDo6Q29u dGV4dE10bDo6ZHJhd1RyaUZhbkVsZW1lbnRzKToKKyAgICAgICAgKHJ4OjpDb250ZXh0TXRsOjpw cmVwYXJlRm9yVHJhbnNmb3JtRmVlZGJhY2tQYXNzVHdvKToKKyAgICAgICAgKHJ4OjpDb250ZXh0 TXRsOjpkcmF3TGluZUxvb3BFbGVtZW50cyk6CisgICAgICAgIChyeDo6Q29udGV4dE10bDo6ZHJh d0VsZW1lbnRzSW1wbCk6CisgICAgICAgIChyeDo6Q29udGV4dE10bDo6b25FbmRUcmFuc2Zvcm1G ZWVkYmFjayk6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1RyYW5zZm9y bUZlZWRiYWNrTXRsLm1tOgorICAgICAgICAocng6OlRyYW5zZm9ybUZlZWRiYWNrTXRsOjplbmQp OgorCiAyMDIxLTA1LTI4ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAK ICAgICAgICAgQU5HTEUgTWV0YWwgdHJhbnNsYXRvciBzaG91bGQgYWx3YXlzIGNvbGxlY3QgdmFy aWFibGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvbWV0YWwvQnVmZmVyTXRsLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQnVmZmVyTXRsLmgKaW5kZXggMTQ0YWViZmZmMzA5ZGU3 NGZjNWVkZDZkMjg2NmZmNmMxNjVmYzZlYS4uY2ZmODFlMDIzYzMxOGVmZmJiNmMyYjY2YjViYzA3 NWU0MzJkZGNlNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL0J1ZmZlck10bC5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9CdWZmZXJNdGwuaApAQCAtOTUsNyArOTUs NyBAQCBjbGFzcyBCdWZmZXJIb2xkZXJNdGwKICAgICAvLyBhIHF1ZXVlIG9mIG10bDo6QnVmZmVy IGFuZCBvbmx5IGxldCBDUFUgbW9kaWZpZXMgYSBmcmVlIG10bDo6QnVmZmVyLgogICAgIC8vIFNv LCBpbiBvcmRlciB0byBsZXQgR1BVIHVzZSB0aGUgbW9zdCByZWNlbnQgbW9kaWZpZWQgY29udGVu dCwgb25lIG11c3QgY2FsbCB0aGlzIG1ldGhvZAogICAgIC8vIHJpZ2h0IGJlZm9yZSB0aGUgZHJh dyBjYWxsIHRvIHJldHJpZXZlZCB0aGUgbW9zdCB1cC10by1kYXRlIG10bDo6QnVmZmVyLgotICAg IG10bDo6QnVmZmVyUmVmIGdldEN1cnJlbnRCdWZmZXIoKSB7IHJldHVybiBtSXNXZWFrID8gbUJ1 ZmZlcldlYWtSZWYubG9jaygpIDogbUJ1ZmZlcjsgfQorICAgIG10bDo6QnVmZmVyUmVmIGdldEN1 cnJlbnRCdWZmZXIoKSBjb25zdCB7IHJldHVybiBtSXNXZWFrID8gbUJ1ZmZlcldlYWtSZWYubG9j aygpIDogbUJ1ZmZlcjsgfQogCiAgIHByb3RlY3RlZDoKICAgICBtdGw6OkJ1ZmZlclJlZiBtQnVm ZmVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL21ldGFsL0NvbnRleHRNdGwuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Db250ZXh0TXRsLmgKaW5kZXggNmY4NjcxMWJlZDgzMzcx Y2I2ZjQ4MzFjMWU1NWQwOTRkOGIzNDdhYS4uNzVjNTJmOTI1ZDY1ZmY4YmI4NmZjNjgxMjhiMDQ2 ODVlMDlkMTgyYyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFO R0xFL3JlbmRlcmVyL21ldGFsL0NvbnRleHRNdGwuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5oCkBAIC0yODAsNyAr MjgwLDcgQEAgY2xhc3MgQ29udGV4dE10bCA6IHB1YmxpYyBDb250ZXh0SW1wbCwgcHVibGljIG10 bDo6Q29udGV4dAogICAgIHZvaWQgaW52YWxpZGF0ZUN1cnJlbnRUZXh0dXJlcygpOwogICAgIHZv aWQgaW52YWxpZGF0ZURyaXZlclVuaWZvcm1zKCk7CiAgICAgdm9pZCBpbnZhbGlkYXRlUmVuZGVy UGlwZWxpbmUoKTsKLQorICAgIHZvaWQgcHJlcGFyZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3 bygpOwogICAgIC8vIENhbGwgdGhpcyB0byBub3RpZnkgQ29udGV4dE10bCB3aGVuZXZlciBGcmFt ZWJ1ZmZlck10bCdzIHN0YXRlIGNoYW5nZWQKICAgICB2b2lkIG9uRHJhd0ZyYW1lQnVmZmVyQ2hh bmdlZFN0YXRlKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgRnJhbWVidWZmZXJNdGwgKmZyYW1lYnVmZmVyLApkaWZmIC0t Z2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFs L0NvbnRleHRNdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbQppbmRleCA0NGE2YjBjYTk3MGUwOTdkZjgyNjg5OTIy NmEzOTE1ZTQ4MWI2Y2FkLi5iZjQ1ZjY3NDhjODJhNzgxNDc2YTE3ZTU5MTM1ZWMzNzdhMjdlNGE3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVy ZXIvbWV0YWwvQ29udGV4dE10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvQ29udGV4dE10bC5tbQpAQCAtMjY2LDYgKzI2Niw3IEBA IGFuZ2xlOjpSZXN1bHQgQ29udGV4dE10bDo6ZHJhd1RyaUZhbkFycmF5c1dpdGhCYXNlVmVydGV4 KGNvbnN0IGdsOjpDb250ZXh0ICpjb250CiAgICAgICAgIG1SZW5kZXJFbmNvZGVyLmRyYXdJbmRl eGVkSW5zdGFuY2VkQmFzZVZlcnRleChNVExQcmltaXRpdmVUeXBlVHJpYW5nbGUsIGdlbkluZGlj ZXNDb3VudCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIE1UTEluZGV4VHlwZVVJbnQzMiwgbVRyaUZhbkFycmF5c0luZGV4QnVmZmVyLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgaW5z dGFuY2VzLCBmaXJzdCk7CisgICAgICAgIHByZXBhcmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NU d28oKTsKICAgICB9CiAKICAgICBBTkdMRV9UUlkoc2V0dXBEcmF3KGNvbnRleHQsIGdsOjpQcmlt aXRpdmVNb2RlOjpUcmlhbmdsZUZhbiwgZmlyc3QsIGNvdW50LCBpbnN0YW5jZXMsCkBAIC0zMDUs NiArMzA2LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3VHJpRmFuQXJyYXlzTGVn YWN5KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogCiAgICAgICAgIGV4ZWNEcmF3SW5kZXhl ZEluc3RhbmNlZChNVExQcmltaXRpdmVUeXBlVHJpYW5nbGUsIGdlbkluZGljZXNDb3VudCwgTVRM SW5kZXhUeXBlVUludDMyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuSWR4 QnVmZmVyLCBnZW5JZHhCdWZmZXJPZmZzZXQsIGluc3RhbmNlcyk7CisgICAgICAgIHByZXBhcmVG b3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKTsKICAgICB9CiAgICAgQU5HTEVfVFJZKHNldHVw RHJhdyhjb250ZXh0LCBnbDo6UHJpbWl0aXZlTW9kZTo6VHJpYW5nbGVGYW4sIGZpcnN0LCBjb3Vu dCwgaW5zdGFuY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5 cGU6OkludmFsaWRFbnVtLCByZWludGVycHJldF9jYXN0PGNvbnN0IHZvaWQgKj4oMCksCkBAIC0z NzQsNiArMzc2LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3TGluZUxvb3BBcnJh eXMoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAKICAgICAgICAgZXhlY0RyYXdJbmRleGVk SW5zdGFuY2VkKE1UTFByaW1pdGl2ZVR5cGVMaW5lU3RyaXAsIGdlbkluZGljZXNDb3VudCwgTVRM SW5kZXhUeXBlVUludDMyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuSWR4 QnVmZmVyLCBnZW5JZHhCdWZmZXJPZmZzZXQsIGluc3RhbmNlcyk7CisgICAgICAgIHByZXBhcmVG b3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKTsKICAgICB9CiAgICAgQU5HTEVfVFJZKHNldHVw RHJhdyhjb250ZXh0LCBnbDo6UHJpbWl0aXZlTW9kZTo6TGluZUxvb3AsIGZpcnN0LCBjb3VudCwg aW5zdGFuY2VzLAogICAgICAgICAgICAgICAgICAgICAgICAgZ2w6OkRyYXdFbGVtZW50c1R5cGU6 OkludmFsaWRFbnVtLCBudWxscHRyLCBmYWxzZSkpOwpAQCAtNDIzLDYgKzQyNiw3IEBAIGFuZ2xl OjpSZXN1bHQgQ29udGV4dE10bDo6ZHJhd0FycmF5c0ltcGwoY29uc3QgZ2w6OkNvbnRleHQgKmNv bnRleHQsCiAgICAgICAgIHsKICAgICAgICAgICAgIGV4ZWNEcmF3SW5zdGFuY2VkKG10bFR5cGUs IGZpcnN0LCBjb3VudCwgaW5zdGFuY2VDb3VudCk7CiAgICAgICAgIH0KKyAgICAgICAgcHJlcGFy ZUZvclRyYW5zZm9ybUZlZWRiYWNrUGFzc1R3bygpOwogICAgIH0KICAgICBBTkdMRV9UUlkoc2V0 dXBEcmF3KGNvbnRleHQsIG1vZGUsIGZpcnN0LCBjb3VudCwgaW5zdGFuY2VzLCBnbDo6RHJhd0Vs ZW1lbnRzVHlwZTo6SW52YWxpZEVudW0sCiAgICAgICAgICAgICAgICAgICAgICAgICBudWxscHRy LCBmYWxzZSkpOwpAQCAtNTAwLDYgKzUwNCw3IEBAIGFuZ2xlOjpSZXN1bHQgQ29udGV4dE10bDo6 ZHJhd1RyaUZhbkVsZW1lbnRzKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogCiAgICAgICAg ICAgICBleGVjRHJhd0luZGV4ZWRJbnN0YW5jZWQoTVRMUHJpbWl0aXZlVHlwZVRyaWFuZ2xlLCBn ZW5JbmRpY2VzQ291bnQsIE1UTEluZGV4VHlwZVVJbnQzMiwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBnZW5JZHhCdWZmZXIsIGdlbklkeEJ1ZmZlck9mZnNldCwgaW5zdGFu Y2VzKTsKKyAgICAgICAgICAgIHByZXBhcmVGb3JUcmFuc2Zvcm1GZWVkYmFja1Bhc3NUd28oKTsK ICAgICAgICAgfQogCiAgICAgICAgIEFOR0xFX1RSWShzZXR1cERyYXcoY29udGV4dCwgZ2w6OlBy aW1pdGl2ZU1vZGU6OlRyaWFuZ2xlRmFuLCAwLCBjb3VudCwgaW5zdGFuY2VzLCB0eXBlLApAQCAt NTI5LDYgKzUzNCwxNSBAQCBhbmdsZTo6UmVzdWx0IENvbnRleHRNdGw6OmRyYXdMaW5lTG9vcEVs ZW1lbnRzTm9uSW5zdGFuY2VkTm9QcmltaXRpdmVSZXN0YXJ0KAogICAgIHJldHVybiBkcmF3RWxl bWVudHNJbXBsKGNvbnRleHQsIGdsOjpQcmltaXRpdmVNb2RlOjpMaW5lU3RyaXAsIGNvdW50LCB0 eXBlLCBpbmRpY2VzLCAwKTsKIH0KIAordm9pZCBDb250ZXh0TXRsOjpwcmVwYXJlRm9yVHJhbnNm b3JtRmVlZGJhY2tQYXNzVHdvKCkKK3sKKyAgICAvL0lmIHdlIGRvbid0IGhhdmUgcmFzdGVyaXph dGlvbiBlbmFibGVkLCB3ZSBjYW4gcmUtcnVuIHRoZSBzYW1lIHZlcnRleCBzaGFkZXIuIE90aGVy d2lzZSwKKyAgICAvL1dlIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgcmVuZGVyIHBpcGVsaW5lIHN0 YXRlLgorICAgIGlmKCFtU3RhdGUuaXNSYXN0ZXJpemVyRGlzY2FyZEVuYWJsZWQoKSkKKyAgICB7 CisgICAgICAgIGludmFsaWRhdGVSZW5kZXJQaXBlbGluZSgpOworICAgIH0KK30KIGFuZ2xlOjpS ZXN1bHQgQ29udGV4dE10bDo6ZHJhd0xpbmVMb29wRWxlbWVudHMoY29uc3QgZ2w6OkNvbnRleHQg KmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEdMc2l6ZWkgY291bnQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdsOjpEcmF3RWxlbWVudHNUeXBlIHR5cGUsCkBAIC01NjUsNiArNTc5LDcgQEAgYW5n bGU6OlJlc3VsdCBDb250ZXh0TXRsOjpkcmF3TGluZUxvb3BFbGVtZW50cyhjb25zdCBnbDo6Q29u dGV4dCAqY29udGV4dCwKIAogICAgICAgICAgICAgZXhlY0RyYXdJbmRleGVkSW5zdGFuY2VkKE1U TFByaW1pdGl2ZVR5cGVMaW5lU3RyaXAsIGdlbkluZGljZXNDb3VudCwgTVRMSW5kZXhUeXBlVUlu dDMyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdlbklkeEJ1ZmZlciwg Z2VuSWR4QnVmZmVyT2Zmc2V0LCBpbnN0YW5jZXMpOworICAgICAgICAgICAgcHJlcGFyZUZvclRy YW5zZm9ybUZlZWRiYWNrUGFzc1R3bygpOwogICAgICAgICB9CiAKICAgICAgICAgQU5HTEVfVFJZ KHNldHVwRHJhdyhjb250ZXh0LCBnbDo6UHJpbWl0aXZlTW9kZTo6TGluZUxvb3AsIDAsIGNvdW50 LCBpbnN0YW5jZXMsIHR5cGUsCkBAIC02NjAsNiArNjc1LDcgQEAgYW5nbGU6OlJlc3VsdCBDb250 ZXh0TXRsOjpkcmF3RWxlbWVudHNJbXBsKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbW1hbmQub2Zmc2V0LCBpbnN0YW5j ZUNvdW50KTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgICAgICBwcmVwYXJlRm9yVHJh bnNmb3JtRmVlZGJhY2tQYXNzVHdvKCk7CiAgICAgfQogCiAgICAgQU5HTEVfVFJZKHNldHVwRHJh dyhjb250ZXh0LCBtb2RlLCAwLCBjb252ZXJ0ZWRDb3VudGkzMiwgaW5zdGFuY2VzLCB0eXBlLCBp bmRpY2VzLCBmYWxzZSkpOwpAQCAtMTM5NCw2ICsxNDEwLDE5IEBAIHZvaWQgQ29udGV4dE10bDo6 b25FbmRUcmFuc2Zvcm1GZWVkYmFjaygpCiAgICAgewogICAgICAgICBvblRyYW5zZm9ybUZlZWRi YWNrU3RhdGVDaGFuZ2VkKCk7CiAgICAgfQorICAgIGlmIChnZXREaXNwbGF5KCktPmdldEZlYXR1 cmVzKCkuaGFzRXhwbGljaXRNZW1CYXJyaWVyLmVuYWJsZWQpCisgICAgeworICAgICAgICBmb3Io YXV0byAmIGJ1ZmZlclJlZiA6IG1DdXJyZW50VHJhbnNmb3JtRmVlZGJhY2tCdWZmZXJzKQorICAg ICAgICB7CisgICAgICAgICAgICBjb25zdCBtdGw6OkJ1ZmZlclJlZiAmIGNvbnN0QnVmZmVyUmVm ID0gYnVmZmVyUmVmLT5nZXRDdXJyZW50QnVmZmVyKCk7CisgICAgICAgICAgICBtUmVuZGVyRW5j b2Rlci5tZW1vcnlCYXJyaWVyV2l0aFJlc291cmNlKGNvbnN0QnVmZmVyUmVmLCBtdGw6OmtSZW5k ZXJTdGFnZVZlcnRleCwgbXRsOjprUmVuZGVyU3RhZ2VWZXJ0ZXgpOworICAgICAgICB9CisgICAg fQorICAgIGVsc2UKKyAgICB7CisgICAgICAgIC8vRW5kIHRoZSBjb21tYW5kIGVuY29kZXIsIHNv IGFueSBUcmFuc2Zvcm0gRmVlZGJhY2sgY2hhbmdlcyBhcmUgYXZhaWxhYmxlIHRvIHN1YnNlcXVl bnQgZHJhdyBjYWxscy4KKyAgICAgICAgZW5kRW5jb2RpbmcoZmFsc2UpOworICAgIH0KIH0KIAog YW5nbGU6OlJlc3VsdCBDb250ZXh0TXRsOjpvblBhdXNlVHJhbnNmb3JtRmVlZGJhY2soKQo=