224501 2021-04-13 12:21:18 -0700 [WebIDL] includes for `Conditional` dictionary members should also be guarded 2021-04-13 13:38:11 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi cdumez darin esprehn+autocc ews-watchlist heycam hi kondapallykalyan rniwa sam thorton webkit-bug-importer oldest_to_newest 1749786 0 hi 2021-04-13 12:21:18 -0700 right now only the usage of the member type is guarded inside `convertDictionary` the `#include` should also be guarded 1749787 1 hi 2021-04-13 12:21:33 -0700 <rdar://problem/76598492> 1749793 2 425898 hi 2021-04-13 12:28:07 -0700 Created attachment 425898 Patch 1749839 3 ews-feeder 2021-04-13 13:38:09 -0700 Committed r275907 (236471@main): <https://commits.webkit.org/236471@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425898. 425898 2021-04-13 12:28:07 -0700 2021-04-13 13:38:10 -0700 Patch 224501.diff text/plain 12473 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYWUzMWNkNGNlMTUuLjM1NjhmNTk3MTBlYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI2IEBACisyMDIxLTA0LTEzICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBbV2ViSURMXSBpbmNsdWRlcyBmb3IgYENvbmRpdGlvbmFsYCBkaWN0aW9u YXJ5IG1lbWJlcnMgc2hvdWxkIGFsc28gYmUgZ3VhcmRlZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NTAxCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS83NjU5ODQ5Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXZWJLaXRBZGRpdGlvbnMgc29tZXRpbWVzIG5lZWRzIHRvIGNvbmRpdGlvbmFsbHkgaW5j bHVkZSBJREwgZmlsZXMgYW5kIGluIHRob3NlIGNhc2VzIHRoZQorICAgICAgICBnZW5lcmF0ZWQg YEpTKi5oYCBtaWdodCBub3QgZ2V0IGNyZWF0ZWQgZXZlbiB0aG91Z2ggdGhlIHdyYXBwZWQgQysr IHR5cGUgZG9lcyBleGlzdC4gSW4KKyAgICAgICAgdGhlc2UgY2FzZXMsIHdlIHNob3VsZCBhbHNv IGd1YXJkIHRoZSBgI2luY2x1ZGUgSlMqLmhgIChpbiBhZGRpdGlvbiB0byB0aGUgYWxyZWFkeSBn dWFyZGVkCisgICAgICAgIHVzYWdlIG9mIHRoZSB3cmFwcGVkIEMrKyB0eXBlIGluIGBjb252ZXJ0 RGljdGlvbmFyeWApLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06CisgICAgICAgIChHZW5lcmF0ZURpY3Rpb25hcnlJbXBsZW1lbnRhdGlvbkNvbnRlbnQp OgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3REaWN0aW9uYXJ5LmlkbDog QWRkZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERpY3Rpb25h cnkuaDogQWRkZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERp Y3Rpb25hcnkuY3BwOiBBZGRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVz dERpY3Rpb25hcnlXaXRoT25seUNvbmRpdGlvbmFsTWVtYmVycy5pZGw6CisgICAgICAgICogYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERpY3Rpb25hcnlXaXRoT25seUNvbmRpdGlvbmFs TWVtYmVycy5jcHA6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1N1cHBsZW1lbnRh bERlcGVuZGVuY2llcy5kZXA6CisKIDIwMjEtMDQtMTIgIEJKIEJ1cmcgIDxiYnVyZ0BhcHBsZS5j b20+CiAKICAgICAgICAgTW9kZXJuaXplIHVzZXMgb2YgQ29uc29sZUNsaWVudApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCAw MjExMDdlYzg0MjIuLjZiODkzN2UwZGQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAgLTI2MjcsMTEgKzI2MjcsMTEgQEAg c3ViIEdlbmVyYXRlRGljdGlvbmFyeUltcGxlbWVudGF0aW9uQ29udGVudAogICAgICAgICBteSBA c29ydGVkTWVtYmVycyA9IHNvcnQgeyAkYS0+bmFtZSBjbXAgJGItPm5hbWUgfSBAeyRkaWN0aW9u YXJ5LT5tZW1iZXJzfTsKICAgICAgICAgZm9yZWFjaCBteSAkbWVtYmVyIChAc29ydGVkTWVtYmVy cykgewogICAgICAgICAgICAgJG1lbWJlci0+ZGVmYXVsdCgidW5kZWZpbmVkIikgaWYgJG1lbWJl ci0+dHlwZS0+bmFtZSBlcSAiYW55IiBhbmQgIWRlZmluZWQoJG1lbWJlci0+ZGVmYXVsdCk7ICMg VXNlIHVuZGVmaW5lZCBhcyBkZWZhdWx0IHZhbHVlIGZvciBtZW1iZXIgb2YgdHlwZSAnYW55JyB1 bmxlc3Mgc3BlY2lmaWVkIG90aGVyd2lzZS4KKyAgICAgICAgICAgIG15ICRjb25kaXRpb25hbCA9 ICRtZW1iZXItPmV4dGVuZGVkQXR0cmlidXRlcy0+e0NvbmRpdGlvbmFsfTsKIAogICAgICAgICAg ICAgbXkgJHR5cGUgPSAkbWVtYmVyLT50eXBlOwotICAgICAgICAgICAgQWRkVG9JbXBsSW5jbHVk ZXNGb3JJRExUeXBlKCR0eXBlKTsKKyAgICAgICAgICAgIEFkZFRvSW1wbEluY2x1ZGVzRm9ySURM VHlwZSgkdHlwZSwgJGNvbmRpdGlvbmFsKTsKIAotICAgICAgICAgICAgbXkgJGNvbmRpdGlvbmFs ID0gJG1lbWJlci0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57Q29uZGl0aW9uYWx9OwogICAgICAgICAg ICAgaWYgKCRjb25kaXRpb25hbCkgewogICAgICAgICAgICAgICAgIG15ICRjb25kaXRpb25hbFN0 cmluZyA9ICRjb2RlR2VuZXJhdG9yLT5HZW5lcmF0ZUNvbmRpdGlvbmFsU3RyaW5nRnJvbUF0dHJp YnV0ZVZhbHVlKCRjb25kaXRpb25hbCk7CiAgICAgICAgICAgICAgICAgJHJlc3VsdCAuPSAiI2lm ICR7Y29uZGl0aW9uYWxTdHJpbmd9XG4iOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERpY3Rpb25hcnkuY3BwIGIvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERpY3Rpb25hcnkuY3BwCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uODk3NjAzNzA2NTVmCi0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVzdERp Y3Rpb25hcnkuY3BwCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisgICAgVGhpcyBmaWxlIGlzIHBhcnQg b2YgdGhlIFdlYktpdCBvcGVuIHNvdXJjZSBwcm9qZWN0LgorICAgIFRoaXMgZmlsZSBoYXMgYmVl biBnZW5lcmF0ZWQgYnkgZ2VuZXJhdGUtYmluZGluZ3MucGwuIERPIE5PVCBNT0RJRlkhCisKKyAg ICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQg YW5kL29yCisgICAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkg R2VuZXJhbCBQdWJsaWMKKyAgICBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0 d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAgICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9y IChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVyIHZlcnNpb24uCisKKyAgICBUaGlzIGxpYnJhcnkg aXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgICBi dXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50 eSBvZgorICAgIE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVS UE9TRS4gIFNlZSB0aGUgR05VCisgICAgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv ciBtb3JlIGRldGFpbHMuCisKKyAgICBZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9m IHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0 aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8K KyAgICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJl ZXQsIEZpZnRoIEZsb29yLAorICAgIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgorKi8KKwor I2luY2x1ZGUgImNvbmZpZy5oIgorI2luY2x1ZGUgIkpTVGVzdERpY3Rpb25hcnkuaCIKKworI2lu Y2x1ZGUgIkpTRE9NQ29udmVydE51bWJlcnMuaCIKKyNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9K U0NJbmxpbmVzLmg+CisKKworbmFtZXNwYWNlIFdlYkNvcmUgewordXNpbmcgbmFtZXNwYWNlIEpT QzsKKwordGVtcGxhdGU8PiBUZXN0RGljdGlvbmFyeSBjb252ZXJ0RGljdGlvbmFyeTxUZXN0RGlj dGlvbmFyeT4oSlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG9iYWxPYmplY3QsIEpTVmFsdWUgdmFs dWUpCit7CisgICAgVk0mIHZtID0gSlNDOjpnZXRWTSgmbGV4aWNhbEdsb2JhbE9iamVjdCk7Cisg ICAgYXV0byB0aHJvd1Njb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7CisgICAgYm9vbCBp c051bGxPclVuZGVmaW5lZCA9IHZhbHVlLmlzVW5kZWZpbmVkT3JOdWxsKCk7CisgICAgYXV0byog b2JqZWN0ID0gaXNOdWxsT3JVbmRlZmluZWQgPyBudWxscHRyIDogdmFsdWUuZ2V0T2JqZWN0KCk7 CisgICAgaWYgKFVOTElLRUxZKCFpc051bGxPclVuZGVmaW5lZCAmJiAhb2JqZWN0KSkgeworICAg ICAgICB0aHJvd1R5cGVFcnJvcigmbGV4aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSk7Cisg ICAgICAgIHJldHVybiB7IH07CisgICAgfQorICAgIFRlc3REaWN0aW9uYXJ5IHJlc3VsdDsKKyAg ICBKU1ZhbHVlIG1lbWJlclZhbHVlOworICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKKyAgICAg ICAgbWVtYmVyVmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAgIGVsc2UgeworICAgICAgICBtZW1i ZXJWYWx1ZSA9IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpm cm9tU3RyaW5nKHZtLCAibWVtYmVyIikpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRo cm93U2NvcGUsIHsgfSk7CisgICAgfQorICAgIGlmICghbWVtYmVyVmFsdWUuaXNVbmRlZmluZWQo KSkgeworICAgICAgICByZXN1bHQubWVtYmVyID0gY29udmVydDxJRExEb3VibGU+KGxleGljYWxH bG9iYWxPYmplY3QsIG1lbWJlclZhbHVlKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0 aHJvd1Njb3BlLCB7IH0pOworICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCit9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNUZXN0RGljdGlvbmFyeS5oIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L0pTL0pTVGVzdERpY3Rpb25hcnkuaApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAuLjYxOTA1ZGJhMzlkZgotLS0gL2Rldi9udWxsCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9KU1Rlc3REaWN0aW9uYXJ5LmgKQEAg LTAsMCArMSwzMCBAQAorLyoKKyAgICBUaGlzIGZpbGUgaXMgcGFydCBvZiB0aGUgV2ViS2l0IG9w ZW4gc291cmNlIHByb2plY3QuCisgICAgVGhpcyBmaWxlIGhhcyBiZWVuIGdlbmVyYXRlZCBieSBn ZW5lcmF0ZS1iaW5kaW5ncy5wbC4gRE8gTk9UIE1PRElGWSEKKworICAgIFRoaXMgbGlicmFyeSBp cyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAgICBtb2Rp ZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1YmxpYwor ICAgIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb247 IGVpdGhlcgorICAgIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0aW9u KSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworICAgIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRlZCBp biB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICAgIGJ1dCBXSVRIT1VUIEFOWSBX QVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICAgTUVSQ0hB TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRoZSBH TlUKKyAgICBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4K KworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJyYXJ5 IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAgICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsgc2Vl IHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICAgIHRoZSBGcmVlIFNv ZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxvb3Is CisgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisqLworCisjcHJhZ21hIG9uY2UKKwor I2luY2x1ZGUgIkpTRE9NQ29udmVydERpY3Rpb25hcnkuaCIKKyNpbmNsdWRlICJUZXN0RGljdGlv bmFyeS5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK3RlbXBsYXRlPD4gVGVzdERpY3Rpb25h cnkgY29udmVydERpY3Rpb25hcnk8VGVzdERpY3Rpb25hcnk+KEpTQzo6SlNHbG9iYWxPYmplY3Qm LCBKU0M6OkpTVmFsdWUpOworCit9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0RGljdGlvbmFyeVdp dGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3REaWN0aW9uYXJ5V2l0aE9ubHlDb25kaXRpb25hbE1lbWJlcnMu Y3BwCmluZGV4IDVhNTFkZWQ0ZDYwOC4uOWM5ZmJhNzJmYzU5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0RGljdGlvbmFyeVdpdGhPbmx5 Q29uZGl0aW9uYWxNZW1iZXJzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3Jp cHRzL3Rlc3QvSlMvSlNUZXN0RGljdGlvbmFyeVdpdGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJzLmNw cApAQCAtMjEsMTEgKzIxLDE0IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNU ZXN0RGljdGlvbmFyeVdpdGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJzLmgiCiAKLSNpbmNsdWRlICJK U0RPTUNvbnZlcnROdW1iZXJzLmgiCiAjaW5jbHVkZSAiSlNET01HbG9iYWxPYmplY3QuaCIKICNp bmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU0NJbmxpbmVzLmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlw dENvcmUvT2JqZWN0Q29uc3RydWN0b3IuaD4KIAorI2lmIEVOQUJMRShURVNUX0NPTkRJVElPTkFM KQorI2luY2x1ZGUgIkpTVGVzdERpY3Rpb25hcnkuaCIKKyNlbmRpZgorCiAKIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIHVzaW5nIG5hbWVzcGFjZSBKU0M7CkBAIC00MiwxNSArNDUsMTUgQEAgdGVtcGxh dGU8PiBUZXN0RGljdGlvbmFyeVdpdGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJzIGNvbnZlcnREaWN0 aW9uYXJ5PFRlc3REaWN0aW8KICAgICB9CiAgICAgVGVzdERpY3Rpb25hcnlXaXRoT25seUNvbmRp dGlvbmFsTWVtYmVycyByZXN1bHQ7CiAjaWYgRU5BQkxFKFRFU1RfQ09ORElUSU9OQUwpCi0gICAg SlNWYWx1ZSBjb25kaXRpb25hbEF0dHJWYWx1ZTsKKyAgICBKU1ZhbHVlIGNvbmRpdGlvbmFsTWVt YmVyVmFsdWU7CiAgICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQotICAgICAgICBjb25kaXRpb25h bEF0dHJWYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAgICAgIGNvbmRpdGlvbmFsTWVtYmVyVmFs dWUgPSBqc1VuZGVmaW5lZCgpOwogICAgIGVsc2UgewotICAgICAgICBjb25kaXRpb25hbEF0dHJW YWx1ZSA9IG9iamVjdC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9t U3RyaW5nKHZtLCAiY29uZGl0aW9uYWxBdHRyIikpOworICAgICAgICBjb25kaXRpb25hbE1lbWJl clZhbHVlID0gb2JqZWN0LT5nZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZy b21TdHJpbmcodm0sICJjb25kaXRpb25hbE1lbWJlciIpKTsKICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwogICAgIH0KLSAgICBpZiAoIWNvbmRpdGlvbmFsQXR0 clZhbHVlLmlzVW5kZWZpbmVkKCkpIHsKLSAgICAgICAgcmVzdWx0LmNvbmRpdGlvbmFsQXR0ciA9 IGNvbnZlcnQ8SURMRG91YmxlPihsZXhpY2FsR2xvYmFsT2JqZWN0LCBjb25kaXRpb25hbEF0dHJW YWx1ZSk7CisgICAgaWYgKCFjb25kaXRpb25hbE1lbWJlclZhbHVlLmlzVW5kZWZpbmVkKCkpIHsK KyAgICAgICAgcmVzdWx0LmNvbmRpdGlvbmFsTWVtYmVyID0gY29udmVydDxJRExEaWN0aW9uYXJ5 PFRlc3REaWN0aW9uYXJ5Pj4obGV4aWNhbEdsb2JhbE9iamVjdCwgY29uZGl0aW9uYWxNZW1iZXJW YWx1ZSk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9KTsKICAg ICB9CiAjZW5kaWYKQEAgLTY0LDkgKzY3LDkgQEAgSlNDOjpKU09iamVjdCogY29udmVydERpY3Rp b25hcnlUb0pTKEpTQzo6SlNHbG9iYWxPYmplY3QmIGxleGljYWxHbG9iYWxPYmplY3QsIEoKICAg ICBhdXRvIHJlc3VsdCA9IGNvbnN0cnVjdEVtcHR5T2JqZWN0KCZsZXhpY2FsR2xvYmFsT2JqZWN0 LCBnbG9iYWxPYmplY3Qub2JqZWN0UHJvdG90eXBlKCkpOwogCiAjaWYgRU5BQkxFKFRFU1RfQ09O RElUSU9OQUwpCi0gICAgaWYgKCFJRExEb3VibGU6OmlzTnVsbFZhbHVlKGRpY3Rpb25hcnkuY29u ZGl0aW9uYWxBdHRyKSkgewotICAgICAgICBhdXRvIGNvbmRpdGlvbmFsQXR0clZhbHVlID0gdG9K UzxJRExEb3VibGU+KElETERvdWJsZTo6ZXh0cmFjdFZhbHVlRnJvbU51bGxhYmxlKGRpY3Rpb25h cnkuY29uZGl0aW9uYWxBdHRyKSk7Ci0gICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBKU0M6 OklkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJjb25kaXRpb25hbEF0dHIiKSwgY29uZGl0aW9u YWxBdHRyVmFsdWUpOworICAgIGlmICghSURMRGljdGlvbmFyeTxUZXN0RGljdGlvbmFyeT46Omlz TnVsbFZhbHVlKGRpY3Rpb25hcnkuY29uZGl0aW9uYWxNZW1iZXIpKSB7CisgICAgICAgIGF1dG8g Y29uZGl0aW9uYWxNZW1iZXJWYWx1ZSA9IHRvSlM8SURMRGljdGlvbmFyeTxUZXN0RGljdGlvbmFy eT4+KGxleGljYWxHbG9iYWxPYmplY3QsIGdsb2JhbE9iamVjdCwgSURMRGljdGlvbmFyeTxUZXN0 RGljdGlvbmFyeT46OmV4dHJhY3RWYWx1ZUZyb21OdWxsYWJsZShkaWN0aW9uYXJ5LmNvbmRpdGlv bmFsTWVtYmVyKSk7CisgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBKU0M6OklkZW50aWZp ZXI6OmZyb21TdHJpbmcodm0sICJjb25kaXRpb25hbE1lbWJlciIpLCBjb25kaXRpb25hbE1lbWJl clZhbHVlKTsKICAgICB9CiAjZW5kaWYKICAgICBVTlVTRURfUEFSQU0oZGljdGlvbmFyeSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvU3VwcGxlbWVu dGFsRGVwZW5kZW5jaWVzLmRlcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9TdXBwbGVtZW50YWxEZXBlbmRlbmNpZXMuZGVwCmluZGV4IGFlMWQ2YTI4MGRkZS4uNjEyNTNj NzQ1NjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3Qv U3VwcGxlbWVudGFsRGVwZW5kZW5jaWVzLmRlcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvU3VwcGxlbWVudGFsRGVwZW5kZW5jaWVzLmRlcApAQCAtODIsNiArODIs OSBAQCBXZWJET01UZXN0RGVyaXZlZERpY3Rpb25hcnkuaDoKIEpTVGVzdERlcml2ZWREaWN0aW9u YXJ5Mi5oOiAKIERPTVRlc3REZXJpdmVkRGljdGlvbmFyeTIuaDogCiBXZWJET01UZXN0RGVyaXZl ZERpY3Rpb25hcnkyLmg6IAorSlNUZXN0RGljdGlvbmFyeS5oOiAKK0RPTVRlc3REaWN0aW9uYXJ5 Lmg6IAorV2ViRE9NVGVzdERpY3Rpb25hcnkuaDogCiBKU1Rlc3REaWN0aW9uYXJ5V2l0aE9ubHlD b25kaXRpb25hbE1lbWJlcnMuaDogCiBET01UZXN0RGljdGlvbmFyeVdpdGhPbmx5Q29uZGl0aW9u YWxNZW1iZXJzLmg6IAogV2ViRE9NVGVzdERpY3Rpb25hcnlXaXRoT25seUNvbmRpdGlvbmFsTWVt YmVycy5oOiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVz dC9UZXN0RGljdGlvbmFyeS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVGVzdERpY3Rpb25hcnkuaWRsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMC4uMTZlMWU4ZmEyNmZkCi0tLSAvZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvYmlu ZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3REaWN0aW9uYXJ5LmlkbApAQCAtMCwwICsxLDMxIEBACisv KgorICogQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm0s IHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVk IHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICoKKyAqIDEuICBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuICBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgIG5vdGljZSwgdGhpcyBs aXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAq ICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICogMy4gIE5laXRoZXIgdGhlIG5hbWUgb2YgQXBwbGUgSW5jLiAo IkFwcGxlIikgbm9yIHRoZSBuYW1lcyBvZgorICogICAgIGl0cyBjb250cmlidXRvcnMgbWF5IGJl IHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQKKyAqICAgICBmcm9t IHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24u CisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBBTkQgSVRTIENPTlRS SUJVVE9SUyAiQVMgSVMiIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVT LCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQKKyAqIFdBUlJBTlRJ RVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9T RSBBUkUKKyAqIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIE9SIElUUyBDT05U UklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkKKyAqIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5U QUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTCisgKiAoSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMgT1IgU0VSVklDRVM7CisgKiBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVT SU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQKKyAqIE9OIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBU T1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFO WSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YKKyAqIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisgKi8KKworZGljdGlvbmFyeSBU ZXN0RGljdGlvbmFyeSB7CisgICAgZG91YmxlIG1lbWJlcjsKK307CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdERpY3Rpb25hcnlXaXRoT25seUNv bmRpdGlvbmFsTWVtYmVycy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVGVzdERpY3Rpb25hcnlXaXRoT25seUNvbmRpdGlvbmFsTWVtYmVycy5pZGwKaW5kZXggNzg1 ZWU1NDhiMjdiLi5hYWUwM2IzZjljN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9UZXN0RGljdGlvbmFyeVdpdGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJz LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdERpY3Rp b25hcnlXaXRoT25seUNvbmRpdGlvbmFsTWVtYmVycy5pZGwKQEAgLTI5LDUgKzI5LDUgQEAKIFsK ICAgICBKU0dlbmVyYXRlVG9KU09iamVjdCwKIF0gZGljdGlvbmFyeSBUZXN0RGljdGlvbmFyeVdp dGhPbmx5Q29uZGl0aW9uYWxNZW1iZXJzIHsKLSAgICBbQ29uZGl0aW9uYWw9VEVTVF9DT05ESVRJ T05BTF0gZG91YmxlIGNvbmRpdGlvbmFsQXR0cjsKKyAgICBbQ29uZGl0aW9uYWw9VEVTVF9DT05E SVRJT05BTF0gVGVzdERpY3Rpb25hcnkgY29uZGl0aW9uYWxNZW1iZXI7CiB9Owo=