223695 2021-03-24 09:32:24 -0700 Metal ANGLE crashes LayoutTests/inspector/canvas/updateShader-webgl.html 2021-03-24 18:07:16 -0700 1 1 1 Unclassified WebKit ANGLE WebKit Nightly Build All Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 kpiddington webkit-unassigned ap dino ews-watchlist graouts jdarpinian kbr kkinnunen kondapallykalyan webkit-bug-importer oldest_to_newest 1743347 0 kpiddington 2021-03-24 09:32:24 -0700 Metal ANGLE is crashing in this test (LayoutTests/inspector/canvas/updateShader-webgl.html), due to a bad NSDictionary. Switch to using allocated dictionaries, rather than stack constants. 1743349 1 424141 kpiddington 2021-03-24 09:33:58 -0700 Created attachment 424141 Patch 1743350 2 ews-watchlist 2021-03-24 09:35:20 -0700 Note that there are important steps to take when updating ANGLE. See https://trac.webkit.org/wiki/UpdatingANGLE 1743510 3 424141 ap 2021-03-24 13:12:45 -0700 Comment on attachment 424141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424141&action=review > Source/ThirdParty/ANGLE/ChangeLog:4 > +Switch to using allocated dictionaries, rather than stack constants. What is the exact mechanism for this failure? Literals are not stack constants, and should generally work everywhere. I wonder if this is covering for an over-release somewhere with a leak. > Source/ThirdParty/ANGLE/src/libANGLE/renderer/metal/ProgramMtl.mm:251 > - mDefaultSubstitutionDictionary = @{@"TRANSFORM_FEEDBACK_ENABLED": @"0"}; > + mDefaultSubstitutionDictionary = [[NSDictionary alloc] initWithDictionary:@{@"TRANSFORM_FEEDBACK_ENABLED": @"0"}]; There is a code path above that also initializes mDefaultSubstitutionDictionary with a literal. Worth updating that for consistency? 1743511 4 kbr 2021-03-24 13:16:51 -0700 I'd like to defer review to ap@ who clearly understands this code better than me, but happy to study and officially review if needed. 1743512 5 kbr 2021-03-24 13:17:30 -0700 Also: possible to add the crashing stack trace as a comment here for posterity? 1743518 6 ap 2021-03-24 13:36:35 -0700 An ASan report would likely be best for understanding what leads to the crash. 1743599 7 424200 kpiddington 2021-03-24 16:46:43 -0700 Created attachment 424200 Patch 1743604 8 424202 kpiddington 2021-03-24 17:03:58 -0700 Created attachment 424202 Patch 1743629 9 ews-feeder 2021-03-24 18:06:23 -0700 Committed r274990: <https://commits.webkit.org/r274990> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424202. 1743630 10 webkit-bug-importer 2021-03-24 18:07:16 -0700 <rdar://problem/75815100> 424141 2021-03-24 09:33:58 -0700 2021-03-24 16:46:40 -0700 Patch bug-223695-20210324093357.patch text/plain 1591 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggOTgwNWVhNDFiNDYzNWQwYmM0ODYwOWY4ZjUyOWQ1NjU2ZjA4OThhNS4uODBhNjQ0MGY5MTk1 YWZiYWM1NzdiOGY3MGY5ZjRmNzk2NzdlZjdjNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE1IEBACisyMDIxLTAzLTI0ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWV0YWwgQU5HTEUgaXMgY3Jhc2hpbmcgaW4gdGhp cyB0ZXN0IChMYXlvdXRUZXN0cy9pbnNwZWN0b3IvY2FudmFzL3VwZGF0ZVNoYWRlci13ZWJnbC5o dG1sKSwgZHVlIHRvIGEgYmFkIE5TRGljdGlvbmFyeS4gCitTd2l0Y2ggdG8gdXNpbmcgYWxsb2Nh dGVkIGRpY3Rpb25hcmllcywgcmF0aGVyIHRoYW4gc3RhY2sgY29uc3RhbnRzLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM2OTUKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9saWJBTkdMRS9y ZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLm1tOgorICAgICAgICAocng6OlByb2dyYW1NdGw6OlBy b2dyYW1NdGwpOgorCiAyMDIxLTAzLTIzICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGluZ3RvbkBh cHBsZS5jb20+CiAKICAgICAgICAgQU5HTEUgTWV0YWwgZml4ZXMgZm9yIHByb2dyYW0gZ2VuZXJh dGlvbiBidWdzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbSBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLm1tCmluZGV4IDhlZTA5MDMz YWYwYmQ4YjMzYzkwYTRkYzY2NGE4YmQ1MGU4NzMxNjUuLjVlNmQ1MzQzN2U3MWZkZDExMzUxMGEy MWVmMjViYTFlMTUwNWMwNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLm1tCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLm1tCkBA IC0yNDgsNyArMjQ4LDcgQEAgUHJvZ3JhbU10bDo6UHJvZ3JhbU10bChjb25zdCBnbDo6UHJvZ3Jh bVN0YXRlICZzdGF0ZSkgOiBQcm9ncmFtSW1wbChzdGF0ZSksCiAgICAgZWxzZQogI2VuZGlmCiAg ICAgewotICAgICAgICBtRGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkgPSBAe0AiVFJBTlNG T1JNX0ZFRURCQUNLX0VOQUJMRUQiOiBAIjAifTsKKyAgICAgICAgbURlZmF1bHRTdWJzdGl0dXRp b25EaWN0aW9uYXJ5ID0gW1tOU0RpY3Rpb25hcnkgYWxsb2NdIGluaXRXaXRoRGljdGlvbmFyeTpA e0AiVFJBTlNGT1JNX0ZFRURCQUNLX0VOQUJMRUQiOiBAIjAifV07CiAgICAgfQogfQogCg== 424200 2021-03-24 16:46:43 -0700 2021-03-24 17:07:55 -0700 Patch bug-223695-20210324164642.patch text/plain 4639 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggOTgwNWVhNDFiNDYzNWQwYmM0ODYwOWY4ZjUyOWQ1NjU2ZjA4OThhNS4uOGM0ZWE3NGM0N2Ey YmEzMjRmODVhNTMwOWNhNjE1NzU5N2Q0MzQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTI0ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWV0YWwgQU5HTEUgY3Jhc2hlcyBMYXlvdXRUZXN0 cy9pbnNwZWN0b3IvY2FudmFzL3VwZGF0ZVNoYWRlci13ZWJnbC5odG1sCisJUmF0aGVyIHRoYW4g cmVseSBvbiBhbiBpbnN0YW5jZSB2YXJpYWJsZSBpbiBhIEMrKyBjbGFzcywganVzdCBxdWVyeSB0 aGUgZGljdGlvbmFyeSBjb25zdGFudCB3aGVuIG5lZWRlZC4KKyAgICAgICAgCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM2OTUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5k ZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmg6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVy L21ldGFsL1Byb2dyYW1NdGwubW06CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6UHJvZ3JhbU10 bCk6CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6bGlua0ltcGxTcGlydik6CisgICAgICAgIChy eDo6UHJvZ3JhbU10bDo6bGlua0ltcGxEaXJlY3QpOgorICAgICAgICAocng6OlByb2dyYW1NdGw6 OmxpbmtUcmFuc2xhdGVkU2hhZGVycyk6CisKIDIwMjEtMDMtMjMgIEt5bGUgUGlkZGluZ3RvbiAg PGtwaWRkaW5ndG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBTkdMRSBNZXRhbCBmaXhlcyBmb3Ig cHJvZ3JhbSBnZW5lcmF0aW9uIGJ1Z3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmggYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5oCmlu ZGV4IDAxOTc5YmE1YjY1MjkwNTE0ODc4YzU3ODI2OGE1YmEzMGM2MzQ5ZGEuLjQ3ZWEyMzI2NTNi MmFkYTNlOGRlMjBiZmQ2ZjFjNzc4OGUzMGQxNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmgKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dy YW1NdGwuaApAQCAtMjc1LDcgKzI3NSw2IEBAIGNsYXNzIFByb2dyYW1NdGwgOiBwdWJsaWMgUHJv Z3JhbUltcGwsIHB1YmxpYyBtdGw6OlJlbmRlclBpcGVsaW5lQ2FjaGVTcGVjaWFsaXplCiAKICAg ICBtdGw6OlJlbmRlclBpcGVsaW5lQ2FjaGUgbU1ldGFsUmVuZGVyUGlwZWxpbmVDYWNoZTsKICAg ICBzdGQ6OmFycmF5PHVpbnQzMl90LCBtdGw6OmtNYXhTaGFkZXJYRkJzPiBtWGZiQmluZGluZ3M7 Ci0gICAgTlNEaWN0aW9uYXJ5PE5TU3RyaW5nICosIE5TT2JqZWN0ICo+ICogbURlZmF1bHRTdWJz dGl0dXRpb25EaWN0aW9uYXJ5OwogICAgIG10bDo6QnVmZmVyUG9vbCAqIG1BdXhCdWZmZXJQb29s OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQppbmRleCA4ZWUwOTAzM2Fm MGJkOGIzM2M5MGE0ZGM2NjRhOGJkNTBlODczMTY1Li44NDc0ZTEzZTIzZDVhNGNlZGE4NTMxNzYz NWJiNzAwYTMzMTMzMDVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQpAQCAt OTYsNiArOTYsMTkgQEAgdm9pZCBJbml0RGVmYXVsdFVuaWZvcm1CbG9jayhjb25zdCBzdGQ6OnZl Y3RvcjxzaDo6VW5pZm9ybT4gJnVuaWZvcm1zLAogICAgIHJldHVybjsKIH0KIAoraW5saW5lIE5T RGljdGlvbmFyeTxOU1N0cmluZyAqLCBOU09iamVjdCAqPiAqIGdldERlZmF1bHRTdWJzdGl0dXRp b25EaWN0aW9uYXJ5KCkgeworI2lmIEFOR0xFX0VOQUJMRV9NRVRBTF9TUElSVgorICAgIGlmIChz aDo6cmVhZEJvb2xFbnZWYXIoIkFOR0xFX0dFTl9NVExfV0lUSF9TUElSViIpKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIEB7fTsKKyAgICB9CisgICAgZWxzZQorI2VuZGlmCisgICAgeworICAgICAg ICByZXR1cm4gQHtAIlRSQU5TRk9STV9GRUVEQkFDS19FTkFCTEVEIjogQCIwIn07CisgICAgfQor fQorCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIHZvaWQgVXBkYXRlRGVmYXVsdFVuaWZvcm1CbG9j ayhHTHNpemVpIGNvdW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90 IGFycmF5SW5kZXgsCkBAIC00MTUsNyArNDI4LDcgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRs OjpsaW5rSW1wbFNwaXJ2KGNvbnN0IGdsOjpDb250ZXh0ICpnbENvbnRleHQsCiAgICAgewogICAg ICAgICAvLyBDcmVhdGUgYWN0dWFsIE1ldGFsIHNoYWRlciBsaWJyYXJ5CiAgICAgICAgIEFOR0xF X1RSWShjcmVhdGVNc2xTaGFkZXJMaWIoY29udGV4dE10bCwgc2hhZGVyVHlwZSwgaW5mb0xvZywK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbU1zbFNoYWRlclRyYW5zbGF0 ZUluZm9bc2hhZGVyVHlwZV0sIG1EZWZhdWx0U3Vic3RpdHV0aW9uRGljdGlvbmFyeSkpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5m b1tzaGFkZXJUeXBlXSwgZ2V0RGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkoKSkpOwogICAg IH0KIAogICAgIHJldHVybiBhbmdsZTo6UmVzdWx0OjpDb250aW51ZTsKQEAgLTQ0NSw3ICs0NTgs NyBAQCBhbmdsZTo6UmVzdWx0IFByb2dyYW1NdGw6OmxpbmtJbXBsRGlyZWN0KGNvbnN0IGdsOjpD b250ZXh0ICpnbENvbnRleHQsCiAgICAgewogICAgICAgICAvLyBDcmVhdGUgYWN0dWFsIE1ldGFs IHNoYWRlcgogICAgICAgICBBTkdMRV9UUlkoCi0gICAgICAgICAgICAgICAgICBjcmVhdGVNc2xT aGFkZXJMaWIoY29udGV4dE10bCwgc2hhZGVyVHlwZSwgaW5mb0xvZywgJm1Nc2xTaGFkZXJUcmFu c2xhdGVJbmZvW3NoYWRlclR5cGVdLCBtRGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkpKTsK KyAgICAgICAgICAgICAgICAgIGNyZWF0ZU1zbFNoYWRlckxpYihjb250ZXh0TXRsLCBzaGFkZXJU eXBlLCBpbmZvTG9nLCAmbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bc2hhZGVyVHlwZV0sIGdldERl ZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5KCkpKTsKICAgICB9CiAgICAgLy8gU2F2ZSB0aGlz LCBjb3VsZCBiZSByZXNldCBvbiBzaGFkZXIgZGVzdHJ1Y3Rpb24uIFRoZXNlIHZhbHVlcyB3aWxs IGV2ZW50dWFsbHkgYmUgd3JpdHRlbiBvdXQgYW5kIHJlc3RvcmVkIGluCiAgICAgLy8gc2F2ZVRy YW5zbGF0ZWRTaGFkZXJzL2xvYWRUcmFuc2xhdGVkU2hhZGVycwpAQCAtNDg0LDkgKzQ5Nyw5IEBA IGFuZ2xlOjpSZXN1bHQgUHJvZ3JhbU10bDo6bGlua1RyYW5zbGF0ZWRTaGFkZXJzKGNvbnN0IGds OjpDb250ZXh0ICpnbENvbnRleHQsCiAgICAgQU5HTEVfVFJZKGxvYWREZWZhdWx0VW5pZm9ybUJs b2Nrc0luZm8oZ2xDb250ZXh0LCBzdHJlYW0pKTsKIAogICAgIEFOR0xFX1RSWShjcmVhdGVNc2xT aGFkZXJMaWIoY29udGV4dE10bCwgZ2w6OlNoYWRlclR5cGU6OlZlcnRleCwgaW5mb0xvZywKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tnbDo6 U2hhZGVyVHlwZTo6VmVydGV4XSwgbURlZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5KSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bZ2w6 OlNoYWRlclR5cGU6OlZlcnRleF0sIGdldERlZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5KCkp KTsKICAgICBBTkdMRV9UUlkoY3JlYXRlTXNsU2hhZGVyTGliKGNvbnRleHRNdGwsIGdsOjpTaGFk ZXJUeXBlOjpGcmFnbWVudCwgaW5mb0xvZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tnbDo6U2hhZGVyVHlwZTo6RnJhZ21lbnRdLCBtRGVm YXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tnbDo6U2hhZGVyVHlwZTo6RnJhZ21lbnRdLCBn ZXREZWZhdWx0U3Vic3RpdHV0aW9uRGljdGlvbmFyeSgpKSk7CiAKICAgICByZXR1cm4gYW5nbGU6 OlJlc3VsdDo6Q29udGludWU7CiB9Cg== 424202 2021-03-24 17:03:58 -0700 2021-03-24 18:06:24 -0700 Patch bug-223695-20210324170357.patch text/plain 5134 kpiddington U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggOTgwNWVhNDFiNDYzNWQwYmM0ODYwOWY4ZjUyOWQ1NjU2ZjA4OThhNS4uOGM0ZWE3NGM0N2Ey YmEzMjRmODVhNTMwOWNhNjE1NzU5N2Q0MzQ0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTAzLTI0ICBLeWxlIFBpZGRpbmd0b24gIDxrcGlkZGlu Z3RvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWV0YWwgQU5HTEUgY3Jhc2hlcyBMYXlvdXRUZXN0 cy9pbnNwZWN0b3IvY2FudmFzL3VwZGF0ZVNoYWRlci13ZWJnbC5odG1sCisJUmF0aGVyIHRoYW4g cmVseSBvbiBhbiBpbnN0YW5jZSB2YXJpYWJsZSBpbiBhIEMrKyBjbGFzcywganVzdCBxdWVyeSB0 aGUgZGljdGlvbmFyeSBjb25zdGFudCB3aGVuIG5lZWRlZC4KKyAgICAgICAgCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM2OTUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5k ZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmg6CisgICAgICAgICogc3JjL2xpYkFOR0xFL3JlbmRlcmVy L21ldGFsL1Byb2dyYW1NdGwubW06CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6UHJvZ3JhbU10 bCk6CisgICAgICAgIChyeDo6UHJvZ3JhbU10bDo6bGlua0ltcGxTcGlydik6CisgICAgICAgIChy eDo6UHJvZ3JhbU10bDo6bGlua0ltcGxEaXJlY3QpOgorICAgICAgICAocng6OlByb2dyYW1NdGw6 OmxpbmtUcmFuc2xhdGVkU2hhZGVycyk6CisKIDIwMjEtMDMtMjMgIEt5bGUgUGlkZGluZ3RvbiAg PGtwaWRkaW5ndG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBTkdMRSBNZXRhbCBmaXhlcyBmb3Ig cHJvZ3JhbSBnZW5lcmF0aW9uIGJ1Z3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmggYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5oCmlu ZGV4IDAxOTc5YmE1YjY1MjkwNTE0ODc4YzU3ODI2OGE1YmEzMGM2MzQ5ZGEuLjQ3ZWEyMzI2NTNi MmFkYTNlOGRlMjBiZmQ2ZjFjNzc4OGUzMGQxNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBh cnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9tZXRhbC9Qcm9ncmFtTXRsLmgKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL21ldGFsL1Byb2dy YW1NdGwuaApAQCAtMjc1LDcgKzI3NSw2IEBAIGNsYXNzIFByb2dyYW1NdGwgOiBwdWJsaWMgUHJv Z3JhbUltcGwsIHB1YmxpYyBtdGw6OlJlbmRlclBpcGVsaW5lQ2FjaGVTcGVjaWFsaXplCiAKICAg ICBtdGw6OlJlbmRlclBpcGVsaW5lQ2FjaGUgbU1ldGFsUmVuZGVyUGlwZWxpbmVDYWNoZTsKICAg ICBzdGQ6OmFycmF5PHVpbnQzMl90LCBtdGw6OmtNYXhTaGFkZXJYRkJzPiBtWGZiQmluZGluZ3M7 Ci0gICAgTlNEaWN0aW9uYXJ5PE5TU3RyaW5nICosIE5TT2JqZWN0ICo+ICogbURlZmF1bHRTdWJz dGl0dXRpb25EaWN0aW9uYXJ5OwogICAgIG10bDo6QnVmZmVyUG9vbCAqIG1BdXhCdWZmZXJQb29s OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL21ldGFsL1Byb2dyYW1NdGwubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQppbmRleCA4ZWUwOTAzM2Fm MGJkOGIzM2M5MGE0ZGM2NjRhOGJkNTBlODczMTY1Li40MDM4MzAwZTI1Njc3ODFjZTMzYWJkYTRj NmMxYWM0MzdkNzQyOTg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvbWV0YWwvUHJvZ3JhbU10bC5tbQpAQCAt OTYsNiArOTYsMTkgQEAgdm9pZCBJbml0RGVmYXVsdFVuaWZvcm1CbG9jayhjb25zdCBzdGQ6OnZl Y3RvcjxzaDo6VW5pZm9ybT4gJnVuaWZvcm1zLAogICAgIHJldHVybjsKIH0KIAoraW5saW5lIE5T RGljdGlvbmFyeTxOU1N0cmluZyAqLCBOU09iamVjdCAqPiAqIGdldERlZmF1bHRTdWJzdGl0dXRp b25EaWN0aW9uYXJ5KCkgeworI2lmIEFOR0xFX0VOQUJMRV9NRVRBTF9TUElSVgorICAgIGlmIChz aDo6cmVhZEJvb2xFbnZWYXIoIkFOR0xFX0dFTl9NVExfV0lUSF9TUElSViIpKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIEB7fTsKKyAgICB9CisgICAgZWxzZQorI2VuZGlmCisgICAgeworICAgICAg ICByZXR1cm4gQHtAIlRSQU5TRk9STV9GRUVEQkFDS19FTkFCTEVEIjogQCIwIn07CisgICAgfQor fQorCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KIHZvaWQgVXBkYXRlRGVmYXVsdFVuaWZvcm1CbG9j ayhHTHNpemVpIGNvdW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVpbnQzMl90 IGFycmF5SW5kZXgsCkBAIC0yNDAsMTYgKzI1Myw2IEBAIFByb2dyYW1NdGw6OlByb2dyYW1NdGwo Y29uc3QgZ2w6OlByb2dyYW1TdGF0ZSAmc3RhdGUpIDogUHJvZ3JhbUltcGwoc3RhdGUpLAogICAg IG1BdXhCdWZmZXJQb29sKG51bGxwdHIpCiB7CiAgICAgbU1ldGFsWGZiUmVuZGVyUGlwZWxpbmVD YWNoZSA9IG5ldyBtdGw6OlJlbmRlclBpcGVsaW5lQ2FjaGUodGhpcyk7Ci0jaWYgQU5HTEVfRU5B QkxFX01FVEFMX1NQSVJWCi0gICAgaWYgKHNoOjpyZWFkQm9vbEVudlZhcigiQU5HTEVfR0VOX01U TF9XSVRIX1NQSVJWIikpCi0gICAgewotICAgICAgICBtRGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rp b25hcnkgPSBAe307Ci0gICAgfQotICAgIGVsc2UKLSNlbmRpZgotICAgIHsKLSAgICAgICAgbURl ZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5ID0gQHtAIlRSQU5TRk9STV9GRUVEQkFDS19FTkFC TEVEIjogQCIwIn07Ci0gICAgfQogfQogCiBQcm9ncmFtTXRsOjp+UHJvZ3JhbU10bCgpCkBAIC00 MTUsNyArNDE4LDcgQEAgYW5nbGU6OlJlc3VsdCBQcm9ncmFtTXRsOjpsaW5rSW1wbFNwaXJ2KGNv bnN0IGdsOjpDb250ZXh0ICpnbENvbnRleHQsCiAgICAgewogICAgICAgICAvLyBDcmVhdGUgYWN0 dWFsIE1ldGFsIHNoYWRlciBsaWJyYXJ5CiAgICAgICAgIEFOR0xFX1RSWShjcmVhdGVNc2xTaGFk ZXJMaWIoY29udGV4dE10bCwgc2hhZGVyVHlwZSwgaW5mb0xvZywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bc2hhZGVyVHlwZV0s IG1EZWZhdWx0U3Vic3RpdHV0aW9uRGljdGlvbmFyeSkpOworICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tzaGFkZXJUeXBlXSwgZ2V0 RGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkoKSkpOwogICAgIH0KIAogICAgIHJldHVybiBh bmdsZTo6UmVzdWx0OjpDb250aW51ZTsKQEAgLTQ0NSw3ICs0NDgsNyBAQCBhbmdsZTo6UmVzdWx0 IFByb2dyYW1NdGw6OmxpbmtJbXBsRGlyZWN0KGNvbnN0IGdsOjpDb250ZXh0ICpnbENvbnRleHQs CiAgICAgewogICAgICAgICAvLyBDcmVhdGUgYWN0dWFsIE1ldGFsIHNoYWRlcgogICAgICAgICBB TkdMRV9UUlkoCi0gICAgICAgICAgICAgICAgICBjcmVhdGVNc2xTaGFkZXJMaWIoY29udGV4dE10 bCwgc2hhZGVyVHlwZSwgaW5mb0xvZywgJm1Nc2xTaGFkZXJUcmFuc2xhdGVJbmZvW3NoYWRlclR5 cGVdLCBtRGVmYXVsdFN1YnN0aXR1dGlvbkRpY3Rpb25hcnkpKTsKKyAgICAgICAgICAgICAgICAg IGNyZWF0ZU1zbFNoYWRlckxpYihjb250ZXh0TXRsLCBzaGFkZXJUeXBlLCBpbmZvTG9nLCAmbU1z bFNoYWRlclRyYW5zbGF0ZUluZm9bc2hhZGVyVHlwZV0sIGdldERlZmF1bHRTdWJzdGl0dXRpb25E aWN0aW9uYXJ5KCkpKTsKICAgICB9CiAgICAgLy8gU2F2ZSB0aGlzLCBjb3VsZCBiZSByZXNldCBv biBzaGFkZXIgZGVzdHJ1Y3Rpb24uIFRoZXNlIHZhbHVlcyB3aWxsIGV2ZW50dWFsbHkgYmUgd3Jp dHRlbiBvdXQgYW5kIHJlc3RvcmVkIGluCiAgICAgLy8gc2F2ZVRyYW5zbGF0ZWRTaGFkZXJzL2xv YWRUcmFuc2xhdGVkU2hhZGVycwpAQCAtNDg0LDkgKzQ4Nyw5IEBAIGFuZ2xlOjpSZXN1bHQgUHJv Z3JhbU10bDo6bGlua1RyYW5zbGF0ZWRTaGFkZXJzKGNvbnN0IGdsOjpDb250ZXh0ICpnbENvbnRl eHQsCiAgICAgQU5HTEVfVFJZKGxvYWREZWZhdWx0VW5pZm9ybUJsb2Nrc0luZm8oZ2xDb250ZXh0 LCBzdHJlYW0pKTsKIAogICAgIEFOR0xFX1RSWShjcmVhdGVNc2xTaGFkZXJMaWIoY29udGV4dE10 bCwgZ2w6OlNoYWRlclR5cGU6OlZlcnRleCwgaW5mb0xvZywKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICZtTXNsU2hhZGVyVHJhbnNsYXRlSW5mb1tnbDo6U2hhZGVyVHlwZTo6VmVydGV4 XSwgbURlZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5KSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAmbU1zbFNoYWRlclRyYW5zbGF0ZUluZm9bZ2w6OlNoYWRlclR5cGU6OlZlcnRl eF0sIGdldERlZmF1bHRTdWJzdGl0dXRpb25EaWN0aW9uYXJ5KCkpKTsKICAgICBBTkdMRV9UUlko Y3JlYXRlTXNsU2hhZGVyTGliKGNvbnRleHRNdGwsIGdsOjpTaGFkZXJUeXBlOjpGcmFnbWVudCwg aW5mb0xvZywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZtTXNsU2hhZGVyVHJhbnNs YXRlSW5mb1tnbDo6U2hhZGVyVHlwZTo6RnJhZ21lbnRdLCBtRGVmYXVsdFN1YnN0aXR1dGlvbkRp Y3Rpb25hcnkpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZtTXNsU2hhZGVyVHJh bnNsYXRlSW5mb1tnbDo6U2hhZGVyVHlwZTo6RnJhZ21lbnRdLCBnZXREZWZhdWx0U3Vic3RpdHV0 aW9uRGljdGlvbmFyeSgpKSk7CiAKICAgICByZXR1cm4gYW5nbGU6OlJlc3VsdDo6Q29udGludWU7 CiB9Cg==