232656 2021-11-02 22:37:27 -0700 [WebIDL] A default value = {} in a dictionary is not supported 2022-09-03 16:46:15 -0700 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232558 1 mmaxfield djg ahmad.saleem792 ap cdumez djg esprehn+autocc ews-watchlist heycam kondapallykalyan rniwa sam vitor.roriz webkit-bug-importer oldest_to_newest 1811393 0 mmaxfield 2021-11-02 22:37:27 -0700 dictionary GPUDepthStencilState { GPUStencilFaceState stencilFront = {}; } The "= {}" is not supported. 1811408 1 mmaxfield 2021-11-03 01:10:21 -0700 Also the "= {}" in interface GPUCommandEncoder { GPUComputePassEncoder beginComputePass(optional GPUComputePassDescriptor descriptor = {}); 1813471 2 webkit-bug-importer 2021-11-09 21:38:20 -0800 <rdar://problem/85238647> 1847964 3 sam 2022-03-03 10:28:13 -0800 In most cases, we do the right thing if just remove the "= { }" because most interfaces treat `nullopt` and default constructed inner type the same. That said, this would certainly be nice to fix. 1848177 4 djg 2022-03-03 22:07:31 -0800 (In reply to Sam Weinig from comment #3) > In most cases, we do the right thing if just remove the "= { }" because most > interfaces treat `nullopt` and default constructed inner type the same. > > That said, this would certainly be nice to fix. I implemented this by adding the parsing for = {} and returning the "default" value as "{}". Do I need to update the generator if "we do the right thing..."? (I saw we handle $default == "[]") 1848446 5 sam 2022-03-04 16:35:55 -0800 If you just want to add the parsing now that is probably fine. I can add the code generator support at some point. 1848494 6 djg 2022-03-04 21:32:13 -0800 Ok, (In reply to Sam Weinig from comment #5) > If you just want to add the parsing now that is probably fine. I can add the > code generator support at some point. Thanks. I've added the parsing (which was pretty simple) and have the parse return undef so the = {} is effectively accepted and thrown away. 1848498 7 453901 djg 2022-03-04 21:40:44 -0800 Created attachment 453901 Patch 1849488 8 453901 sam 2022-03-08 17:05:37 -0800 Comment on attachment 453901 Patch Can you add a test? 1849510 9 454181 djg 2022-03-08 18:18:40 -0800 Created attachment 454181 Patch 1849511 10 djg 2022-03-08 18:24:23 -0800 Now with added testing. 1849513 11 454182 djg 2022-03-08 18:29:35 -0800 Created attachment 454182 Patch 1895904 12 ahmad.saleem792 2022-09-02 15:49:55 -0700 This r+ but I checked on Webkit Github that it has not landed and noticed that it failed some test cases. Is this required? Thanks! 1895967 13 djg 2022-09-02 19:42:27 -0700 Pull request: https://github.com/WebKit/WebKit/pull/3982 1896102 14 ews-feeder 2022-09-03 16:46:12 -0700 Committed 254138@main (551709dd217f): <https://commits.webkit.org/254138@main> Reviewed commits have been landed. Closing PR #3982 and removing active labels. 453901 2022-03-04 21:40:44 -0800 2022-03-08 19:08:53 -0800 Patch bug-232656-20220305154043.patch text/plain 1568 djg U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY2ZTc0NjA4ZGUyZDJm MGU3MDNlYzk4MTI0Y2E2OTk0NGJlZjIzNi4uMWU0MThkODk3MGM0YjU3ZTY4MGFlZDhhZmIwM2Uy OGZhNzc2ZjAwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDIyLTAzLTA0ICBEYW4g R2xhc3RvbmJ1cnkgIDxkamdAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJJRExdIEEgZGVmYXVs dCB2YWx1ZSA9IHt9IGluIGEgZGljdGlvbmFyeSBpcyBub3Qgc3VwcG9ydGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI2NTYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzg1MjM4NjQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG06CisgICAgICAg IChwYXJzZURlZmF1bHRWYWx1ZSk6IEFjY2VwdCA9IHt9IGJ1dCByZXR1cm4gdW5kZWYsIHJlc3Vs dGluZyBpbgorICAgICAgICB0aGUgY3VycmVudCBiZWhhdmlvciB3aGVuIG5vIGRlZmF1bHQgaXMg c3BlY2lmaWVkLgorCiAyMDIyLTAzLTA0ICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlA YXBwbGUuY29tPgogCiAgICAgICAgIGFib3V0OmJsYW5rIGlmcmFtZXMgZG8gbm90IGFsd2F5cyBp bmhlcml0IHBhcmVudCBDU1AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvSURMUGFyc2VyLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQ YXJzZXIucG0KaW5kZXggMWNkZDJjMWFiYTM2N2NmNDZkYzkxMzA2ZDRmNjcxYWNhYmJmY2RmNC4u MmYyYjA5MGFhODhkMjVlNjdmM2JlMGFkMWNlMDk1OTBjM2M3YTUwZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG0KQEAgLTE0NTUsNiArMTQ1NSwxMiBA QCBzdWIgcGFyc2VEZWZhdWx0VmFsdWUKICAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVmFsdWUo JHNlbGYtPmdldFRva2VuKCksICJdIiwgX19MSU5FX18pOwogICAgICAgICByZXR1cm4gIltdIjsK ICAgICB9CisgICAgaWYgKCRuZXh0LT52YWx1ZSgpIGVxICJ7IikgeworICAgICAgICAjIEFjY2Vw dCB7fSBidXQganVzdCBpZ25vcmUgaXQuCisgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVl KCRzZWxmLT5nZXRUb2tlbigpLCAieyIsIF9fTElORV9fKTsKKyAgICAgICAgJHNlbGYtPmFzc2Vy dFRva2VuVmFsdWUoJHNlbGYtPmdldFRva2VuKCksICJ9IiwgX19MSU5FX18pOworICAgICAgICBy ZXR1cm4gdW5kZWY7CisgICAgfQogICAgICRzZWxmLT5hc3NlcnRVbmV4cGVjdGVkVG9rZW4oJG5l eHQtPnZhbHVlKCksIF9fTElORV9fKTsKIH0KIAo= 454181 2022-03-08 18:18:40 -0800 2022-03-08 18:29:30 -0800 Patch bug-232656-20220309121838.patch text/plain 9837 djg U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY2ZTc0NjA4ZGUyZDJm MGU3MDNlYzk4MTI0Y2E2OTk0NGJlZjIzNi4uMGVlZjhkMDFlNGVlMWUxOThjYzgwNjcyN2VhOTBk ZTBjOTk1ZTRjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTA4ICBEYW4g R2xhc3RvbmJ1cnkgIDxkamdAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJJRExdIEEgZGVmYXVs dCB2YWx1ZSA9IHt9IGluIGEgZGljdGlvbmFyeSBpcyBub3Qgc3VwcG9ydGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI2NTYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzg1MjM4NjQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9JRExQYXJzZXIucG06CisgICAgICAg IChwYXJzZURlZmF1bHRWYWx1ZSk6IEFjY2VwdCA9IHt9IGJ1dCByZXR1cm4gdW5kZWYsIHJlc3Vs dGluZyBpbgorICAgICAgICB0aGUgY3VycmVudCBiZWhhdmlvciB3aGVuIG5vIGRlZmF1bHQgaXMg c3BlY2lmaWVkLgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy8qOiB1cGRhdGVk CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsOgorICAgICAgICBB ZGRlZCB0ZXN0IGNhc2VzIGZvciBkaWN0aW9uYXJ5IGF0dHJpYnV0ZXMgd2l0aCBkZWZhdWx0IGFu ZAorICAgICAgICBvcHRpb25hbCBkaWN0aW9uYXJ5IHRvIG9wZXJhdGlvbiB3aXRoIGRlZmF1bHQu CisKIDIwMjItMDMtMDQgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CiAKICAgICAgICAgYWJvdXQ6YmxhbmsgaWZyYW1lcyBkbyBub3QgYWx3YXlzIGluaGVyaXQgcGFy ZW50IENTUApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9JRExQ YXJzZXIucG0gYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQpp bmRleCAxY2RkMmMxYWJhMzY3Y2Y0NmRjOTEzMDZkNGY2NzFhY2FiYmZjZGY0Li4yZjJiMDkwYWE4 OGQyNWU2N2YzYmUwYWQxY2UwOTU5MGMzYzdhNTBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbQpAQCAtMTQ1NSw2ICsxNDU1LDEyIEBAIHN1YiBwYXJz ZURlZmF1bHRWYWx1ZQogICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+Z2V0 VG9rZW4oKSwgIl0iLCBfX0xJTkVfXyk7CiAgICAgICAgIHJldHVybiAiW10iOwogICAgIH0KKyAg ICBpZiAoJG5leHQtPnZhbHVlKCkgZXEgInsiKSB7CisgICAgICAgICMgQWNjZXB0IHt9IGJ1dCBq dXN0IGlnbm9yZSBpdC4KKyAgICAgICAgJHNlbGYtPmFzc2VydFRva2VuVmFsdWUoJHNlbGYtPmdl dFRva2VuKCksICJ7IiwgX19MSU5FX18pOworICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1 ZSgkc2VsZi0+Z2V0VG9rZW4oKSwgIn0iLCBfX0xJTkVfXyk7CisgICAgICAgIHJldHVybiB1bmRl ZjsKKyAgICB9CiAgICAgJHNlbGYtPmFzc2VydFVuZXhwZWN0ZWRUb2tlbigkbmV4dC0+dmFsdWUo KSwgX19MSU5FX18pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwCmluZGV4IGI0NDczOTVlZTM3YzY0MjBhMjg0MTFi MjZjN2M1MGRiMjY3NzlhZGMuLjgxN2M1YzBiNjVkYmMzODYwYzhlMmFmZjA4MGVjMzA3YjQyNGQ3 NGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9KUy9K U1Rlc3RPYmouY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9K Uy9KU1Rlc3RPYmouY3BwCkBAIC01NzUsNiArNTc1LDE3IEBAIHRlbXBsYXRlPD4gVGVzdE9iajo6 RGljdGlvbmFyeSBjb252ZXJ0RGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5PihKU0dsb2Jh bE9iCiAgICAgICAgIHJlc3VsdC5kaWN0aW9uYXJ5TWVtYmVyID0gY29udmVydDxJRExEaWN0aW9u YXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJhdGVOdWxsPj4obGV4aWNhbEds b2JhbE9iamVjdCwgZGljdGlvbmFyeU1lbWJlclZhbHVlKTsKICAgICAgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwogICAgIH0KKyAgICBKU1ZhbHVlIGRpY3Rpb25hcnlN ZW1iZXJXaXRoRGVmYXVsdFZhbHVlOworICAgIGlmIChpc051bGxPclVuZGVmaW5lZCkKKyAgICAg ICAgZGljdGlvbmFyeU1lbWJlcldpdGhEZWZhdWx0VmFsdWUgPSBqc1VuZGVmaW5lZCgpOworICAg IGVsc2UgeworICAgICAgICBkaWN0aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHRWYWx1ZSA9IG9iamVj dC0+Z2V0KCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBJZGVudGlmaWVyOjpmcm9tU3RyaW5nKHZtLCAi ZGljdGlvbmFyeU1lbWJlcldpdGhEZWZhdWx0IikpOworICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIHsgfSk7CisgICAgfQorICAgIGlmICghZGljdGlvbmFyeU1lbWJlcldp dGhEZWZhdWx0VmFsdWUuaXNVbmRlZmluZWQoKSkgeworICAgICAgICByZXN1bHQuZGljdGlvbmFy eU1lbWJlcldpdGhEZWZhdWx0ID0gY29udmVydDxJRExEaWN0aW9uYXJ5PFRlc3RPYmo6OlBhcmVu dERpY3Rpb25hcnk+PihsZXhpY2FsR2xvYmFsT2JqZWN0LCBkaWN0aW9uYXJ5TWVtYmVyV2l0aERl ZmF1bHRWYWx1ZSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwgeyB9 KTsKKyAgICB9CiAgICAgSlNWYWx1ZSBlbnVtZXJhdGlvblZhbHVlV2l0aERlZmF1bHRWYWx1ZTsK ICAgICBpZiAoaXNOdWxsT3JVbmRlZmluZWQpCiAgICAgICAgIGVudW1lcmF0aW9uVmFsdWVXaXRo RGVmYXVsdFZhbHVlID0ganNVbmRlZmluZWQoKTsKQEAgLTEwNDAsNiArMTA1MSwxMSBAQCBKU0M6 OkpTT2JqZWN0KiBjb252ZXJ0RGljdGlvbmFyeVRvSlMoSlNDOjpKU0dsb2JhbE9iamVjdCYgbGV4 aWNhbEdsb2JhbE9iamVjdCwgSgogICAgICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHRocm93U2Nv cGUsIHsgfSk7CiAgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBKU0M6OklkZW50aWZpZXI6 OmZyb21TdHJpbmcodm0sICJkaWN0aW9uYXJ5TWVtYmVyIiksIGRpY3Rpb25hcnlNZW1iZXJWYWx1 ZSk7CiAgICAgfQorICAgIGlmICghSURMRGljdGlvbmFyeTxUZXN0T2JqOjpQYXJlbnREaWN0aW9u YXJ5Pjo6aXNOdWxsVmFsdWUoZGljdGlvbmFyeS5kaWN0aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHQp KSB7CisgICAgICAgIGF1dG8gZGljdGlvbmFyeU1lbWJlcldpdGhEZWZhdWx0VmFsdWUgPSB0b0pT PElETERpY3Rpb25hcnk8VGVzdE9iajo6UGFyZW50RGljdGlvbmFyeT4+KGxleGljYWxHbG9iYWxP YmplY3QsIGdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSwgSURMRGljdGlvbmFyeTxUZXN0T2JqOjpQ YXJlbnREaWN0aW9uYXJ5Pjo6ZXh0cmFjdFZhbHVlRnJvbU51bGxhYmxlKGRpY3Rpb25hcnkuZGlj dGlvbmFyeU1lbWJlcldpdGhEZWZhdWx0KSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04o dGhyb3dTY29wZSwgeyB9KTsKKyAgICAgICAgcmVzdWx0LT5wdXREaXJlY3Qodm0sIEpTQzo6SWRl bnRpZmllcjo6ZnJvbVN0cmluZyh2bSwgImRpY3Rpb25hcnlNZW1iZXJXaXRoRGVmYXVsdCIpLCBk aWN0aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHRWYWx1ZSk7CisgICAgfQogICAgIGF1dG8gZW51bWVy YXRpb25WYWx1ZVdpdGhEZWZhdWx0VmFsdWUgPSB0b0pTPElETEVudW1lcmF0aW9uPFRlc3RPYmo6 OkVudW1UeXBlPj4obGV4aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSwgZGljdGlvbmFyeS5l bnVtZXJhdGlvblZhbHVlV2l0aERlZmF1bHQpOwogICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhy b3dTY29wZSwgeyB9KTsKICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSlNDOjpJZGVudGlmaWVy Ojpmcm9tU3RyaW5nKHZtLCAiZW51bWVyYXRpb25WYWx1ZVdpdGhEZWZhdWx0IiksIGVudW1lcmF0 aW9uVmFsdWVXaXRoRGVmYXVsdFZhbHVlKTsKQEAgLTE1OTYsNiArMTYxMiw3IEBAIHN0YXRpYyBK U0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9OKGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21ldGhv ZFdpdGhPcHRpb25hbE51CiBzdGF0aWMgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTihqc1Rlc3RP YmpQcm90b3R5cGVGdW5jdGlvbl9tZXRob2RXaXRoT3B0aW9uYWxYUGF0aE5TUmVzb2x2ZXIpOwog c3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJT04oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25fbWV0aG9kV2l0aE9wdGlvbmFsUmVjb3JkKTsKIHN0YXRpYyBKU0NfREVDTEFSRV9IT1NUX0ZV TkNUSU9OKGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhPcHRpb25hbFByb21p c2UpOworc3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJT04oanNUZXN0T2JqUHJvdG90eXBl RnVuY3Rpb25fbWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdCk7CiBzdGF0aWMgSlNDX0RF Q0xBUkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9tZXRob2RXaXRo Q2FsbGJhY2tJbnRlcmZhY2VBcmcpOwogc3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJT04o anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE51bGxhYmxlQ2FsbGJhY2tJbnRl cmZhY2VBcmcpOwogc3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJT04oanNUZXN0T2JqUHJv dG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE5vbkNhbGxiYWNrSW50ZXJmYWNlQXJnQW5kQ2FsbGJh Y2tJbnRlcmZhY2VBcmcpOwpAQCAtMjMyNCw2ICsyMzQxLDcgQEAgc3RhdGljIGNvbnN0IEhhc2hU YWJsZVZhbHVlIEpTVGVzdE9ialByb3RvdHlwZVRhYmxlVmFsdWVzW10gPQogICAgIHsgIm1ldGhv ZFdpdGhPcHRpb25hbFhQYXRoTlNSZXNvbHZlciIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihKU0M6 OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClz dGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25f bWV0aG9kV2l0aE9wdGlvbmFsWFBhdGhOU1Jlc29sdmVyKSwgKGludHB0cl90KSAoMCkgfSB9LAog ICAgIHsgIm1ldGhvZFdpdGhPcHRpb25hbFJlY29yZCIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihK U0M6OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJf dClzdGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25fbWV0aG9kV2l0aE9wdGlvbmFsUmVjb3JkKSwgKGludHB0cl90KSAoMCkgfSB9LAogICAgIHsg Im1ldGhvZFdpdGhPcHRpb25hbFByb21pc2UiLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oSlNDOjpQ cm9wZXJ0eUF0dHJpYnV0ZTo6RnVuY3Rpb24pLCBOb0ludHJpbnNpYywgeyAoaW50cHRyX3Qpc3Rh dGljX2Nhc3Q8UmF3TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21l dGhvZFdpdGhPcHRpb25hbFByb21pc2UpLCAoaW50cHRyX3QpICgwKSB9IH0sCisgICAgeyAibWV0 aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdCIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihKU0M6 OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClz dGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25f bWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdCksIChpbnRwdHJfdCkgKDApIH0gfSwKICAg ICB7ICJtZXRob2RXaXRoQ2FsbGJhY2tJbnRlcmZhY2VBcmciLCBzdGF0aWNfY2FzdDx1bnNpZ25l ZD4oSlNDOjpQcm9wZXJ0eUF0dHJpYnV0ZTo6RnVuY3Rpb24pLCBOb0ludHJpbnNpYywgeyAoaW50 cHRyX3Qpc3RhdGljX2Nhc3Q8UmF3TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1 bmN0aW9uX21ldGhvZFdpdGhDYWxsYmFja0ludGVyZmFjZUFyZyksIChpbnRwdHJfdCkgKDEpIH0g fSwKICAgICB7ICJtZXRob2RXaXRoTnVsbGFibGVDYWxsYmFja0ludGVyZmFjZUFyZyIsIHN0YXRp Y19jYXN0PHVuc2lnbmVkPihKU0M6OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50 cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0 T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE51bGxhYmxlQ2FsbGJhY2tJbnRlcmZhY2VB cmcpLCAoaW50cHRyX3QpICgxKSB9IH0sCiAgICAgeyAibWV0aG9kV2l0aE5vbkNhbGxiYWNrSW50 ZXJmYWNlQXJnQW5kQ2FsbGJhY2tJbnRlcmZhY2VBcmciLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4o SlNDOjpQcm9wZXJ0eUF0dHJpYnV0ZTo6RnVuY3Rpb24pLCBOb0ludHJpbnNpYywgeyAoaW50cHRy X3Qpc3RhdGljX2Nhc3Q8UmF3TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uX21ldGhvZFdpdGhOb25DYWxsYmFja0ludGVyZmFjZUFyZ0FuZENhbGxiYWNrSW50ZXJmYWNl QXJnKSwgKGludHB0cl90KSAoMikgfSB9LApAQCAtNzA0Myw2ICs3MDYxLDI0IEBAIEpTQ19ERUZJ TkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9tZXRob2RXaXRoT3B0 aW9uYWxQcm9taXNlLCAoCiAgICAgcmV0dXJuIElETE9wZXJhdGlvbjxKU1Rlc3RPYmo+OjpjYWxs PGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhPcHRpb25hbFByb21pc2VCb2R5 PigqbGV4aWNhbEdsb2JhbE9iamVjdCwgKmNhbGxGcmFtZSwgIm1ldGhvZFdpdGhPcHRpb25hbFBy b21pc2UiKTsKIH0KIAorc3RhdGljIGlubGluZSBKU0M6OkVuY29kZWRKU1ZhbHVlIGpzVGVzdE9i alByb3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhPcHRpb25hbERpY3RJc0RlZmF1bHRCb2R5KEpT Qzo6SlNHbG9iYWxPYmplY3QqIGxleGljYWxHbG9iYWxPYmplY3QsIEpTQzo6Q2FsbEZyYW1lKiBj YWxsRnJhbWUsIHR5cGVuYW1lIElETE9wZXJhdGlvbjxKU1Rlc3RPYmo+OjpDbGFzc1BhcmFtZXRl ciBjYXN0ZWRUaGlzKQoreworICAgIGF1dG8mIHZtID0gSlNDOjpnZXRWTShsZXhpY2FsR2xvYmFs T2JqZWN0KTsKKyAgICBhdXRvIHRocm93U2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsK KyAgICBVTlVTRURfUEFSQU0odGhyb3dTY29wZSk7CisgICAgVU5VU0VEX1BBUkFNKGNhbGxGcmFt ZSk7CisgICAgYXV0byYgaW1wbCA9IGNhc3RlZFRoaXMtPndyYXBwZWQoKTsKKyAgICBFbnN1cmVT dGlsbEFsaXZlU2NvcGUgYXJndW1lbnQwID0gY2FsbEZyYW1lLT5hcmd1bWVudCgwKTsKKyAgICBh dXRvIGRpY3QgPSBjb252ZXJ0PElETERpY3Rpb25hcnk8VGVzdE9iajo6RGljdGlvbmFyeT4+KCps ZXhpY2FsR2xvYmFsT2JqZWN0LCBhcmd1bWVudDAudmFsdWUoKSk7CisgICAgUkVUVVJOX0lGX0VY Q0VQVElPTih0aHJvd1Njb3BlLCBlbmNvZGVkSlNWYWx1ZSgpKTsKKyAgICBSRUxFQVNFX0FORF9S RVRVUk4odGhyb3dTY29wZSwgSlNWYWx1ZTo6ZW5jb2RlKHRvSlM8SURMVW5kZWZpbmVkPigqbGV4 aWNhbEdsb2JhbE9iamVjdCwgdGhyb3dTY29wZSwgWyZdKCkgLT4gZGVjbHR5cGUoYXV0bykgeyBy ZXR1cm4gaW1wbC5tZXRob2RXaXRoT3B0aW9uYWxEaWN0SXNEZWZhdWx0KFdURk1vdmUoZGljdCkp OyB9KSkpOworfQorCitKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04oanNUZXN0T2JqUHJvdG90eXBl RnVuY3Rpb25fbWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdCwgKEpTR2xvYmFsT2JqZWN0 KiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBDYWxsRnJhbWUqIGNhbGxGcmFtZSkpCit7CisgICAgcmV0 dXJuIElETE9wZXJhdGlvbjxKU1Rlc3RPYmo+OjpjYWxsPGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0 aW9uX21ldGhvZFdpdGhPcHRpb25hbERpY3RJc0RlZmF1bHRCb2R5PigqbGV4aWNhbEdsb2JhbE9i amVjdCwgKmNhbGxGcmFtZSwgIm1ldGhvZFdpdGhPcHRpb25hbERpY3RJc0RlZmF1bHQiKTsKK30K Kwogc3RhdGljIGlubGluZSBKU0M6OkVuY29kZWRKU1ZhbHVlIGpzVGVzdE9ialByb3RvdHlwZUZ1 bmN0aW9uX21ldGhvZFdpdGhDYWxsYmFja0ludGVyZmFjZUFyZ0JvZHkoSlNDOjpKU0dsb2JhbE9i amVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCwgSlNDOjpDYWxsRnJhbWUqIGNhbGxGcmFtZSwgdHlw ZW5hbWUgSURMT3BlcmF0aW9uPEpTVGVzdE9iaj46OkNsYXNzUGFyYW1ldGVyIGNhc3RlZFRoaXMp CiB7CiAgICAgYXV0byYgdm0gPSBKU0M6OmdldFZNKGxleGljYWxHbG9iYWxPYmplY3QpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRs IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCmluZGV4 IDEwZjY1MWE1NzVlNzdiNzUwMDJiODcwY2RiYjg5OGZmYTQ2NjMzYzkuLjExNmM3MDcyNmNmMTBh NjUxMWIzNjMzOGE5ZWZiMWZmZmM3ZDczN2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKQEAgLTI0MCw2ICsyNDAsNyBAQCBlbnVtIFRl c3RDb25maWRlbmNlIHsgImhpZ2giLCAia2luZGEtbG93IiB9OwogICAgIHVuZGVmaW5lZCAgICBt ZXRob2RXaXRoT3B0aW9uYWxYUGF0aE5TUmVzb2x2ZXIob3B0aW9uYWwgWFBhdGhOU1Jlc29sdmVy PyByZXNvbHZlcik7CiAgICAgdW5kZWZpbmVkICAgIG1ldGhvZFdpdGhPcHRpb25hbFJlY29yZChv cHRpb25hbCByZWNvcmQ8RE9NU3RyaW5nLCBsb25nPj8gcmVjb3JkID0gbnVsbCk7CiAgICAgdW5k ZWZpbmVkICAgIG1ldGhvZFdpdGhPcHRpb25hbFByb21pc2Uob3B0aW9uYWwgUHJvbWlzZTx1bmRl ZmluZWQ+IHByb21pc2UpOworICAgIHVuZGVmaW5lZCAgICBtZXRob2RXaXRoT3B0aW9uYWxEaWN0 SXNEZWZhdWx0KG9wdGlvbmFsIFRlc3REaWN0aW9uYXJ5IGRpY3QgPSB7fSk7CiAKICAgICAvLyBD YWxsYmFjayBpbnRlcmZhY2UgcGFyYW1ldGVycy4KICAgICB1bmRlZmluZWQgICAgbWV0aG9kV2l0 aENhbGxiYWNrSW50ZXJmYWNlQXJnKFRlc3RDYWxsYmFja0ludGVyZmFjZSBjYWxsYmFjayk7CkBA IC01MTEsNiArNTEyLDcgQEAgdHlwZWRlZiBhbnkgQW55VHlwZWRlZjsKICAgICBbSW1wbGVtZW50 ZWRBcz1mb29XaXRoRGVmYXVsdF0gYW55IGZvb1dpdGhEZWZhdWx0QWxpYXMgPSAwOwogICAgIEFu eVR5cGVkZWYgYW55VHlwZWRlZlZhbHVlOwogICAgIFRlc3REaWN0aW9uYXJ5VGhhdFNob3VsZFRv bGVyYXRlTnVsbCBkaWN0aW9uYXJ5TWVtYmVyOworICAgIFBhcmVudERpY3Rpb25hcnkgZGljdGlv bmFyeU1lbWJlcldpdGhEZWZhdWx0ID0ge307CiAgICAgKGxvbmcgb3IgTm9kZSkgdW5pb25NZW1i ZXI7CiAgICAgKGxvbmcgb3IgTm9kZSk/IG51bGxhYmxlVW5pb25NZW1iZXIgPSBudWxsOwogICAg IEJ1ZmZlclNvdXJjZSBidWZmZXJTb3VyY2VWYWx1ZTsK 454182 2022-03-08 18:29:35 -0800 2022-03-10 01:30:27 -0800 Patch bug-232656-20220309122934.patch text/plain 9833 djg U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwODUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY2ZTc0NjA4ZGUyZDJm MGU3MDNlYzk4MTI0Y2E2OTk0NGJlZjIzNi4uOWVkNDM0ZTVlY2Q3NTU1YTY3OGExNzJiNDA0OWQ4 NjA4NTk5NGJiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIyLTAzLTA4ICBEYW4g R2xhc3RvbmJ1cnkgIDxkamdAYXBwbGUuY29tPgorCisgICAgICAgIFtXZWJJRExdIEEgZGVmYXVs dCB2YWx1ZSA9IHt9IGluIGEgZGljdGlvbmFyeSBpcyBub3Qgc3VwcG9ydGVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI2NTYKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzg1MjM4NjQ3PgorCisgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcu CisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNlci5wbToKKyAgICAgICAgKHBh cnNlRGVmYXVsdFZhbHVlKTogQWNjZXB0ID0ge30gYnV0IHJldHVybiB1bmRlZiwgcmVzdWx0aW5n IGluCisgICAgICAgIHRoZSBjdXJyZW50IGJlaGF2aW9yIHdoZW4gbm8gZGVmYXVsdCBpcyBzcGVj aWZpZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTLyo6IHVwZGF0ZWQKKyAg ICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGw6CisgICAgICAgIEFkZGVk IHRlc3QgY2FzZXMgZm9yIGRpY3Rpb25hcnkgYXR0cmlidXRlcyB3aXRoIGRlZmF1bHQgYW5kCisg ICAgICAgIG9wdGlvbmFsIGRpY3Rpb25hcnkgdG8gb3BlcmF0aW9uIHdpdGggZGVmYXVsdC4KKwog MjAyMi0wMy0wNCAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAog ICAgICAgICBhYm91dDpibGFuayBpZnJhbWVzIGRvIG5vdCBhbHdheXMgaW5oZXJpdCBwYXJlbnQg Q1NQCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETFBhcnNl ci5wbSBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCmluZGV4 IDFjZGQyYzFhYmEzNjdjZjQ2ZGM5MTMwNmQ0ZjY3MWFjYWJiZmNkZjQuLjJmMmIwOTBhYTg4ZDI1 ZTY3ZjNiZTBhZDFjZTA5NTkwYzNjN2E1MGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3NjcmlwdHMvSURMUGFyc2VyLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvSURMUGFyc2VyLnBtCkBAIC0xNDU1LDYgKzE0NTUsMTIgQEAgc3ViIHBhcnNlRGVm YXVsdFZhbHVlCiAgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVlKCRzZWxmLT5nZXRUb2tl bigpLCAiXSIsIF9fTElORV9fKTsKICAgICAgICAgcmV0dXJuICJbXSI7CiAgICAgfQorICAgIGlm ICgkbmV4dC0+dmFsdWUoKSBlcSAieyIpIHsKKyAgICAgICAgIyBBY2NlcHQge30gYnV0IGp1c3Qg aWdub3JlIGl0LgorICAgICAgICAkc2VsZi0+YXNzZXJ0VG9rZW5WYWx1ZSgkc2VsZi0+Z2V0VG9r ZW4oKSwgInsiLCBfX0xJTkVfXyk7CisgICAgICAgICRzZWxmLT5hc3NlcnRUb2tlblZhbHVlKCRz ZWxmLT5nZXRUb2tlbigpLCAifSIsIF9fTElORV9fKTsKKyAgICAgICAgcmV0dXJuIHVuZGVmOwor ICAgIH0KICAgICAkc2VsZi0+YXNzZXJ0VW5leHBlY3RlZFRva2VuKCRuZXh0LT52YWx1ZSgpLCBf X0xJTkVfXyk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvdGVzdC9KUy9KU1Rlc3RPYmouY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L0pTL0pTVGVzdE9iai5jcHAKaW5kZXggYjQ0NzM5NWVlMzdjNjQyMGEyODQxMWIyNmM3 YzUwZGIyNjc3OWFkYy4uODE3YzVjMGI2NWRiYzM4NjBjOGUyYWZmMDgwZWMzMDdiNDI0ZDc0YSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pTVGVz dE9iai5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pTL0pT VGVzdE9iai5jcHAKQEAgLTU3NSw2ICs1NzUsMTcgQEAgdGVtcGxhdGU8PiBUZXN0T2JqOjpEaWN0 aW9uYXJ5IGNvbnZlcnREaWN0aW9uYXJ5PFRlc3RPYmo6OkRpY3Rpb25hcnk+KEpTR2xvYmFsT2IK ICAgICAgICAgcmVzdWx0LmRpY3Rpb25hcnlNZW1iZXIgPSBjb252ZXJ0PElETERpY3Rpb25hcnk8 VGVzdE9iajo6RGljdGlvbmFyeVRoYXRTaG91bGRUb2xlcmF0ZU51bGw+PihsZXhpY2FsR2xvYmFs T2JqZWN0LCBkaWN0aW9uYXJ5TWVtYmVyVmFsdWUpOwogICAgICAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIHsgfSk7CiAgICAgfQorICAgIEpTVmFsdWUgZGljdGlvbmFyeU1lbWJl cldpdGhEZWZhdWx0VmFsdWU7CisgICAgaWYgKGlzTnVsbE9yVW5kZWZpbmVkKQorICAgICAgICBk aWN0aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHRWYWx1ZSA9IGpzVW5kZWZpbmVkKCk7CisgICAgZWxz ZSB7CisgICAgICAgIGRpY3Rpb25hcnlNZW1iZXJXaXRoRGVmYXVsdFZhbHVlID0gb2JqZWN0LT5n ZXQoJmxleGljYWxHbG9iYWxPYmplY3QsIElkZW50aWZpZXI6OmZyb21TdHJpbmcodm0sICJkaWN0 aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHQiKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04o dGhyb3dTY29wZSwgeyB9KTsKKyAgICB9CisgICAgaWYgKCFkaWN0aW9uYXJ5TWVtYmVyV2l0aERl ZmF1bHRWYWx1ZS5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgIHJlc3VsdC5kaWN0aW9uYXJ5TWVt YmVyV2l0aERlZmF1bHQgPSBjb252ZXJ0PElETERpY3Rpb25hcnk8VGVzdE9iajo6UGFyZW50RGlj dGlvbmFyeT4+KGxleGljYWxHbG9iYWxPYmplY3QsIGRpY3Rpb25hcnlNZW1iZXJXaXRoRGVmYXVs dFZhbHVlKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Njb3BlLCB7IH0pOwor ICAgIH0KICAgICBKU1ZhbHVlIGVudW1lcmF0aW9uVmFsdWVXaXRoRGVmYXVsdFZhbHVlOwogICAg IGlmIChpc051bGxPclVuZGVmaW5lZCkKICAgICAgICAgZW51bWVyYXRpb25WYWx1ZVdpdGhEZWZh dWx0VmFsdWUgPSBqc1VuZGVmaW5lZCgpOwpAQCAtMTA0MCw2ICsxMDUxLDExIEBAIEpTQzo6SlNP YmplY3QqIGNvbnZlcnREaWN0aW9uYXJ5VG9KUyhKU0M6OkpTR2xvYmFsT2JqZWN0JiBsZXhpY2Fs R2xvYmFsT2JqZWN0LCBKCiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04odGhyb3dTY29wZSwg eyB9KTsKICAgICAgICAgcmVzdWx0LT5wdXREaXJlY3Qodm0sIEpTQzo6SWRlbnRpZmllcjo6ZnJv bVN0cmluZyh2bSwgImRpY3Rpb25hcnlNZW1iZXIiKSwgZGljdGlvbmFyeU1lbWJlclZhbHVlKTsK ICAgICB9CisgICAgaWYgKCFJRExEaWN0aW9uYXJ5PFRlc3RPYmo6OlBhcmVudERpY3Rpb25hcnk+ Ojppc051bGxWYWx1ZShkaWN0aW9uYXJ5LmRpY3Rpb25hcnlNZW1iZXJXaXRoRGVmYXVsdCkpIHsK KyAgICAgICAgYXV0byBkaWN0aW9uYXJ5TWVtYmVyV2l0aERlZmF1bHRWYWx1ZSA9IHRvSlM8SURM RGljdGlvbmFyeTxUZXN0T2JqOjpQYXJlbnREaWN0aW9uYXJ5Pj4obGV4aWNhbEdsb2JhbE9iamVj dCwgZ2xvYmFsT2JqZWN0LCB0aHJvd1Njb3BlLCBJRExEaWN0aW9uYXJ5PFRlc3RPYmo6OlBhcmVu dERpY3Rpb25hcnk+OjpleHRyYWN0VmFsdWVGcm9tTnVsbGFibGUoZGljdGlvbmFyeS5kaWN0aW9u YXJ5TWVtYmVyV2l0aERlZmF1bHQpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJv d1Njb3BlLCB7IH0pOworICAgICAgICByZXN1bHQtPnB1dERpcmVjdCh2bSwgSlNDOjpJZGVudGlm aWVyOjpmcm9tU3RyaW5nKHZtLCAiZGljdGlvbmFyeU1lbWJlcldpdGhEZWZhdWx0IiksIGRpY3Rp b25hcnlNZW1iZXJXaXRoRGVmYXVsdFZhbHVlKTsKKyAgICB9CiAgICAgYXV0byBlbnVtZXJhdGlv blZhbHVlV2l0aERlZmF1bHRWYWx1ZSA9IHRvSlM8SURMRW51bWVyYXRpb248VGVzdE9iajo6RW51 bVR5cGU+PihsZXhpY2FsR2xvYmFsT2JqZWN0LCB0aHJvd1Njb3BlLCBkaWN0aW9uYXJ5LmVudW1l cmF0aW9uVmFsdWVXaXRoRGVmYXVsdCk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTih0aHJvd1Nj b3BlLCB7IH0pOwogICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBKU0M6OklkZW50aWZpZXI6OmZy b21TdHJpbmcodm0sICJlbnVtZXJhdGlvblZhbHVlV2l0aERlZmF1bHQiKSwgZW51bWVyYXRpb25W YWx1ZVdpdGhEZWZhdWx0VmFsdWUpOwpAQCAtMTU5Niw2ICsxNjEyLDcgQEAgc3RhdGljIEpTQ19E RUNMQVJFX0hPU1RfRlVOQ1RJT04oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0 aE9wdGlvbmFsTnUKIHN0YXRpYyBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9OKGpzVGVzdE9ialBy b3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhPcHRpb25hbFhQYXRoTlNSZXNvbHZlcik7CiBzdGF0 aWMgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9t ZXRob2RXaXRoT3B0aW9uYWxSZWNvcmQpOwogc3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJ T04oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE9wdGlvbmFsUHJvbWlzZSk7 CitzdGF0aWMgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5cGVGdW5j dGlvbl9tZXRob2RXaXRoT3B0aW9uYWxEaWN0SXNEZWZhdWx0KTsKIHN0YXRpYyBKU0NfREVDTEFS RV9IT1NUX0ZVTkNUSU9OKGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhDYWxs YmFja0ludGVyZmFjZUFyZyk7CiBzdGF0aWMgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTihqc1Rl c3RPYmpQcm90b3R5cGVGdW5jdGlvbl9tZXRob2RXaXRoTnVsbGFibGVDYWxsYmFja0ludGVyZmFj ZUFyZyk7CiBzdGF0aWMgSlNDX0RFQ0xBUkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5 cGVGdW5jdGlvbl9tZXRob2RXaXRoTm9uQ2FsbGJhY2tJbnRlcmZhY2VBcmdBbmRDYWxsYmFja0lu dGVyZmFjZUFyZyk7CkBAIC0yMzI0LDYgKzIzNDEsNyBAQCBzdGF0aWMgY29uc3QgSGFzaFRhYmxl VmFsdWUgSlNUZXN0T2JqUHJvdG90eXBlVGFibGVWYWx1ZXNbXSA9CiAgICAgeyAibWV0aG9kV2l0 aE9wdGlvbmFsWFBhdGhOU1Jlc29sdmVyIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpTQzo6UHJv cGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRp Y19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9tZXRo b2RXaXRoT3B0aW9uYWxYUGF0aE5TUmVzb2x2ZXIpLCAoaW50cHRyX3QpICgwKSB9IH0sCiAgICAg eyAibWV0aG9kV2l0aE9wdGlvbmFsUmVjb3JkIiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpTQzo6 UHJvcGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0 YXRpY19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9t ZXRob2RXaXRoT3B0aW9uYWxSZWNvcmQpLCAoaW50cHRyX3QpICgwKSB9IH0sCiAgICAgeyAibWV0 aG9kV2l0aE9wdGlvbmFsUHJvbWlzZSIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihKU0M6OlByb3Bl cnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClzdGF0aWNf Y2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9k V2l0aE9wdGlvbmFsUHJvbWlzZSksIChpbnRwdHJfdCkgKDApIH0gfSwKKyAgICB7ICJtZXRob2RX aXRoT3B0aW9uYWxEaWN0SXNEZWZhdWx0Iiwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KEpTQzo6UHJv cGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5zaWMsIHsgKGludHB0cl90KXN0YXRp Y19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbl9tZXRo b2RXaXRoT3B0aW9uYWxEaWN0SXNEZWZhdWx0KSwgKGludHB0cl90KSAoMCkgfSB9LAogICAgIHsg Im1ldGhvZFdpdGhDYWxsYmFja0ludGVyZmFjZUFyZyIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihK U0M6OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJf dClzdGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25fbWV0aG9kV2l0aENhbGxiYWNrSW50ZXJmYWNlQXJnKSwgKGludHB0cl90KSAoMSkgfSB9LAog ICAgIHsgIm1ldGhvZFdpdGhOdWxsYWJsZUNhbGxiYWNrSW50ZXJmYWNlQXJnIiwgc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KEpTQzo6UHJvcGVydHlBdHRyaWJ1dGU6OkZ1bmN0aW9uKSwgTm9JbnRyaW5z aWMsIHsgKGludHB0cl90KXN0YXRpY19jYXN0PFJhd05hdGl2ZUZ1bmN0aW9uPihqc1Rlc3RPYmpQ cm90b3R5cGVGdW5jdGlvbl9tZXRob2RXaXRoTnVsbGFibGVDYWxsYmFja0ludGVyZmFjZUFyZyks IChpbnRwdHJfdCkgKDEpIH0gfSwKICAgICB7ICJtZXRob2RXaXRoTm9uQ2FsbGJhY2tJbnRlcmZh Y2VBcmdBbmRDYWxsYmFja0ludGVyZmFjZUFyZyIsIHN0YXRpY19jYXN0PHVuc2lnbmVkPihKU0M6 OlByb3BlcnR5QXR0cmlidXRlOjpGdW5jdGlvbiksIE5vSW50cmluc2ljLCB7IChpbnRwdHJfdClz dGF0aWNfY2FzdDxSYXdOYXRpdmVGdW5jdGlvbj4oanNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25f bWV0aG9kV2l0aE5vbkNhbGxiYWNrSW50ZXJmYWNlQXJnQW5kQ2FsbGJhY2tJbnRlcmZhY2VBcmcp LCAoaW50cHRyX3QpICgyKSB9IH0sCkBAIC03MDQzLDYgKzcwNjEsMjQgQEAgSlNDX0RFRklORV9I T1NUX0ZVTkNUSU9OKGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uX21ldGhvZFdpdGhPcHRpb25h bFByb21pc2UsICgKICAgICByZXR1cm4gSURMT3BlcmF0aW9uPEpTVGVzdE9iaj46OmNhbGw8anNU ZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE9wdGlvbmFsUHJvbWlzZUJvZHk+KCps ZXhpY2FsR2xvYmFsT2JqZWN0LCAqY2FsbEZyYW1lLCAibWV0aG9kV2l0aE9wdGlvbmFsUHJvbWlz ZSIpOwogfQogCitzdGF0aWMgaW5saW5lIEpTQzo6RW5jb2RlZEpTVmFsdWUganNUZXN0T2JqUHJv dG90eXBlRnVuY3Rpb25fbWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdEJvZHkoSlNDOjpK U0dsb2JhbE9iamVjdCogbGV4aWNhbEdsb2JhbE9iamVjdCwgSlNDOjpDYWxsRnJhbWUqIGNhbGxG cmFtZSwgdHlwZW5hbWUgSURMT3BlcmF0aW9uPEpTVGVzdE9iaj46OkNsYXNzUGFyYW1ldGVyIGNh c3RlZFRoaXMpCit7CisgICAgYXV0byYgdm0gPSBKU0M6OmdldFZNKGxleGljYWxHbG9iYWxPYmpl Y3QpOworICAgIGF1dG8gdGhyb3dTY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOworICAg IFVOVVNFRF9QQVJBTSh0aHJvd1Njb3BlKTsKKyAgICBVTlVTRURfUEFSQU0oY2FsbEZyYW1lKTsK KyAgICBhdXRvJiBpbXBsID0gY2FzdGVkVGhpcy0+d3JhcHBlZCgpOworICAgIEVuc3VyZVN0aWxs QWxpdmVTY29wZSBhcmd1bWVudDAgPSBjYWxsRnJhbWUtPmFyZ3VtZW50KDApOworICAgIGF1dG8g ZGljdCA9IGNvbnZlcnQ8SURMRGljdGlvbmFyeTxUZXN0T2JqOjpEaWN0aW9uYXJ5Pj4oKmxleGlj YWxHbG9iYWxPYmplY3QsIGFyZ3VtZW50MC52YWx1ZSgpKTsKKyAgICBSRVRVUk5fSUZfRVhDRVBU SU9OKHRocm93U2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgIFJFTEVBU0VfQU5EX1JFVFVS Tih0aHJvd1Njb3BlLCBKU1ZhbHVlOjplbmNvZGUodG9KUzxJRExVbmRlZmluZWQ+KCpsZXhpY2Fs R2xvYmFsT2JqZWN0LCB0aHJvd1Njb3BlLCBbJl0oKSAtPiBkZWNsdHlwZShhdXRvKSB7IHJldHVy biBpbXBsLm1ldGhvZFdpdGhPcHRpb25hbERpY3RJc0RlZmF1bHQoV1RGTW92ZShkaWN0KSk7IH0p KSk7Cit9CisKK0pTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihqc1Rlc3RPYmpQcm90b3R5cGVGdW5j dGlvbl9tZXRob2RXaXRoT3B0aW9uYWxEaWN0SXNEZWZhdWx0LCAoSlNHbG9iYWxPYmplY3QqIGxl eGljYWxHbG9iYWxPYmplY3QsIENhbGxGcmFtZSogY2FsbEZyYW1lKSkKK3sKKyAgICByZXR1cm4g SURMT3BlcmF0aW9uPEpTVGVzdE9iaj46OmNhbGw8anNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25f bWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdEJvZHk+KCpsZXhpY2FsR2xvYmFsT2JqZWN0 LCAqY2FsbEZyYW1lLCAibWV0aG9kV2l0aE9wdGlvbmFsRGljdElzRGVmYXVsdCIpOworfQorCiBz dGF0aWMgaW5saW5lIEpTQzo6RW5jb2RlZEpTVmFsdWUganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rp b25fbWV0aG9kV2l0aENhbGxiYWNrSW50ZXJmYWNlQXJnQm9keShKU0M6OkpTR2xvYmFsT2JqZWN0 KiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OkNhbGxGcmFtZSogY2FsbEZyYW1lLCB0eXBlbmFt ZSBJRExPcGVyYXRpb248SlNUZXN0T2JqPjo6Q2xhc3NQYXJhbWV0ZXIgY2FzdGVkVGhpcykKIHsK ICAgICBhdXRvJiB2bSA9IEpTQzo6Z2V0Vk0obGV4aWNhbEdsb2JhbE9iamVjdCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKaW5kZXggMTBm NjUxYTU3NWU3N2I3NTAwMmI4NzBjZGJiODk4ZmZhNDY2MzNjOS4uMTE2YzcwNzI2Y2YxMGE2NTEx YjM2MzM4YTllZmIxZmZmYzdkNzM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGlu Z3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbApAQCAtMjQwLDYgKzI0MCw3IEBAIGVudW0gVGVzdENv bmZpZGVuY2UgeyAiaGlnaCIsICJraW5kYS1sb3ciIH07CiAgICAgdW5kZWZpbmVkICAgIG1ldGhv ZFdpdGhPcHRpb25hbFhQYXRoTlNSZXNvbHZlcihvcHRpb25hbCBYUGF0aE5TUmVzb2x2ZXI/IHJl c29sdmVyKTsKICAgICB1bmRlZmluZWQgICAgbWV0aG9kV2l0aE9wdGlvbmFsUmVjb3JkKG9wdGlv bmFsIHJlY29yZDxET01TdHJpbmcsIGxvbmc+PyByZWNvcmQgPSBudWxsKTsKICAgICB1bmRlZmlu ZWQgICAgbWV0aG9kV2l0aE9wdGlvbmFsUHJvbWlzZShvcHRpb25hbCBQcm9taXNlPHVuZGVmaW5l ZD4gcHJvbWlzZSk7CisgICAgdW5kZWZpbmVkICAgIG1ldGhvZFdpdGhPcHRpb25hbERpY3RJc0Rl ZmF1bHQob3B0aW9uYWwgVGVzdERpY3Rpb25hcnkgZGljdCA9IHt9KTsKIAogICAgIC8vIENhbGxi YWNrIGludGVyZmFjZSBwYXJhbWV0ZXJzLgogICAgIHVuZGVmaW5lZCAgICBtZXRob2RXaXRoQ2Fs bGJhY2tJbnRlcmZhY2VBcmcoVGVzdENhbGxiYWNrSW50ZXJmYWNlIGNhbGxiYWNrKTsKQEAgLTUx MSw2ICs1MTIsNyBAQCB0eXBlZGVmIGFueSBBbnlUeXBlZGVmOwogICAgIFtJbXBsZW1lbnRlZEFz PWZvb1dpdGhEZWZhdWx0XSBhbnkgZm9vV2l0aERlZmF1bHRBbGlhcyA9IDA7CiAgICAgQW55VHlw ZWRlZiBhbnlUeXBlZGVmVmFsdWU7CiAgICAgVGVzdERpY3Rpb25hcnlUaGF0U2hvdWxkVG9sZXJh dGVOdWxsIGRpY3Rpb25hcnlNZW1iZXI7CisgICAgUGFyZW50RGljdGlvbmFyeSBkaWN0aW9uYXJ5 TWVtYmVyV2l0aERlZmF1bHQgPSB7fTsKICAgICAobG9uZyBvciBOb2RlKSB1bmlvbk1lbWJlcjsK ICAgICAobG9uZyBvciBOb2RlKT8gbnVsbGFibGVVbmlvbk1lbWJlciA9IG51bGw7CiAgICAgQnVm ZmVyU291cmNlIGJ1ZmZlclNvdXJjZVZhbHVlOwo=