237402 2022-03-02 18:38:36 -0800 AX ITM: Updating m_pendingLoadingProgress can cause deadlock on AXIsolatedTree::m_changeLogLock 2022-03-04 08:52:51 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1847711 0 tyler_w 2022-03-02 18:38:36 -0800 AXIsolatedTree::m_pendingLoadingProgress is currently guarded by AXIsolatedTree::m_changeLogLock. Because loading can happen at any time, deadlocks can happen in this sequence: 1. AXIsolatedTree::updateLoadingProgress is called on the main thread while the secondary thread holds the lock 2. The secondary thread is holding the lock to service an AX request, and said AX request does something to call into the main thread (e.g. AXLOGs an isolated object, which causes a dispatch to the main thread as part of AXIsolatedObject::outerHTML) 3. Deadlock 1847712 1 webkit-bug-importer 2022-03-02 18:38:48 -0800 <rdar://problem/89726179> 1847714 2 453689 tyler_w 2022-03-02 18:43:37 -0800 Created attachment 453689 Patch 1847717 3 453689 cfleizach 2022-03-02 18:47:51 -0800 Comment on attachment 453689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=453689&action=review > Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:534 > + I’m still worried about this logging happening inside the lock 1847724 4 453691 tyler_w 2022-03-02 19:23:22 -0800 Created attachment 453691 Patch 1847917 5 andresg_22 2022-03-03 09:06:10 -0800 (In reply to Tyler Wilcock from comment #4) > Created attachment 453691 [details] > Patch --- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp +++ a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp + ASSERT(!isMainThread()); AXTRACE("AXIsolatedTree::focusedNode"); AXTRACE is the first line in all functions, by convention, so that when you look at the logs, the { } encompasses the scope of that function as accurate as possible. - double m_pendingLoadingProgress WTF_GUARDED_BY_LOCK(m_changeLogLock) { 0 }; + std::atomic<double> m_pendingLoadingProgress { 0 }; If you are going to make the loading progress atomic, make m_loadingProgress and get rid of m_pendingLoadingProgress, no need to keep a pending variable. std::atomic<double> guaranties that access to that variable is thread safe. 1847920 6 tyler_w 2022-03-03 09:12:28 -0800 > - double m_pendingLoadingProgress WTF_GUARDED_BY_LOCK(m_changeLogLock) { > 0 }; > + std::atomic<double> m_pendingLoadingProgress { 0 }; > > If you are going to make the loading progress atomic, make m_loadingProgress > and get rid of m_pendingLoadingProgress, no need to keep a pending variable. > std::atomic<double> guaranties that access to that variable is thread safe. The thought here was that continuing to keep them separate will be more performant since any reads of m_loadingProgress will not be atomic. 1848026 7 453773 tyler_w 2022-03-03 12:06:26 -0800 Created attachment 453773 Patch 1848319 8 ews-feeder 2022-03-04 08:52:47 -0800 Committed r290833 (248069@main): <https://commits.webkit.org/248069@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 453773. 453689 2022-03-02 18:43:37 -0800 2022-03-02 19:23:19 -0800 Patch bug-237402-20220302204336.patch text/plain 3749 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVmMTA3YTYwMzBjNjkz ODQzN2RhNTUyY2ViMmMzNTA5NmY4MTdlZC4uYWIwMDk3N2I2Y2QyNTkzMDY2OTNhMjI1M2VkYmRj YTBjNjQ3MGM1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIyLTAzLTAyICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVggSVRNOiBVcGRhdGlu ZyBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgY2FuIGNhdXNlIGRlYWRsb2NrIG9uIEFYSXNvbGF0 ZWRUcmVlOjptX2NoYW5nZUxvZ0xvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzQwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCQkKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6Om1fcGVuZGluZ0xvYWRpbmdQcm9ncmVz cyBpcyBjdXJyZW50bHkgZ3VhcmRlZCBieQorICAgICAgICBBWElzb2xhdGVkVHJlZTo6bV9jaGFu Z2VMb2dMb2NrLiBCZWNhdXNlIGxvYWRpbmcgY2FuIGhhcHBlbiBhdCBhbnkgdGltZSwKKyAgICAg ICAgZGVhZGxvY2tzIGNhbiBoYXBwZW4gaW4gdGhpcyBzZXF1ZW5jZToKKworICAgICAgICAgIDEu IEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVMb2FkaW5nUHJvZ3Jlc3MgaXMgY2FsbGVkIG9uIHRoZSBt YWluIHRocmVhZCB3aGlsZQorICAgICAgICAgICAgIHRoZSBzZWNvbmRhcnkgdGhyZWFkIGhvbGRz IHRoZSBsb2NrCisgICAgICAgICAgMi4gVGhlIHNlY29uZGFyeSB0aHJlYWQgaXMgaG9sZGluZyB0 aGUgbG9jayB0byBzZXJ2aWNlIGFuIEFYIHJlcXVlc3QsIGFuZCBzYWlkCisgICAgICAgICAgICAg QVggcmVxdWVzdCBkb2VzIHNvbWV0aGluZyB0byBjYWxsIGludG8gdGhlIG1haW4gdGhyZWFkIChl LmcuIEFYTE9HcyBhbiBpc29sYXRlZCBvYmplY3QsCisgICAgICAgICAgICAgd2hpY2ggY2F1c2Vz IGEgZGlzcGF0Y2ggdG8gdGhlIG1haW4gdGhyZWFkIGFzIHBhcnQgb2YgQVhJc29sYXRlZE9iamVj dDo6b3V0ZXJIVE1MKS4KKyAgICAgICAgICAzLiBEZWFkbG9jaworCisgICAgICAgIFRoaXMgcGF0 Y2ggZml4ZXMgdGhpcyBieSBtYWtpbmcgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzIHRocmVhZHNh ZmUKKyAgICAgICAgdmlhIHN0ZDo6YXRvbWljPGRvdWJsZT4gcmF0aGVyIHRoYW4gYmVpbmcgZ3Vh cmRlZCBieSBtX2NoYW5nZUxvZ0xvY2suCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lzb2xh dGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVk VHJlZTo6dXBkYXRlTG9hZGluZ1Byb2dyZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0 ZWRUcmVlOjphcHBseVBlbmRpbmdDaGFuZ2VzKToKKyAgICAgICAgV2UgZG9uJ3QgbmVlZCB0byB0 YWtlIG1fY2hhbmdlTG9nTG9jayB0byB1cGRhdGUgLyByZWFkCisgICAgICAgIG1fcGVuZGluZ0xv YWRpbmdQcm9ncmVzcyBhbnltb3JlIGJlY2F1c2UgaXQncyBzdGQ6OmF0b21pYy4KKwogMjAyMi0w Mi0yOCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2Fd IEFkb3B0IC1zdHJlYW1EYXRhUGFyc2VyOmRpZFByb3ZpZGVDb250ZW50S2V5U3BlY2lmaWVyOmZv clRyYWNrSUQ6IGRlbGVnYXRlIGNhbGxiYWNrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKaW5kZXgg MjdjODg5YWU2NzdlMmQzNzMyMWNjNGU3MzAwMzhmMjJkZjg1MGIzMS4uZTRhMWU4YmY5N2RhMjU3 ODAxNGIxYjFhY2Y2MjAyZjIyMmFiZmYyZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAt NDY4LDcgKzQ2OCw2IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUxvYWRpbmdQcm9ncmVz cyhkb3VibGUgbmV3UHJvZ3Jlc3NWYWx1ZSkKICAgICBBWExPRyhtYWtlU3RyaW5nKCJRdWV1ZWlu ZyBsb2FkaW5nIHByb2dyZXNzIHVwZGF0ZSB0byAiLCBuZXdQcm9ncmVzc1ZhbHVlLCAiIGZvciB0 cmVlSUQgIiwgdHJlZUlEKCkpKTsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogCi0gICAg TG9ja2VyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogICAgIG1fcGVuZGluZ0xvYWRpbmdQ cm9ncmVzcyA9IG5ld1Byb2dyZXNzVmFsdWU7CiB9CiAKQEAgLTUyOSwxMCArNTI4LDEwIEBAIHZv aWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMoKQogICAgIGlmIChtX3VzZWRP bkFYVGhyZWFkICYmIGlzTWFpblRocmVhZCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBMb2Nr ZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07Ci0KICAgICBtX2xvYWRpbmdQcm9ncmVzcyA9 IG1fcGVuZGluZ0xvYWRpbmdQcm9ncmVzczsKIAorICAgIExvY2tlciBsb2NrZXIgeyBtX2NoYW5n ZUxvZ0xvY2sgfTsKKwogICAgIGlmIChtX3BlbmRpbmdGb2N1c2VkTm9kZUlEICE9IG1fZm9jdXNl ZE5vZGVJRCkgewogICAgICAgICBBWExPRyhtYWtlU3RyaW5nKCJmb2N1c2VkTm9kZUlEICIsIG1f Zm9jdXNlZE5vZGVJRC5sb2dnaW5nU3RyaW5nKCksICIgcGVuZGluZ0ZvY3VzZWROb2RlSUQgIiwg bV9wZW5kaW5nRm9jdXNlZE5vZGVJRC5sb2dnaW5nU3RyaW5nKCkpKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu aCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRU cmVlLmgKaW5kZXggNGFlMTI3MWE5Yzc0NTcwZDllNzhjZjc5YTU1MTQ0ZTBkMWJjZDNlNy4uYTRi YmQ3ZGM5OTQ0NDhkMWQzNjM2Mzc3NGU3YTFmYTI1NzljZThiYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJl ZS5oCkBAIC00MTksNyArNDE5LDcgQEAgcHJpdmF0ZToKICAgICBWZWN0b3I8c3RkOjpwYWlyPEFY SUQsIFZlY3RvcjxBWElEPj4+IG1fcGVuZGluZ0NoaWxkcmVuVXBkYXRlcyBXVEZfR1VBUkRFRF9C WV9MT0NLKG1fY2hhbmdlTG9nTG9jayk7CiAgICAgQVhJRCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlE IFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2NrKTsKICAgICBBWElEIG1fZm9jdXNl ZE5vZGVJRDsKLSAgICBkb3VibGUgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzIFdURl9HVUFSREVE X0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2NrKSB7IDAgfTsKKyAgICBzdGQ6OmF0b21pYzxkb3VibGU+ IG1fcGVuZGluZ0xvYWRpbmdQcm9ncmVzcyB7IDAgfTsKICAgICBkb3VibGUgbV9sb2FkaW5nUHJv Z3Jlc3MgeyAwIH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7CiB9Owo= 453691 2022-03-02 19:23:22 -0800 2022-03-03 12:06:23 -0800 Patch bug-237402-20220302212321.patch text/plain 4582 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVmMTA3YTYwMzBjNjkz ODQzN2RhNTUyY2ViMmMzNTA5NmY4MTdlZC4uMDA0MTQzZDYzMGQxN2RlNTI0OWVhZjM4YjQ4YjVm MDIxZWE0NzhlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIyLTAzLTAyICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVggSVRNOiBVcGRhdGlu ZyBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgY2FuIGNhdXNlIGRlYWRsb2NrIG9uIEFYSXNvbGF0 ZWRUcmVlOjptX2NoYW5nZUxvZ0xvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzQwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFYSXNvbGF0ZWRUcmVlOjptX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3Mg aXMgY3VycmVudGx5IGd1YXJkZWQgYnkKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6Om1fY2hhbmdl TG9nTG9jay4gQmVjYXVzZSBsb2FkaW5nIGNhbiBoYXBwZW4gYXQgYW55IHRpbWUsCisgICAgICAg IGRlYWRsb2NrcyBjYW4gaGFwcGVuIGluIHRoaXMgc2VxdWVuY2U6CisKKyAgICAgICAgICAxLiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlTG9hZGluZ1Byb2dyZXNzIGlzIGNhbGxlZCBvbiB0aGUgbWFp biB0aHJlYWQgd2hpbGUKKyAgICAgICAgICAgICB0aGUgc2Vjb25kYXJ5IHRocmVhZCBob2xkcyB0 aGUgbG9jaworICAgICAgICAgIDIuIFRoZSBzZWNvbmRhcnkgdGhyZWFkIGlzIGhvbGRpbmcgdGhl IGxvY2sgdG8gc2VydmljZSBhbiBBWCByZXF1ZXN0LCBhbmQgc2FpZAorICAgICAgICAgICAgIEFY IHJlcXVlc3QgZG9lcyBzb21ldGhpbmcgdG8gY2FsbCBpbnRvIHRoZSBtYWluIHRocmVhZCAoZS5n LiBBWExPR3MgYW4gaXNvbGF0ZWQgb2JqZWN0LAorICAgICAgICAgICAgIHdoaWNoIGNhdXNlcyBh IGRpc3BhdGNoIHRvIHRoZSBtYWluIHRocmVhZCBhcyBwYXJ0IG9mIEFYSXNvbGF0ZWRPYmplY3Q6 Om91dGVySFRNTCkuCisgICAgICAgICAgMy4gRGVhZGxvY2sKKworICAgICAgICBUaGlzIHBhdGNo IGZpeGVzIHRoaXMgYnkgbWFraW5nIG1fcGVuZGluZ0xvYWRpbmdQcm9ncmVzcyB0aHJlYWRzYWZl CisgICAgICAgIHZpYSBzdGQ6OmF0b21pYzxkb3VibGU+IHJhdGhlciB0aGFuIGJlaW5nIGd1YXJk ZWQgYnkgbV9jaGFuZ2VMb2dMb2NrLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWxzbyByZW1vdmVz IGFuIHVubmVjZXNzYXJ5IGFjcXVpc2l0aW9uIG9mIG1fY2hhbmdlTG9nTG9jaworICAgICAgICBp biBBWElzb2xhdGVkVHJlZTo6Zm9jdXNlZE5vZGUoKS4gVGhpcyBmdW5jdGlvbiBpcyBvbmx5IGNh bGxlZCBvbiB0aGUKKyAgICAgICAgc2Vjb25kYXJ5LXRocmVhZCwgYW5kIG9ubHkgYWNjZXNzZXMg c2Vjb25kYXJ5LXRocmVhZCBzYWZlIGZ1bmN0aW9ucworICAgICAgICBhbmQgbWVtYmVyIHZhcmlh YmxlcyAobm9kZUZvcklELCBtX2ZvY3VzZWROb2RlSUQpLCBzbyB3ZSBkb24ndCBuZWVkIHRoZSBs b2NrLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OnVwZGF0ZUxvYWRpbmdQ cm9ncmVzcyk6CisgICAgICAgIChXZWJDb3JlOjpBWElzb2xhdGVkVHJlZTo6YXBwbHlQZW5kaW5n Q2hhbmdlcyk6CisgICAgICAgIFdlIGRvbid0IG5lZWQgdG8gdGFrZSBtX2NoYW5nZUxvZ0xvY2sg dG8gdXBkYXRlIC8gcmVhZAorICAgICAgICBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgYW55bW9y ZSBiZWNhdXNlIGl0J3Mgc3RkOjphdG9taWMuCisKIDIwMjItMDItMjggIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBBZG9wdCAtc3RyZWFtRGF0YVBh cnNlcjpkaWRQcm92aWRlQ29udGVudEtleVNwZWNpZmllcjpmb3JUcmFja0lEOiBkZWxlZ2F0ZSBj YWxsYmFjawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRl ZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDI3Yzg4OWFlNjc3ZTJkMzczMjFj YzRlNzMwMDM4ZjIyZGY4NTBiMzEuLmNkYTIxYWYzYjZhY2UzYzY2MGU5MDY1Njg1MWIzMjU2ZmM2 Y2IwN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTQyMCwxMCArNDIwLDEwIEBAIHZv aWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3Qp CiAKIFJlZlB0cjxBWElzb2xhdGVkT2JqZWN0PiBBWElzb2xhdGVkVHJlZTo6Zm9jdXNlZE5vZGUo KQogeworICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogICAgIEFYVFJBQ0UoIkFYSXNvbGF0 ZWRUcmVlOjpmb2N1c2VkTm9kZSIpOwogICAgIC8vIEFwcGx5IHBlbmRpbmcgY2hhbmdlcyBpbiBj YXNlIGZvY3VzIGhhcyBjaGFuZ2VkIGFuZCBoYXNuJ3QgYmVlbiB1cGRhdGVkLgogICAgIGFwcGx5 UGVuZGluZ0NoYW5nZXMoKTsKLSAgICBMb2NrZXIgbG9ja2VyIHsgbV9jaGFuZ2VMb2dMb2NrIH07 CiAgICAgQVhMT0cobWFrZVN0cmluZygiZm9jdXNlZE5vZGVJRCAiLCBtX2ZvY3VzZWROb2RlSUQu bG9nZ2luZ1N0cmluZygpKSk7CiAgICAgQVhMT0coImZvY3VzZWQgbm9kZToiKTsKICAgICBBWExP Ryhub2RlRm9ySUQobV9mb2N1c2VkTm9kZUlEKSk7CkBAIC00NjgsNyArNDY4LDYgQEAgdm9pZCBB WElzb2xhdGVkVHJlZTo6dXBkYXRlTG9hZGluZ1Byb2dyZXNzKGRvdWJsZSBuZXdQcm9ncmVzc1Zh bHVlKQogICAgIEFYTE9HKG1ha2VTdHJpbmcoIlF1ZXVlaW5nIGxvYWRpbmcgcHJvZ3Jlc3MgdXBk YXRlIHRvICIsIG5ld1Byb2dyZXNzVmFsdWUsICIgZm9yIHRyZWVJRCAiLCB0cmVlSUQoKSkpOwog ICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7CiAKLSAgICBMb2NrZXIgbG9ja2VyIHsgbV9jaGFu Z2VMb2dMb2NrIH07CiAgICAgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzID0gbmV3UHJvZ3Jlc3NW YWx1ZTsKIH0KIApAQCAtNTI5LDEwICs1MjgsMTAgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6YXBw bHlQZW5kaW5nQ2hhbmdlcygpCiAgICAgaWYgKG1fdXNlZE9uQVhUaHJlYWQgJiYgaXNNYWluVGhy ZWFkKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIExvY2tlciBsb2NrZXIgeyBtX2NoYW5nZUxv Z0xvY2sgfTsKLQogICAgIG1fbG9hZGluZ1Byb2dyZXNzID0gbV9wZW5kaW5nTG9hZGluZ1Byb2dy ZXNzOwogCisgICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OworCiAgICAgaWYg KG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgIT0gbV9mb2N1c2VkTm9kZUlEKSB7CiAgICAgICAgIEFY TE9HKG1ha2VTdHJpbmcoImZvY3VzZWROb2RlSUQgIiwgbV9mb2N1c2VkTm9kZUlELmxvZ2dpbmdT dHJpbmcoKSwgIiBwZW5kaW5nRm9jdXNlZE5vZGVJRCAiLCBtX3BlbmRpbmdGb2N1c2VkTm9kZUlE LmxvZ2dpbmdTdHJpbmcoKSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaAppbmRleCA0YWUxMjcxYTlj NzQ1NzBkOWU3OGNmNzlhNTUxNDRlMGQxYmNkM2U3Li5hNGJiZDdkYzk5NDQ0OGQxZDM2MzYzNzc0 ZTdhMWZhMjU3OWNlOGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTQxOSw3ICs0MTksNyBA QCBwcml2YXRlOgogICAgIFZlY3RvcjxzdGQ6OnBhaXI8QVhJRCwgVmVjdG9yPEFYSUQ+Pj4gbV9w ZW5kaW5nQ2hpbGRyZW5VcGRhdGVzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2Nr KTsKICAgICBBWElEIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQgV1RGX0dVQVJERURfQllfTE9DSyht X2NoYW5nZUxvZ0xvY2spOwogICAgIEFYSUQgbV9mb2N1c2VkTm9kZUlEOwotICAgIGRvdWJsZSBt X3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgV1RGX0dVQVJERURfQllfTE9DSyhtX2NoYW5nZUxvZ0xv Y2spIHsgMCB9OworICAgIHN0ZDo6YXRvbWljPGRvdWJsZT4gbV9wZW5kaW5nTG9hZGluZ1Byb2dy ZXNzIHsgMCB9OwogICAgIGRvdWJsZSBtX2xvYWRpbmdQcm9ncmVzcyB7IDAgfTsKICAgICBMb2Nr IG1fY2hhbmdlTG9nTG9jazsKIH07Cg== 453773 2022-03-03 12:06:26 -0800 2022-03-04 08:52:49 -0800 Patch bug-237402-20220303140625.patch text/plain 4969 tyler_w U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwNjIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGVmMTA3YTYwMzBjNjkz ODQzN2RhNTUyY2ViMmMzNTA5NmY4MTdlZC4uZjVmMjhhMzE0MWE1ZmQxMmNmMjEwNWI1NGYxMWYz OWUxYjJmYzhhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDIyLTAzLTAzICBUeWxl ciBXaWxjb2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CisKKyAgICAgICAgQVggSVRNOiBVcGRhdGlu ZyBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgY2FuIGNhdXNlIGRlYWRsb2NrIG9uIEFYSXNvbGF0 ZWRUcmVlOjptX2NoYW5nZUxvZ0xvY2sKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzNzQwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFYSXNvbGF0ZWRUcmVlOjptX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3Mg aXMgY3VycmVudGx5IGd1YXJkZWQgYnkKKyAgICAgICAgQVhJc29sYXRlZFRyZWU6Om1fY2hhbmdl TG9nTG9jay4gQmVjYXVzZSBsb2FkaW5nIGNhbiBoYXBwZW4gYXQgYW55IHRpbWUsCisgICAgICAg IGRlYWRsb2NrcyBjYW4gaGFwcGVuIGluIHRoaXMgc2VxdWVuY2U6CisKKyAgICAgICAgICAxLiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlTG9hZGluZ1Byb2dyZXNzIGlzIGNhbGxlZCBvbiB0aGUgbWFp biB0aHJlYWQgd2hpbGUKKyAgICAgICAgICAgICB0aGUgc2Vjb25kYXJ5IHRocmVhZCBob2xkcyB0 aGUgbG9jaworICAgICAgICAgIDIuIFRoZSBzZWNvbmRhcnkgdGhyZWFkIGlzIGhvbGRpbmcgdGhl IGxvY2sgdG8gc2VydmljZSBhbiBBWCByZXF1ZXN0LCBhbmQgc2FpZAorICAgICAgICAgICAgIEFY IHJlcXVlc3QgZG9lcyBzb21ldGhpbmcgdG8gY2FsbCBpbnRvIHRoZSBtYWluIHRocmVhZCAoZS5n LiBBWExPR3MgYW4gaXNvbGF0ZWQgb2JqZWN0LAorICAgICAgICAgICAgIHdoaWNoIGNhdXNlcyBh IGRpc3BhdGNoIHRvIHRoZSBtYWluIHRocmVhZCBhcyBwYXJ0IG9mIEFYSXNvbGF0ZWRPYmplY3Q6 Om91dGVySFRNTCkuCisgICAgICAgICAgMy4gRGVhZGxvY2sKKworICAgICAgICBUaGlzIHBhdGNo IGZpeGVzIHRoaXMgYnkgbWFraW5nIG1fbG9hZGluZ1Byb2dyZXNzIHRocmVhZHNhZmUKKyAgICAg ICAgdmlhIHN0ZDo6YXRvbWljPGRvdWJsZT4gYW5kIHJlbW92aW5nIG1fcGVuZGluZ0xvYWRpbmdQ cm9ncmVzcy4KKworICAgICAgICBUaGlzIHBhdGNoIGFsc28gcmVtb3ZlcyBhbiB1bm5lY2Vzc2Fy eSBhY3F1aXNpdGlvbiBvZiBtX2NoYW5nZUxvZ0xvY2sKKyAgICAgICAgaW4gQVhJc29sYXRlZFRy ZWU6OmZvY3VzZWROb2RlKCkuIFRoaXMgZnVuY3Rpb24gaXMgb25seSBjYWxsZWQgb24gdGhlCisg ICAgICAgIHNlY29uZGFyeS10aHJlYWQsIGFuZCBvbmx5IGFjY2Vzc2VzIHNlY29uZGFyeS10aHJl YWQgc2FmZSBmdW5jdGlvbnMKKyAgICAgICAgYW5kIG1lbWJlciB2YXJpYWJsZXMgKG5vZGVGb3JJ RCwgbV9mb2N1c2VkTm9kZUlEKSwgc28gd2UgZG9uJ3QgbmVlZCB0aGUgbG9jay4KKworICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpmb2N1c2VkTm9kZSk6CisgICAgICAgIFJlbW92 ZWQgdW5uZWNlc3NhcnkgbV9jaGFuZ2VMb2dMb2NrIGFjcXVpc2l0aW9uLgorICAgICAgICAoV2Vi Q29yZTo6QVhJc29sYXRlZFRyZWU6OnVwZGF0ZUxvYWRpbmdQcm9ncmVzcyk6CisgICAgICAgIFVw ZGF0ZSBtX2xvYWRpbmdQcm9ncmVzcyBkaXJlY3RseSBpbnN0ZWFkIG9mIHRoZSBub3cgZGVsZXRl ZCBpbnRlcm1lZGlhcnkKKyAgICAgICAgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzLgorICAgICAg ICAoV2ViQ29yZTo6QVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMpOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmg6CisgICAgICAg IFJlbW92ZSBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MuCisKIDIwMjItMDItMjggIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBBZG9wdCAtc3RyZWFt RGF0YVBhcnNlcjpkaWRQcm92aWRlQ29udGVudEtleVNwZWNpZmllcjpmb3JUcmFja0lEOiBkZWxl Z2F0ZSBjYWxsYmFjawpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9p c29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDI3Yzg4OWFlNjc3ZTJk MzczMjFjYzRlNzMwMDM4ZjIyZGY4NTBiMzEuLjA5YWYzMmM2NTJjYjIzZDdmMzYzYzc0Yjk5NmUw MTYxNWRiZDEzMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNv bGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTQyMSw5ICs0MjEsOSBA QCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4T2Jq ZWN0KQogUmVmUHRyPEFYSXNvbGF0ZWRPYmplY3Q+IEFYSXNvbGF0ZWRUcmVlOjpmb2N1c2VkTm9k ZSgpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OmZvY3VzZWROb2RlIik7CisgICAg UkVMRUFTRV9BU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKICAgICAvLyBBcHBseSBwZW5kaW5nIGNo YW5nZXMgaW4gY2FzZSBmb2N1cyBoYXMgY2hhbmdlZCBhbmQgaGFzbid0IGJlZW4gdXBkYXRlZC4K ICAgICBhcHBseVBlbmRpbmdDaGFuZ2VzKCk7Ci0gICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdl TG9nTG9jayB9OwogICAgIEFYTE9HKG1ha2VTdHJpbmcoImZvY3VzZWROb2RlSUQgIiwgbV9mb2N1 c2VkTm9kZUlELmxvZ2dpbmdTdHJpbmcoKSkpOwogICAgIEFYTE9HKCJmb2N1c2VkIG5vZGU6Iik7 CiAgICAgQVhMT0cobm9kZUZvcklEKG1fZm9jdXNlZE5vZGVJRCkpOwpAQCAtNDY1LDExICs0NjUs MTAgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6c2V0Rm9jdXNlZE5vZGVJRChBWElEIGF4SUQpCiB2 b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVMb2FkaW5nUHJvZ3Jlc3MoZG91YmxlIG5ld1Byb2dy ZXNzVmFsdWUpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUxvYWRpbmdQ cm9ncmVzcyIpOwotICAgIEFYTE9HKG1ha2VTdHJpbmcoIlF1ZXVlaW5nIGxvYWRpbmcgcHJvZ3Jl c3MgdXBkYXRlIHRvICIsIG5ld1Byb2dyZXNzVmFsdWUsICIgZm9yIHRyZWVJRCAiLCB0cmVlSUQo KSkpOworICAgIEFYTE9HKG1ha2VTdHJpbmcoIlVwZGF0aW5nIGxvYWRpbmcgcHJvZ3Jlc3MgdG8g IiwgbmV3UHJvZ3Jlc3NWYWx1ZSwgIiBmb3IgdHJlZUlEICIsIHRyZWVJRCgpKSk7CiAgICAgQVNT RVJUKGlzTWFpblRocmVhZCgpKTsKIAotICAgIExvY2tlciBsb2NrZXIgeyBtX2NoYW5nZUxvZ0xv Y2sgfTsKLSAgICBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3MgPSBuZXdQcm9ncmVzc1ZhbHVlOwor ICAgIG1fbG9hZGluZ1Byb2dyZXNzID0gbmV3UHJvZ3Jlc3NWYWx1ZTsKIH0KIAogdm9pZCBBWElz b2xhdGVkVHJlZTo6cmVtb3ZlTm9kZShjb25zdCBBWENvcmVPYmplY3QmIGF4T2JqZWN0KQpAQCAt NTMxLDggKzUzMCw2IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmFwcGx5UGVuZGluZ0NoYW5nZXMo KQogCiAgICAgTG9ja2VyIGxvY2tlciB7IG1fY2hhbmdlTG9nTG9jayB9OwogCi0gICAgbV9sb2Fk aW5nUHJvZ3Jlc3MgPSBtX3BlbmRpbmdMb2FkaW5nUHJvZ3Jlc3M7Ci0KICAgICBpZiAobV9wZW5k aW5nRm9jdXNlZE5vZGVJRCAhPSBtX2ZvY3VzZWROb2RlSUQpIHsKICAgICAgICAgQVhMT0cobWFr ZVN0cmluZygiZm9jdXNlZE5vZGVJRCAiLCBtX2ZvY3VzZWROb2RlSUQubG9nZ2luZ1N0cmluZygp LCAiIHBlbmRpbmdGb2N1c2VkTm9kZUlEICIsIG1fcGVuZGluZ0ZvY3VzZWROb2RlSUQubG9nZ2lu Z1N0cmluZygpKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCmluZGV4IDRhZTEyNzFhOWM3NDU3MGQ5 ZTc4Y2Y3OWE1NTE0NGUwZDFiY2QzZTcuLjI5M2VhNjcyYWVjOGRhYzI4MWRiNmI5YTdmNmRiMzFj MTdlOThjOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtNDE5LDggKzQxOSw3IEBAIHByaXZh dGU6CiAgICAgVmVjdG9yPHN0ZDo6cGFpcjxBWElELCBWZWN0b3I8QVhJRD4+PiBtX3BlbmRpbmdD aGlsZHJlblVwZGF0ZXMgV1RGX0dVQVJERURfQllfTE9DSyhtX2NoYW5nZUxvZ0xvY2spOwogICAg IEFYSUQgbV9wZW5kaW5nRm9jdXNlZE5vZGVJRCBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fY2hhbmdl TG9nTG9jayk7CiAgICAgQVhJRCBtX2ZvY3VzZWROb2RlSUQ7Ci0gICAgZG91YmxlIG1fcGVuZGlu Z0xvYWRpbmdQcm9ncmVzcyBXVEZfR1VBUkRFRF9CWV9MT0NLKG1fY2hhbmdlTG9nTG9jaykgeyAw IH07Ci0gICAgZG91YmxlIG1fbG9hZGluZ1Byb2dyZXNzIHsgMCB9OworICAgIHN0ZDo6YXRvbWlj PGRvdWJsZT4gbV9sb2FkaW5nUHJvZ3Jlc3MgeyAwIH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xv Y2s7CiB9OwogCg==