241735 2022-06-17 17:26:12 -0700 AX: AXIsolatedTree::updateChildren sometimes fails to update isolated subtrees when the given live object is ignored 2022-08-14 00:00:43 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tyler_w tyler_w aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white w07m webkit-bug-importer oldest_to_newest 1876573 0 tyler_w 2022-06-17 17:26:12 -0700 This causes us to fail to expose webpage content. 1876574 1 webkit-bug-importer 2022-06-17 17:26:21 -0700 <rdar://problem/95424726> 1876576 2 460323 tyler_w 2022-06-17 17:37:19 -0700 Created attachment 460323 Patch 1876579 3 460323 cfleizach 2022-06-17 18:42:01 -0700 Comment on attachment 460323 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=460323&action=review > COMMIT_MESSAGE:12 > + in-isolated tree ancestor, and update the children of that Un isolated? > Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:533 > + AXLOG(liveChild); Do we still need this logging? 1876845 4 andresg_22 2022-06-20 12:33:43 -0700 (In reply to Tyler Wilcock from comment #2) > Created attachment 460323 [details] > Patch --- a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp +++ a/Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp -#ifndef NDEBUG if (axAncestor != &axObject) { AXLOG(makeString("Original object with ID ", axObject.objectID().loggingString(), " wasn't in the isolated tree, so instead updating the closest in-isolated-tree ancestor:")); AXLOG(axAncestor); + for (auto& child : axObject.children()) { + auto* liveChild = dynamicDowncast<AccessibilityObject>(child.get()); + if (liveChild && !liveChild->childrenInitialized() && m_nodeMap.contains(liveChild->objectID())) { + AXLOG(makeString( + "Child ID ", liveChild->objectID().loggingString(), " of original object ID ", axObject.objectID().loggingString(), " was found in the isolated tree with uninitialized live children. Updating its isolated children." + )); + AXLOG(liveChild); + updateChildren(*liveChild); When we hit this condition, and then continue execution into the following for loop, what is preventing from generating the subtree rooted at liveChild twice in : for (size_t i = 0; i < newChildren.size(); ++i) { ... collectNodeChangesForSubtree(*newChildren[i]); ... } The assumption here is that the ChildrenChangedNotification is triggered because of one or more new children, namely the children of axObject such as liveChild->childrenInitialized() is false. But it wouldn't cover the case of an axObject's child being removed. 1877024 5 460379 tyler_w 2022-06-21 13:06:59 -0700 Created attachment 460379 Patch 1877026 6 tyler_w 2022-06-21 13:11:59 -0700 > + AXLOG(liveChild); > + updateChildren(*liveChild); > > When we hit this condition, and then continue execution into the following > for loop, what is preventing from generating the subtree rooted at liveChild > twice in : > > for (size_t i = 0; i < newChildren.size(); ++i) { > ... > collectNodeChangesForSubtree(*newChildren[i]); > ... > } Great catch! I've fixed this by adding a new `ResolveNodeChanges` parameter to `updateChildren` so we don't resolve the node changes (which is the most expensive part) in these sub / recursive calls, instead doing it only once in the "main" updateChildren call. > The assumption here is that the ChildrenChangedNotification is triggered > because of one or more new children, namely the children of axObject such as > liveChild->childrenInitialized() is false. But it wouldn't cover the case of > an axObject's child being removed. Also a good point. Upon investigating, I think we're fine, since the only time we remove children without fulling clearing them out and setting m_childrenInitialized = false is in AccessibilityScrollView::removeChildScrollbar. > COMMIT_MESSAGE:12 > + in-isolated tree ancestor, and update the children of that > Un isolated? "in-isolated tree" was intended. I changed this to "in-isolated-tree" to indicate these words are all linked. Maybe there's a better way to say this though. > Source/WebCore/accessibility/isolatedtree/AXIsolatedTree.cpp:533 > + AXLOG(liveChild); > Do we still need this logging? I removed AXLOG(liveChild) but kept the other added log. I find this type of logging really helpful when debugging tree correctness issues, and I think the other one shouldn't be too noisy (but we can remove later if it is). 1877067 7 andresg_22 2022-06-21 14:33:41 -0700 (In reply to Tyler Wilcock from comment #6) > > + AXLOG(liveChild); > > + updateChildren(*liveChild); > > > > When we hit this condition, and then continue execution into the following > > for loop, what is preventing from generating the subtree rooted at liveChild > > twice in : > > > > for (size_t i = 0; i < newChildren.size(); ++i) { > > ... > > collectNodeChangesForSubtree(*newChildren[i]); > > ... > > } > Great catch! I've fixed this by adding a new `ResolveNodeChanges` parameter > to `updateChildren` so we don't resolve the node changes (which is the most > expensive part) in these sub / recursive calls, instead doing it only once > in the "main" updateChildren call. Couldn't we instead just return after the new loop since at that point we already processed the ChildrenChanged notification for the given target? I.e.: if (axAncestor != &axObject) { AXLOG(makeString("Original object with ID ", axObject.objectID().loggingString(), " wasn't in the isolated tree, so instead updating the closest in-isolated-tree ancestor:")); AXLOG(axAncestor); bool childUpdated = false; + for (auto& child : axObject.children()) { + auto* liveChild = dynamicDowncast<AccessibilityObject>(child.get()); + if (liveChild && !liveChild->childrenInitialized() && m_nodeMap.contains(liveChild->objectID())) { + AXLOG(makeString( + "Child ID ", liveChild->objectID().loggingString(), " of original object ID ", axObject.objectID().loggingString(), " was found in the isolated tree with uninitialized live children. Updating its isolated children." + )); + updateChildren(*liveChild); childUpdated = true; + } + } if (childUpdated) return; } In other words, if we update downstream, we may not need to update from upstream. Do we need to update the isolated object corresponding to liveChild? updateChildren only updates the children but not the target. If the new child is such that !m_nodeMap.contains(liveChild->objectID()), then we wouldn't update it. Do we need that check in the above if statement? 1877191 8 460401 tyler_w 2022-06-21 19:45:34 -0700 Created attachment 460401 Patch 1877364 9 tyler_w 2022-06-22 12:11:03 -0700 rdar://95344512 1877476 10 460434 tyler_w 2022-06-22 16:24:18 -0700 Created attachment 460434 Patch 1877582 11 460439 tyler_w 2022-06-22 22:53:05 -0700 Created attachment 460439 Patch 1877671 12 ews-feeder 2022-06-23 09:44:15 -0700 Committed r295779 (251784@main): <https://commits.webkit.org/251784@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460439. 1891204 13 461606 w07m 2022-08-14 00:00:43 -0700 Created attachment 461606 Shah117363?. 460323 2022-06-17 17:37:19 -0700 2022-06-21 13:06:56 -0700 Patch bug-241735-20220617173718.patch text/plain 3871 tyler_w RnJvbSA4MjBmOGM4Y2JhYmFmMmQxODkxMTAxNjY2ZTNiZTk2MjViZWM5OTM3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdW4gMjAyMiAxNzoyOTozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gc29tZXRpbWVzIGZhaWxzIHRvIHVwZGF0ZQog aXNvbGF0ZWQgc3VidHJlZXMgd2hlbiB0aGUgZ2l2ZW4gbGl2ZSBvYmplY3QgaXMgaWdub3JlZAog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTczNQoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpPdXIgY3VycmVudCBhbGdvcml0aG0gaW4gQVhJc29sYXRlZFRy ZWU6OnVwZGF0ZUNoaWxkcmVuIGlzOgoKICAxLiBJZiB0aGUgb2JqZWN0IHdlIGdvdCBhbiBBWENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb24KICBmb3IgaXMgaW4gdGhlIGlzb2xhdGVkIHRyZWUs IHVwZGF0ZSBpdHMgaXNvbGF0ZWQgY2hpbGRyZW4KCiAgMi4gT3RoZXJ3aXNlLCBhc2NlbmQgdGhl IGFuY2VzdHJ5IHRvIHRoZSBuZWFyZXN0CiAgaW4taXNvbGF0ZWQgdHJlZSBhbmNlc3RvciwgYW5k IHVwZGF0ZSB0aGUgY2hpbGRyZW4gb2YgdGhhdAogIG9iamVjdAoKVGhpcyBpcyBub3QgYWx3YXlz IGFkZXF1YXRlIHdoZW4gdGhlIG9iamVjdCBwYXNzZWQgdG8gdXBkYXRlQ2hpbGRyZW4KaXMgaWdu b3JlZCwgYXMgaW4gc29tZSBjYXNlcyB0aGUgYW5jZXN0b3IgaGFzIG5vIGNoaWxkcmVuIGNoYW5n ZXMKYnV0IHRoZSBzdWJ0cmVlcyBvZiB0aGUgaWdub3JlZCBvYmplY3QgZG8uCgpUaGlzIHBhdGNo IGZpeGVzIHRoaXMgYnkgYWxzbyBjaGVja2luZyB0aGUgbGl2ZS1jaGlsZHJlbiBvZiB0aGUgaWdu b3JlZApvYmplY3QgZm9yIGFueSB0aGF0IGhhdmUgdW5pdGlhbGl6ZWQgY2hpbGRyZW4uIElmIHNv LCB3ZSBjYWxsCkFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbiBvbiB0aG9zZSB0b28uCgoq IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgooV2Vi Q29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6Y2hpbGRyZW5Jbml0aWFsaXplZCBjb25zdCk6Ck1v dmUgZnJvbSBwcml2YXRlIHRvIHB1YmxpYy4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CihXZWJDb3JlOjpBWElzb2xhdGVkVHJl ZTo6dXBkYXRlQ2hpbGRyZW4pOgotLS0KIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNj ZXNzaWJpbGl0eU9iamVjdC5oICAgfCAgMiArLQogLi4uL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCAgICB8IDEyICsrKysrKysrKystLQogMiBmaWxlcyBjaGFu Z2VkLCAxMSBpbnNlcnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmgKaW5kZXggOGExZWJlYTY0 YmI1Li44MzEyNDJiNDgyZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCkBAIC00OTcsNiArNDk3LDcgQEAgcHVibGljOgogICAg IHZvaWQgZGVjcmVtZW50KCkgb3ZlcnJpZGUgeyB9CiAKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRl Um9sZSgpIHsgfQorICAgIGJvb2wgY2hpbGRyZW5Jbml0aWFsaXplZCgpIGNvbnN0IHsgcmV0dXJu IG1fY2hpbGRyZW5Jbml0aWFsaXplZDsgfQogICAgIGNvbnN0IEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciYgY2hpbGRyZW4oYm9vbCB1cGRhdGVDaGlsZHJlbklmTmVlZGVkID0gdHJ1ZSkgb3Zl cnJpZGU7CiAgICAgdmlydHVhbCB2b2lkIGFkZENoaWxkcmVuKCkgeyB9CiAgICAgZW51bSBjbGFz cyBEZXNjZW5kSWZJZ25vcmVkIDogdWludDhfdCB7IE5vLCBZZXMgfTsKQEAgLTgyNyw3ICs4Mjgs NiBAQCBwcml2YXRlOgogI2VuZGlmCiAgICAgCiBwcm90ZWN0ZWQ6IC8vIEZJWE1FOiBNYWtlIHRo ZSBkYXRhIG1lbWJlcnMgcHJpdmF0ZS4KLSAgICBib29sIGNoaWxkcmVuSW5pdGlhbGl6ZWQoKSBj b25zdCB7IHJldHVybiBtX2NoaWxkcmVuSW5pdGlhbGl6ZWQ7IH0KICAgICBBY2Nlc3NpYmlsaXR5 Q2hpbGRyZW5WZWN0b3IgbV9jaGlsZHJlbjsKICAgICBtdXRhYmxlIGJvb2wgbV9jaGlsZHJlbklu aXRpYWxpemVkIHsgZmFsc2UgfTsKICAgICBBY2Nlc3NpYmlsaXR5Um9sZSBtX3JvbGUgeyBBY2Nl c3NpYmlsaXR5Um9sZTo6VW5rbm93biB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDY4 Njk3NDhhZjZmNS4uMGQ3ODQ1ZTkxNzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCkBAIC01 MjEsMTIgKzUyMSwyMCBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENv cmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0jaWZuZGVmIE5E RUJVRwogICAgIGlmIChheEFuY2VzdG9yICE9ICZheE9iamVjdCkgewogICAgICAgICBBWExPRyht YWtlU3RyaW5nKCJPcmlnaW5hbCBvYmplY3Qgd2l0aCBJRCAiLCBheE9iamVjdC5vYmplY3RJRCgp LmxvZ2dpbmdTdHJpbmcoKSwgIiB3YXNuJ3QgaW4gdGhlIGlzb2xhdGVkIHRyZWUsIHNvIGluc3Rl YWQgdXBkYXRpbmcgdGhlIGNsb3Nlc3QgaW4taXNvbGF0ZWQtdHJlZSBhbmNlc3RvcjoiKSk7CiAg ICAgICAgIEFYTE9HKGF4QW5jZXN0b3IpOworICAgICAgICBmb3IgKGF1dG8mIGNoaWxkIDogYXhP YmplY3QuY2hpbGRyZW4oKSkgeworICAgICAgICAgICAgYXV0byogbGl2ZUNoaWxkID0gZHluYW1p Y0Rvd25jYXN0PEFjY2Vzc2liaWxpdHlPYmplY3Q+KGNoaWxkLmdldCgpKTsKKyAgICAgICAgICAg IGlmIChsaXZlQ2hpbGQgJiYgIWxpdmVDaGlsZC0+Y2hpbGRyZW5Jbml0aWFsaXplZCgpICYmIG1f bm9kZU1hcC5jb250YWlucyhsaXZlQ2hpbGQtPm9iamVjdElEKCkpKSB7CisgICAgICAgICAgICAg ICAgQVhMT0cobWFrZVN0cmluZygKKyAgICAgICAgICAgICAgICAgICAgIkNoaWxkIElEICIsIGxp dmVDaGlsZC0+b2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgb2Ygb3JpZ2luYWwgb2JqZWN0 IElEICIsIGF4T2JqZWN0Lm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAiIHdhcyBmb3VuZCBp biB0aGUgaXNvbGF0ZWQgdHJlZSB3aXRoIHVuaW5pdGlhbGl6ZWQgbGl2ZSBjaGlsZHJlbi4gVXBk YXRpbmcgaXRzIGlzb2xhdGVkIGNoaWxkcmVuLiIKKyAgICAgICAgICAgICAgICApKTsKKyAgICAg ICAgICAgICAgICBBWExPRyhsaXZlQ2hpbGQpOworICAgICAgICAgICAgICAgIHVwZGF0ZUNoaWxk cmVuKCpsaXZlQ2hpbGQpOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQotI2VuZGlm CiAKICAgICBhdXRvIG9sZElEcyA9IG1fbm9kZU1hcC5nZXQoYXhBbmNlc3Rvci0+b2JqZWN0SUQo KSk7CiAgICAgYXV0byYgb2xkQ2hpbGRyZW5JRHMgPSBvbGRJRHMuY2hpbGRyZW5JRHM7Cg== 460379 2022-06-21 13:06:59 -0700 2022-06-21 19:45:32 -0700 Patch bug-241735-20220621130658.patch text/plain 5990 tyler_w RnJvbSA1NmFhOTI4YzE0MjhhNTZkNzk2N2RlNDUzODVlNWE3ZmUzYjNlMGQ5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdW4gMjAyMiAxNzoyOTozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gc29tZXRpbWVzIGZhaWxzIHRvIHVwZGF0ZQog aXNvbGF0ZWQgc3VidHJlZXMgd2hlbiB0aGUgZ2l2ZW4gbGl2ZSBvYmplY3QgaXMgaWdub3JlZAog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTczNQoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpPdXIgY3VycmVudCBhbGdvcml0aG0gaW4gQVhJc29sYXRlZFRy ZWU6OnVwZGF0ZUNoaWxkcmVuIGlzOgoKICAxLiBJZiB0aGUgb2JqZWN0IHdlIGdvdCBhbiBBWENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb24KICBmb3IgaXMgaW4gdGhlIGlzb2xhdGVkIHRyZWUs IHVwZGF0ZSBpdHMgaXNvbGF0ZWQgY2hpbGRyZW4KCiAgMi4gT3RoZXJ3aXNlLCBhc2NlbmQgdGhl IGFuY2VzdHJ5IHRvIHRoZSBuZWFyZXN0CiAgaW4taXNvbGF0ZWQtdHJlZSBhbmNlc3RvciwgYW5k IHVwZGF0ZSB0aGUgY2hpbGRyZW4gb2YgdGhhdAogIG9iamVjdAoKVGhpcyBpcyBub3QgYWx3YXlz IGFkZXF1YXRlIHdoZW4gdGhlIG9iamVjdCBwYXNzZWQgdG8gdXBkYXRlQ2hpbGRyZW4KaXMgaWdu b3JlZCwgYXMgaW4gc29tZSBjYXNlcyB0aGUgYW5jZXN0b3IgaGFzIG5vIGNoaWxkcmVuIGNoYW5n ZXMKYnV0IHRoZSBzdWJ0cmVlcyBvZiB0aGUgaWdub3JlZCBvYmplY3QgZG8uCgpUaGlzIHBhdGNo IGZpeGVzIHRoaXMgYnkgYWxzbyBjaGVja2luZyB0aGUgbGl2ZS1jaGlsZHJlbiBvZiB0aGUgaWdu b3JlZApvYmplY3QgZm9yIGFueSB0aGF0IGhhdmUgdW5pdGlhbGl6ZWQgY2hpbGRyZW4uIElmIHNv LCB3ZSBjYWxsCkFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbiBvbiB0aG9zZSB0b28uCgoq IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgooV2Vi Q29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6Y2hpbGRyZW5Jbml0aWFsaXplZCBjb25zdCk6Ck1v dmUgZnJvbSBwcml2YXRlIHRvIHB1YmxpYy4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CihXZWJDb3JlOjpBWElzb2xhdGVkVHJl ZTo6dXBkYXRlQ2hpbGRyZW4pOgotLS0KIC4uLi9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaCAgICAgICB8ICAyICstCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cCAgICAgICAgICAgfCAyMiArKysrKysrKysrKysrKystLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmggICAgICAgICAgICAgfCAgMyArKy0KIDMgZmlsZXMgY2hhbmdlZCwgMjEg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCmluZGV4IDhhMWViZWE2NGJiNS4uODMx MjQyYjQ4MmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaApAQCAtNDk3LDYgKzQ5Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRl Y3JlbWVudCgpIG92ZXJyaWRlIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVJvbGUoKSB7 IH0KKyAgICBib29sIGNoaWxkcmVuSW5pdGlhbGl6ZWQoKSBjb25zdCB7IHJldHVybiBtX2NoaWxk cmVuSW5pdGlhbGl6ZWQ7IH0KICAgICBjb25zdCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Im IGNoaWxkcmVuKGJvb2wgdXBkYXRlQ2hpbGRyZW5JZk5lZWRlZCA9IHRydWUpIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCBhZGRDaGlsZHJlbigpIHsgfQogICAgIGVudW0gY2xhc3MgRGVzY2Vu ZElmSWdub3JlZCA6IHVpbnQ4X3QgeyBObywgWWVzIH07CkBAIC04MjcsNyArODI4LDYgQEAgcHJp dmF0ZToKICNlbmRpZgogICAgIAogcHJvdGVjdGVkOiAvLyBGSVhNRTogTWFrZSB0aGUgZGF0YSBt ZW1iZXJzIHByaXZhdGUuCi0gICAgYm9vbCBjaGlsZHJlbkluaXRpYWxpemVkKCkgY29uc3QgeyBy ZXR1cm4gbV9jaGlsZHJlbkluaXRpYWxpemVkOyB9CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVu VmVjdG9yIG1fY2hpbGRyZW47CiAgICAgbXV0YWJsZSBib29sIG1fY2hpbGRyZW5Jbml0aWFsaXpl ZCB7IGZhbHNlIH07CiAgICAgQWNjZXNzaWJpbGl0eVJvbGUgbV9yb2xlIHsgQWNjZXNzaWJpbGl0 eVJvbGU6OlVua25vd24gfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAyMjY2MmU5MzE4 ZWYuLjE4MDk2MDVlOTU2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAtNTAzLDcgKzUw Myw3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZVJlbGF0ZWRQcm9wZXJ0aWVzKEFYQ29y ZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIHVwZGF0ZU5vZGVQcm9wZXJ0eSgqdHJlZUFuY2Vz dG9yLCBBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dzKTsKIH0KIAotdm9pZCBBWElzb2xhdGVk VHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKK3ZvaWQgQVhJc29s YXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIFJlc29sdmVO b2RlQ2hhbmdlcyByZXNvbHZlTm9kZUNoYW5nZXMpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRl ZFRyZWU6OnVwZGF0ZUNoaWxkcmVuIl9zKTsKICAgICBBWExPRygiRm9yIEFYT2JqZWN0OiIpOwpA QCAtNTM0LDEyICs1MzQsMjIgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4o QVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotI2lmbmRl ZiBOREVCVUcKICAgICBpZiAoYXhBbmNlc3RvciAhPSAmYXhPYmplY3QpIHsKICAgICAgICAgQVhM T0cobWFrZVN0cmluZygiT3JpZ2luYWwgb2JqZWN0IHdpdGggSUQgIiwgYXhPYmplY3Qub2JqZWN0 SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgd2Fzbid0IGluIHRoZSBpc29sYXRlZCB0cmVlLCBzbyBp bnN0ZWFkIHVwZGF0aW5nIHRoZSBjbG9zZXN0IGluLWlzb2xhdGVkLXRyZWUgYW5jZXN0b3I6Iikp OwogICAgICAgICBBWExPRyhheEFuY2VzdG9yKTsKKyAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6 IGF4T2JqZWN0LmNoaWxkcmVuKCkpIHsKKyAgICAgICAgICAgIGF1dG8qIGxpdmVDaGlsZCA9IGR5 bmFtaWNEb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0PihjaGlsZC5nZXQoKSk7CisgICAgICAg ICAgICBpZiAobGl2ZUNoaWxkICYmICFsaXZlQ2hpbGQtPmNoaWxkcmVuSW5pdGlhbGl6ZWQoKSAm JiBtX25vZGVNYXAuY29udGFpbnMobGl2ZUNoaWxkLT5vYmplY3RJRCgpKSkgeworICAgICAgICAg ICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoCisgICAgICAgICAgICAgICAgICAgICJDaGlsZCBJRCAi LCBsaXZlQ2hpbGQtPm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAiIG9mIG9yaWdpbmFsIG9i amVjdCBJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwgIiB3YXMgZm91 bmQgaW4gdGhlIGlzb2xhdGVkIHRyZWUgd2l0aCB1bmluaXRpYWxpemVkIGxpdmUgY2hpbGRyZW4u IFVwZGF0aW5nIGl0cyBpc29sYXRlZCBjaGlsZHJlbi4iCisgICAgICAgICAgICAgICAgKSk7Cisg ICAgICAgICAgICAgICAgLy8gRG9uJ3QgaW1tZWRpYXRlbHkgcmVzb2x2ZSBub2RlIGNoYW5nZXMg aW4gdGhlc2UgcmVjdXJzaXZlIGNhbGxzIHRvIHVwZGF0ZUNoaWxkcmVuLiBUaGlzIGF2b2lkcyBk dXBsaWNhdGUgbm9kZSBjaGFuZ2UgY3JlYXRpb24gaW4gdGhpcyBzY2VuYXJpbzoKKyAgICAgICAg ICAgICAgICAvLyAgIDEuIFNvbWUgc3VidHJlZSBpcyB1cGRhdGVkIGluIHRoZSBiZWxvdyBjYWxs IHRvIHVwZGF0ZUNoaWxkcmVuLgorICAgICAgICAgICAgICAgIC8vICAgMi4gTGF0ZXIgaW4gdGhp cyBmdW5jdGlvbiwgd2hlbiB1cGRhdGluZyBheEFuY2VzdG9yLCB3ZSB1cGRhdGUgc29tZSBoaWdo ZXIgc3VidHJlZSB0aGF0IGluY2x1ZGVzIHRoZSB1cGRhdGVkIHN1YnRyZWUgZnJvbSBzdGVwIDEu CisgICAgICAgICAgICAgICAgdXBkYXRlQ2hpbGRyZW4oKmxpdmVDaGlsZCwgUmVzb2x2ZU5vZGVD aGFuZ2VzOjpObyk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KICAgICB9Ci0jZW5kaWYKIAog ICAgIGF1dG8gb2xkSURzID0gbV9ub2RlTWFwLmdldChheEFuY2VzdG9yLT5vYmplY3RJRCgpKTsK ICAgICBhdXRvJiBvbGRDaGlsZHJlbklEcyA9IG9sZElEcy5jaGlsZHJlbklEczsKQEAgLTU3Myw3 ICs1ODMsMTEgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2Jq ZWN0JiBheE9iamVjdCkKICAgICAgICAgaWYgKGF4SUQuaXNWYWxpZCgpKQogICAgICAgICAgICAg cmVtb3ZlU3VidHJlZUZyb21Ob2RlTWFwKGF4SUQsIGF4QW5jZXN0b3IpOwogICAgIH0KLSAgICBx dWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENoYW5nZXMob2xkQ2hpbGRyZW5JRHMpOworCisgICAg aWYgKHJlc29sdmVOb2RlQ2hhbmdlcyA9PSBSZXNvbHZlTm9kZUNoYW5nZXM6OlllcykKKyAgICAg ICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRDaGFuZ2VzKG9sZENoaWxkcmVuSURzKTsKKyAg ICBlbHNlCisgICAgICAgIHF1ZXVlUmVtb3ZhbHMob2xkQ2hpbGRyZW5JRHMpOwogCiAgICAgLy8g QWxzbyBxdWV1ZSB1cGRhdGVzIGZvciBwcm9wZXJ0aWVzIHRoYXQgZGVyaXZlIGZyb20gY2hpbGRy ZW4oKS4KICAgICB1cGRhdGVSZWxhdGVkUHJvcGVydGllcygqYXhBbmNlc3Rvcik7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVk VHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuaAppbmRleCAyNDk3YjUyZmI3M2MuLjYwYzFjNTFlNzczOSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xh dGVkVHJlZS5oCkBAIC0zNDYsNyArMzQ2LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBnZW5lcmF0 ZVN1YnRyZWUoQVhDb3JlT2JqZWN0Jik7CiAgICAgdm9pZCB1cGRhdGVOb2RlKEFYQ29yZU9iamVj dCYpOwotICAgIHZvaWQgdXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0Jik7CisgICAgZW51bSBj bGFzcyBSZXNvbHZlTm9kZUNoYW5nZXMgOiBib29sIHsgTm8sIFllcyB9OworICAgIHZvaWQgdXBk YXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiwgUmVzb2x2ZU5vZGVDaGFuZ2VzID0gUmVzb2x2ZU5v ZGVDaGFuZ2VzOjpZZXMpOwogICAgIHZvaWQgdXBkYXRlTm9kZVByb3BlcnR5KEFYQ29yZU9iamVj dCYsIEFYUHJvcGVydHlOYW1lKTsKICAgICB2b2lkIHVwZGF0ZVJlbGF0ZWRQcm9wZXJ0aWVzKEFY Q29yZU9iamVjdCYpOwogICAgIHZvaWQgdXBkYXRlVGFibGVQcm9wZXJ0aWVzKEFYQ29yZU9iamVj dCYpOwo= 460401 2022-06-21 19:45:34 -0700 2022-06-22 16:24:17 -0700 Patch bug-241735-20220621194533.patch text/plain 7763 tyler_w RnJvbSA5MDU4YmM0OTFlZmE0M2EzMjA1NjZhMjRhYTcyYjFlZDI0Njk0NWNhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdW4gMjAyMiAxNzoyOTozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gc29tZXRpbWVzIGZhaWxzIHRvIHVwZGF0ZQog aXNvbGF0ZWQgc3VidHJlZXMgd2hlbiB0aGUgZ2l2ZW4gbGl2ZSBvYmplY3QgaXMgaWdub3JlZAog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTczNQoKUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgpPdXIgY3VycmVudCBhbGdvcml0aG0gaW4gQVhJc29sYXRlZFRy ZWU6OnVwZGF0ZUNoaWxkcmVuIGlzOgoKICAxLiBJZiB0aGUgb2JqZWN0IHdlIGdvdCBhbiBBWENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb24KICBmb3IgaXMgaW4gdGhlIGlzb2xhdGVkIHRyZWUs IHVwZGF0ZSBpdHMgaXNvbGF0ZWQgY2hpbGRyZW4KCiAgMi4gT3RoZXJ3aXNlLCBhc2NlbmQgdGhl IGFuY2VzdHJ5IHRvIHRoZSBuZWFyZXN0CiAgaW4taXNvbGF0ZWQtdHJlZSBhbmNlc3RvciwgYW5k IHVwZGF0ZSB0aGUgY2hpbGRyZW4gb2YgdGhhdAogIG9iamVjdAoKVGhpcyBpcyBub3QgYWx3YXlz IGFkZXF1YXRlIHdoZW4gdGhlIG9iamVjdCBwYXNzZWQgdG8gdXBkYXRlQ2hpbGRyZW4KaXMgaWdu b3JlZCwgYXMgaW4gc29tZSBjYXNlcyB0aGUgYW5jZXN0b3IgaGFzIG5vIGNoaWxkcmVuIGNoYW5n ZXMKYnV0IHRoZSBzdWJ0cmVlcyBvZiB0aGUgaWdub3JlZCBvYmplY3QgZG8uCgpUaGlzIHBhdGNo IGZpeGVzIHRoaXMgYnkgYWxzbyBjaGVja2luZyB0aGUgbGl2ZS1jaGlsZHJlbiBvZiB0aGUgaWdu b3JlZApvYmplY3QgZm9yIGFueSB0aGF0IGhhdmUgdW5pdGlhbGl6ZWQgY2hpbGRyZW4uIElmIHNv LCB3ZSBjYWxsCkFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbiBvbiB0aG9zZSB0b28uCgoq IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oOgooV2Vi Q29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6Y2hpbGRyZW5Jbml0aWFsaXplZCBjb25zdCk6Ck1v dmUgZnJvbSBwcml2YXRlIHRvIHB1YmxpYy4KKiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHA6CihXZWJDb3JlOjpBWElzb2xhdGVkVHJl ZTo6dXBkYXRlQ2hpbGRyZW4pOgotLS0KIC4uLi9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlP YmplY3QuaCAgICAgICB8ICAyICstCiAuLi4vaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNw cCAgICAgICAgICAgfCA1MCArKysrKysrKysrKysrKy0tLS0tCiAuLi4vaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmggICAgICAgICAgICAgfCAgMyArLQogMyBmaWxlcyBjaGFuZ2VkLCA0MSBp bnNlcnRpb25zKCspLCAxNCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU9iamVjdC5oCmluZGV4IDhhMWViZWE2NGJiNS4uODMx MjQyYjQ4MmZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlPYmplY3QuaApAQCAtNDk3LDYgKzQ5Nyw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRl Y3JlbWVudCgpIG92ZXJyaWRlIHsgfQogCiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZVJvbGUoKSB7 IH0KKyAgICBib29sIGNoaWxkcmVuSW5pdGlhbGl6ZWQoKSBjb25zdCB7IHJldHVybiBtX2NoaWxk cmVuSW5pdGlhbGl6ZWQ7IH0KICAgICBjb25zdCBBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Im IGNoaWxkcmVuKGJvb2wgdXBkYXRlQ2hpbGRyZW5JZk5lZWRlZCA9IHRydWUpIG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgdm9pZCBhZGRDaGlsZHJlbigpIHsgfQogICAgIGVudW0gY2xhc3MgRGVzY2Vu ZElmSWdub3JlZCA6IHVpbnQ4X3QgeyBObywgWWVzIH07CkBAIC04MjcsNyArODI4LDYgQEAgcHJp dmF0ZToKICNlbmRpZgogICAgIAogcHJvdGVjdGVkOiAvLyBGSVhNRTogTWFrZSB0aGUgZGF0YSBt ZW1iZXJzIHByaXZhdGUuCi0gICAgYm9vbCBjaGlsZHJlbkluaXRpYWxpemVkKCkgY29uc3QgeyBy ZXR1cm4gbV9jaGlsZHJlbkluaXRpYWxpemVkOyB9CiAgICAgQWNjZXNzaWJpbGl0eUNoaWxkcmVu VmVjdG9yIG1fY2hpbGRyZW47CiAgICAgbXV0YWJsZSBib29sIG1fY2hpbGRyZW5Jbml0aWFsaXpl ZCB7IGZhbHNlIH07CiAgICAgQWNjZXNzaWJpbGl0eVJvbGUgbV9yb2xlIHsgQWNjZXNzaWJpbGl0 eVJvbGU6OlVua25vd24gfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAppbmRleCAyMjY2MmU5MzE4 ZWYuLmJhMjljNmE5ODAyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcApAQCAtMjA5LDE5ICsy MDksMTkgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6Z2VuZXJhdGVTdWJ0cmVlKEFYQ29yZU9iamVj dCYgYXhPYmplY3QpCiAgICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRDaGFuZ2VzKHsgfSk7 CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZENyZWF0ZU5vZGVDaGFuZ2UoQVhDb3JlT2JqZWN0JiBh eE9iamVjdCkKK3sKKyAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFuIGlzb2xhdGVkIG9i amVjdCBmcm9tIGFuIGlnbm9yZWQgb2JqZWN0IG9yIG9uZSB3aXRoIGFuIGludmFsaWQgSUQuCisg ICAgcmV0dXJuICFheE9iamVjdC5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgJiYgYXhPYmplY3Qu b2JqZWN0SUQoKS5pc1ZhbGlkKCk7Cit9CisKIHN0ZDo6b3B0aW9uYWw8QVhJc29sYXRlZFRyZWU6 Ok5vZGVDaGFuZ2U+IEFYSXNvbGF0ZWRUcmVlOjpub2RlQ2hhbmdlRm9yT2JqZWN0KEFYQ29yZU9i amVjdCYgYXhPYmplY3QsIEF0dGFjaFdyYXBwZXIgYXR0YWNoV3JhcHBlcikKIHsKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOworICAgIEFTU0VSVChheE9iamVjdC5vYmplY3RJRCgpLmlzVmFs aWQoKSk7CiAKLSAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFuIGlzb2xhdGVkIG9iamVj dCBmcm9tIGFuIGlnbm9yZWQgb2JqZWN0LgotICAgIGlmIChheE9iamVjdC5hY2Nlc3NpYmlsaXR5 SXNJZ25vcmVkKCkpCi0gICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0KLSAgICBpZiAoIWF4 T2JqZWN0Lm9iamVjdElEKCkuaXNWYWxpZCgpKSB7Ci0gICAgICAgIC8vIEVpdGhlciB0aGUgYXhP YmplY3QgaGFzIGFuIGludmFsaWQgSUQgb3Igc29tZXRoaW5nIGVsc2Ugd2VudCB0ZXJyaWJseSB3 cm9uZy4gRG9uJ3QgYm90aGVyIGRvaW5nIGFueXRoaW5nIGVsc2UuCi0gICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworICAgIGlmICghc2hvdWxkQ3JlYXRlTm9kZUNoYW5nZShheE9iamVjdCkp CiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0gICAgfQogCiAgICAgYXV0byBvYmplY3Qg PSBBWElzb2xhdGVkT2JqZWN0OjpjcmVhdGUoYXhPYmplY3QsIHRoaXMpOwogICAgIE5vZGVDaGFu Z2Ugbm9kZUNoYW5nZSB7IG9iamVjdCwgbnVsbHB0ciB9OwpAQCAtNTAzLDcgKzUwMyw3IEBAIHZv aWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZVJlbGF0ZWRQcm9wZXJ0aWVzKEFYQ29yZU9iamVjdCYg YXhPYmplY3QpCiAgICAgICAgIHVwZGF0ZU5vZGVQcm9wZXJ0eSgqdHJlZUFuY2VzdG9yLCBBWFBy b3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dzKTsKIH0KIAotdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBk YXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKK3ZvaWQgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QsIFJlc29sdmVOb2RlQ2hhbmdl cyByZXNvbHZlTm9kZUNoYW5nZXMpCiB7CiAgICAgQVhUUkFDRSgiQVhJc29sYXRlZFRyZWU6OnVw ZGF0ZUNoaWxkcmVuIl9zKTsKICAgICBBWExPRygiRm9yIEFYT2JqZWN0OiIpOwpAQCAtNTM0LDEy ICs1MzQsMzQgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2Jq ZWN0JiBheE9iamVjdCkKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotI2lmbmRlZiBOREVCVUcK ICAgICBpZiAoYXhBbmNlc3RvciAhPSAmYXhPYmplY3QpIHsKICAgICAgICAgQVhMT0cobWFrZVN0 cmluZygiT3JpZ2luYWwgb2JqZWN0IHdpdGggSUQgIiwgYXhPYmplY3Qub2JqZWN0SUQoKS5sb2dn aW5nU3RyaW5nKCksICIgd2Fzbid0IGluIHRoZSBpc29sYXRlZCB0cmVlLCBzbyBpbnN0ZWFkIHVw ZGF0aW5nIHRoZSBjbG9zZXN0IGluLWlzb2xhdGVkLXRyZWUgYW5jZXN0b3I6IikpOwogICAgICAg ICBBWExPRyhheEFuY2VzdG9yKTsKKyAgICAgICAgZm9yIChhdXRvJiBjaGlsZCA6IGF4T2JqZWN0 LmNoaWxkcmVuKCkpIHsKKyAgICAgICAgICAgIGF1dG8qIGxpdmVDaGlsZCA9IGR5bmFtaWNEb3du Y2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0PihjaGlsZC5nZXQoKSk7CisgICAgICAgICAgICBpZiAo IWxpdmVDaGlsZCB8fCBsaXZlQ2hpbGQtPmNoaWxkcmVuSW5pdGlhbGl6ZWQoKSkKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgaWYgKCFtX25vZGVNYXAuY29udGFpbnMo bGl2ZUNoaWxkLT5vYmplY3RJRCgpKSkgeworICAgICAgICAgICAgICAgIGlmICghc2hvdWxkQ3Jl YXRlTm9kZUNoYW5nZSgqbGl2ZUNoaWxkKSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7 CisKKyAgICAgICAgICAgICAgICAvLyBUaGlzIGNoaWxkIHNob3VsZCBiZSBhZGRlZCB0byB0aGUg aXNvbGF0ZWQgdHJlZSBidXQgaGFzbid0IGJlZW4geWV0LgorICAgICAgICAgICAgICAgIC8vIEFk ZCBpdCB0byB0aGUgbm9kZW1hcCBzbyB0aGUgcmVjdXJzaXZlIGNhbGwgdG8gdXBkYXRlQ2hpbGRy ZW4gYmVsb3cgcHJvcGVybHkgYnVpbGRzIHRoZSBzdWJ0cmVlIGZvciB0aGlzIG9iamVjdC4KKyAg ICAgICAgICAgICAgICBhdXRvKiBwYXJlbnQgPSBsaXZlQ2hpbGQtPnBhcmVudE9iamVjdFVuaWdu b3JlZCgpOworICAgICAgICAgICAgICAgIG1fbm9kZU1hcC5zZXQobGl2ZUNoaWxkLT5vYmplY3RJ RCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IHBhcmVudCA/IHBhcmVudC0+b2JqZWN0SUQoKSA6IEFY SUQoKSwgbGl2ZUNoaWxkLT5jaGlsZHJlbklEcygpIH0pOworICAgICAgICAgICAgICAgIG1fdW5y ZXNvbHZlZFBlbmRpbmdBcHBlbmRzLnNldChsaXZlQ2hpbGQtPm9iamVjdElEKCksIEF0dGFjaFdy YXBwZXI6Ok9uTWFpblRocmVhZCk7CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIEFYTE9H KG1ha2VTdHJpbmcoCisgICAgICAgICAgICAgICAgIkNoaWxkIElEICIsIGxpdmVDaGlsZC0+b2Jq ZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgb2Ygb3JpZ2luYWwgb2JqZWN0IElEICIsIGF4T2Jq ZWN0Lm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAiIHdhcyBmb3VuZCBpbiB0aGUgaXNvbGF0 ZWQgdHJlZSB3aXRoIHVuaW5pdGlhbGl6ZWQgbGl2ZSBjaGlsZHJlbi4gVXBkYXRpbmcgaXRzIGlz b2xhdGVkIGNoaWxkcmVuLiIKKyAgICAgICAgICAgICkpOworICAgICAgICAgICAgLy8gRG9uJ3Qg aW1tZWRpYXRlbHkgcmVzb2x2ZSBub2RlIGNoYW5nZXMgaW4gdGhlc2UgcmVjdXJzaXZlIGNhbGxz IHRvIHVwZGF0ZUNoaWxkcmVuLiBUaGlzIGF2b2lkcyBkdXBsaWNhdGUgbm9kZSBjaGFuZ2UgY3Jl YXRpb24gaW4gdGhpcyBzY2VuYXJpbzoKKyAgICAgICAgICAgIC8vICAgMS4gU29tZSBzdWJ0cmVl IGlzIHVwZGF0ZWQgaW4gdGhlIGJlbG93IGNhbGwgdG8gdXBkYXRlQ2hpbGRyZW4uCisgICAgICAg ICAgICAvLyAgIDIuIExhdGVyIGluIHRoaXMgZnVuY3Rpb24sIHdoZW4gdXBkYXRpbmcgYXhBbmNl c3Rvciwgd2UgdXBkYXRlIHNvbWUgaGlnaGVyIHN1YnRyZWUgdGhhdCBpbmNsdWRlcyB0aGUgdXBk YXRlZCBzdWJ0cmVlIGZyb20gc3RlcCAxLgorICAgICAgICAgICAgdXBkYXRlQ2hpbGRyZW4oKmxp dmVDaGlsZCwgUmVzb2x2ZU5vZGVDaGFuZ2VzOjpObyk7CisgICAgICAgIH0KICAgICB9Ci0jZW5k aWYKIAogICAgIGF1dG8gb2xkSURzID0gbV9ub2RlTWFwLmdldChheEFuY2VzdG9yLT5vYmplY3RJ RCgpKTsKICAgICBhdXRvJiBvbGRDaGlsZHJlbklEcyA9IG9sZElEcy5jaGlsZHJlbklEczsKQEAg LTU3Myw3ICs1OTUsMTEgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhD b3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgaWYgKGF4SUQuaXNWYWxpZCgpKQogICAgICAg ICAgICAgcmVtb3ZlU3VidHJlZUZyb21Ob2RlTWFwKGF4SUQsIGF4QW5jZXN0b3IpOwogICAgIH0K LSAgICBxdWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENoYW5nZXMob2xkQ2hpbGRyZW5JRHMpOwor CisgICAgaWYgKHJlc29sdmVOb2RlQ2hhbmdlcyA9PSBSZXNvbHZlTm9kZUNoYW5nZXM6OlllcykK KyAgICAgICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRDaGFuZ2VzKG9sZENoaWxkcmVuSURz KTsKKyAgICBlbHNlCisgICAgICAgIHF1ZXVlUmVtb3ZhbHMob2xkQ2hpbGRyZW5JRHMpOwogCiAg ICAgLy8gQWxzbyBxdWV1ZSB1cGRhdGVzIGZvciBwcm9wZXJ0aWVzIHRoYXQgZGVyaXZlIGZyb20g Y2hpbGRyZW4oKS4KICAgICB1cGRhdGVSZWxhdGVkUHJvcGVydGllcygqYXhBbmNlc3Rvcik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZFRyZWUuaAppbmRleCAyNDk3YjUyZmI3M2MuLjYwYzFjNTFlNzczOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRl ZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oCkBAIC0zNDYsNyArMzQ2LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBn ZW5lcmF0ZVN1YnRyZWUoQVhDb3JlT2JqZWN0Jik7CiAgICAgdm9pZCB1cGRhdGVOb2RlKEFYQ29y ZU9iamVjdCYpOwotICAgIHZvaWQgdXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0Jik7CisgICAg ZW51bSBjbGFzcyBSZXNvbHZlTm9kZUNoYW5nZXMgOiBib29sIHsgTm8sIFllcyB9OworICAgIHZv aWQgdXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiwgUmVzb2x2ZU5vZGVDaGFuZ2VzID0gUmVz b2x2ZU5vZGVDaGFuZ2VzOjpZZXMpOwogICAgIHZvaWQgdXBkYXRlTm9kZVByb3BlcnR5KEFYQ29y ZU9iamVjdCYsIEFYUHJvcGVydHlOYW1lKTsKICAgICB2b2lkIHVwZGF0ZVJlbGF0ZWRQcm9wZXJ0 aWVzKEFYQ29yZU9iamVjdCYpOwogICAgIHZvaWQgdXBkYXRlVGFibGVQcm9wZXJ0aWVzKEFYQ29y ZU9iamVjdCYpOwo= 460434 2022-06-22 16:24:18 -0700 2022-06-23 00:07:41 -0700 Patch bug-241735-20220622162418.patch text/plain 7787 tyler_w RnJvbSAzYzVjNDFjMjg1NGVhMWJiODE5MzFlMmZmN2I4MDk2OGJhYjE2NmU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdW4gMjAyMiAxNzoyOTozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gc29tZXRpbWVzIGZhaWxzIHRvIHVwZGF0ZQog aXNvbGF0ZWQgc3VidHJlZXMgd2hlbiB0aGUgZ2l2ZW4gbGl2ZSBvYmplY3QgaXMgaWdub3JlZAog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTczNQoKUmV2aWV3ZWQg YnkgQW5kcmVzIEdvbnphbGV6LgoKT3VyIGN1cnJlbnQgYWxnb3JpdGhtIGluIEFYSXNvbGF0ZWRU cmVlOjp1cGRhdGVDaGlsZHJlbiBpczoKCiAgMS4gSWYgdGhlIG9iamVjdCB3ZSBnb3QgYW4gQVhD aGlsZHJlbkNoYW5nZWQgbm90aWZpY2F0aW9uCiAgZm9yIGlzIGluIHRoZSBpc29sYXRlZCB0cmVl LCB1cGRhdGUgaXRzIGlzb2xhdGVkIGNoaWxkcmVuCgogIDIuIE90aGVyd2lzZSwgYXNjZW5kIHRo ZSBhbmNlc3RyeSB0byB0aGUgbmVhcmVzdAogIGluLWlzb2xhdGVkLXRyZWUgYW5jZXN0b3IsIGFu ZCB1cGRhdGUgdGhlIGNoaWxkcmVuIG9mIHRoYXQKICBvYmplY3QKClRoaXMgaXMgbm90IGFsd2F5 cyBhZGVxdWF0ZSB3aGVuIHRoZSBvYmplY3QgcGFzc2VkIHRvIHVwZGF0ZUNoaWxkcmVuCmlzIGln bm9yZWQsIGFzIGluIHNvbWUgY2FzZXMgdGhlIGFuY2VzdG9yIGhhcyBubyBjaGlsZHJlbiBjaGFu Z2VzCmJ1dCB0aGUgc3VidHJlZXMgb2YgdGhlIGlnbm9yZWQgb2JqZWN0IGRvLgoKVGhpcyBwYXRj aCBmaXhlcyB0aGlzIGJ5IGFsc28gY2hlY2tpbmcgdGhlIGxpdmUtY2hpbGRyZW4gb2YgdGhlIGln bm9yZWQKb2JqZWN0IGZvciBhbnkgdGhhdCBoYXZlIHVuaXRpYWxpemVkIGNoaWxkcmVuLiBJZiBz bywgd2UgY2FsbApBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gb24gdGhvc2UgdG9vLgoK KiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNoaWxkcmVuSW5pdGlhbGl6ZWQgY29uc3QpOgpN b3ZlIGZyb20gcHJpdmF0ZSB0byBwdWJsaWMuCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgooV2ViQ29yZTo6QVhJc29sYXRlZFRy ZWU6OnVwZGF0ZUNoaWxkcmVuKToKLS0tCiAuLi4vYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0LmggICAgICAgfCAgMiArLQogLi4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHAgICAgICAgICAgIHwgNTAgKysrKysrKysrKysrKystLS0tLQogLi4uL2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oICAgICAgICAgICAgIHwgIDMgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNDEg aW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA4YTFlYmVhNjRiYjUuLjgz MTI0MmI0ODJmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKQEAgLTQ5Nyw2ICs0OTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBk ZWNyZW1lbnQoKSBvdmVycmlkZSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVSb2xlKCkg eyB9CisgICAgYm9vbCBjaGlsZHJlbkluaXRpYWxpemVkKCkgY29uc3QgeyByZXR1cm4gbV9jaGls ZHJlbkluaXRpYWxpemVkOyB9CiAgICAgY29uc3QgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9y JiBjaGlsZHJlbihib29sIHVwZGF0ZUNoaWxkcmVuSWZOZWVkZWQgPSB0cnVlKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRyZW4oKSB7IH0KICAgICBlbnVtIGNsYXNzIERlc2Nl bmRJZklnbm9yZWQgOiB1aW50OF90IHsgTm8sIFllcyB9OwpAQCAtODI3LDcgKzgyOCw2IEBAIHBy aXZhdGU6CiAjZW5kaWYKICAgICAKIHByb3RlY3RlZDogLy8gRklYTUU6IE1ha2UgdGhlIGRhdGEg bWVtYmVycyBwcml2YXRlLgotICAgIGJvb2wgY2hpbGRyZW5Jbml0aWFsaXplZCgpIGNvbnN0IHsg cmV0dXJuIG1fY2hpbGRyZW5Jbml0aWFsaXplZDsgfQogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBtX2NoaWxkcmVuOwogICAgIG11dGFibGUgYm9vbCBtX2NoaWxkcmVuSW5pdGlhbGl6 ZWQgeyBmYWxzZSB9OwogICAgIEFjY2Vzc2liaWxpdHlSb2xlIG1fcm9sZSB7IEFjY2Vzc2liaWxp dHlSb2xlOjpVbmtub3duIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKaW5kZXggMjdmZDg5ZmM5 OGYzLi44NjMzYjJlOTY4OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTIwOSwyMCAr MjA5LDIwIEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmdlbmVyYXRlU3VidHJlZShBWENvcmVPYmpl Y3QmIGF4T2JqZWN0KQogICAgIHF1ZXVlUmVtb3ZhbHNBbmRVbnJlc29sdmVkQ2hhbmdlcyh7IH0p OwogfQogCitzdGF0aWMgYm9vbCBzaG91bGRDcmVhdGVOb2RlQ2hhbmdlKEFYQ29yZU9iamVjdCYg YXhPYmplY3QpCit7CisgICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGNyZWF0ZSBhbiBpc29sYXRlZCBv YmplY3QgZnJvbSBhbiBpZ25vcmVkIG9iamVjdCBvciBvbmUgd2l0aCBhbiBpbnZhbGlkIElELgor ICAgIHJldHVybiAhYXhPYmplY3QuYWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpICYmIGF4T2JqZWN0 Lm9iamVjdElEKCkuaXNWYWxpZCgpOworfQorCiBzdGQ6Om9wdGlvbmFsPEFYSXNvbGF0ZWRUcmVl OjpOb2RlQ2hhbmdlPiBBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdChSZWY8QVhD b3JlT2JqZWN0PiBheE9iamVjdCwgQXR0YWNoV3JhcHBlciBhdHRhY2hXcmFwcGVyKQogewogICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKGF4T2JqZWN0Lm9iamVjdElEKCku aXNWYWxpZCgpKTsKIAotICAgIC8vIFdlIHNob3VsZCBuZXZlciBjcmVhdGUgYW4gaXNvbGF0ZWQg b2JqZWN0IGZyb20gYW4gaWdub3JlZCBvYmplY3QuCi0gICAgaWYgKGF4T2JqZWN0LT5hY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKCkpCisgICAgaWYgKCFzaG91bGRDcmVhdGVOb2RlQ2hhbmdlKGF4T2Jq ZWN0LmdldCgpKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAotICAgIGlmICghYXhP YmplY3QtPm9iamVjdElEKCkuaXNWYWxpZCgpKSB7Ci0gICAgICAgIC8vIEVpdGhlciB0aGUgYXhP YmplY3QgaGFzIGFuIGludmFsaWQgSUQgb3Igc29tZXRoaW5nIGVsc2Ugd2VudCB0ZXJyaWJseSB3 cm9uZy4gRG9uJ3QgYm90aGVyIGRvaW5nIGFueXRoaW5nIGVsc2UuCi0gICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwotICAgIH0KLQogICAg IGF1dG8gb2JqZWN0ID0gQVhJc29sYXRlZE9iamVjdDo6Y3JlYXRlKGF4T2JqZWN0LCB0aGlzKTsK ICAgICBOb2RlQ2hhbmdlIG5vZGVDaGFuZ2UgeyBvYmplY3QsIG51bGxwdHIgfTsKIApAQCAtNDU4 LDcgKzQ1OCw3IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZU5vZGVBbmREZXBlbmRlbnRQ cm9wZXJ0aWVzKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIHVwZGF0ZU5vZGVQcm9w ZXJ0eSgqdHJlZUFuY2VzdG9yLCBBWFByb3BlcnR5TmFtZTo6QVJJQVRyZWVSb3dzKTsKIH0KIAot dm9pZCBBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVj dCkKK3ZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhP YmplY3QsIFJlc29sdmVOb2RlQ2hhbmdlcyByZXNvbHZlTm9kZUNoYW5nZXMpCiB7CiAgICAgQVhU UkFDRSgiQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuIl9zKTsKICAgICBBWExPRygiRm9y IEFYT2JqZWN0OiIpOwpAQCAtNDg5LDEyICs0ODksMzQgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6 dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotI2lmbmRlZiBOREVCVUcKICAgICBpZiAoYXhBbmNlc3RvciAhPSAmYXhPYmplY3Qp IHsKICAgICAgICAgQVhMT0cobWFrZVN0cmluZygiT3JpZ2luYWwgb2JqZWN0IHdpdGggSUQgIiwg YXhPYmplY3Qub2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgd2Fzbid0IGluIHRoZSBpc29s YXRlZCB0cmVlLCBzbyBpbnN0ZWFkIHVwZGF0aW5nIHRoZSBjbG9zZXN0IGluLWlzb2xhdGVkLXRy ZWUgYW5jZXN0b3I6IikpOwogICAgICAgICBBWExPRyhheEFuY2VzdG9yKTsKKyAgICAgICAgZm9y IChhdXRvJiBjaGlsZCA6IGF4T2JqZWN0LmNoaWxkcmVuKCkpIHsKKyAgICAgICAgICAgIGF1dG8q IGxpdmVDaGlsZCA9IGR5bmFtaWNEb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0PihjaGlsZC5n ZXQoKSk7CisgICAgICAgICAgICBpZiAoIWxpdmVDaGlsZCB8fCBsaXZlQ2hpbGQtPmNoaWxkcmVu SW5pdGlhbGl6ZWQoKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAg aWYgKCFtX25vZGVNYXAuY29udGFpbnMobGl2ZUNoaWxkLT5vYmplY3RJRCgpKSkgeworICAgICAg ICAgICAgICAgIGlmICghc2hvdWxkQ3JlYXRlTm9kZUNoYW5nZSgqbGl2ZUNoaWxkKSkKKyAgICAg ICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAgICAgICAvLyBUaGlzIGNoaWxk IHNob3VsZCBiZSBhZGRlZCB0byB0aGUgaXNvbGF0ZWQgdHJlZSBidXQgaGFzbid0IGJlZW4geWV0 LgorICAgICAgICAgICAgICAgIC8vIEFkZCBpdCB0byB0aGUgbm9kZW1hcCBzbyB0aGUgcmVjdXJz aXZlIGNhbGwgdG8gdXBkYXRlQ2hpbGRyZW4gYmVsb3cgcHJvcGVybHkgYnVpbGRzIHRoZSBzdWJ0 cmVlIGZvciB0aGlzIG9iamVjdC4KKyAgICAgICAgICAgICAgICBhdXRvKiBwYXJlbnQgPSBsaXZl Q2hpbGQtPnBhcmVudE9iamVjdFVuaWdub3JlZCgpOworICAgICAgICAgICAgICAgIG1fbm9kZU1h cC5zZXQobGl2ZUNoaWxkLT5vYmplY3RJRCgpLCBQYXJlbnRDaGlsZHJlbklEcyB7IHBhcmVudCA/ IHBhcmVudC0+b2JqZWN0SUQoKSA6IEFYSUQoKSwgbGl2ZUNoaWxkLT5jaGlsZHJlbklEcygpIH0p OworICAgICAgICAgICAgICAgIG1fdW5yZXNvbHZlZFBlbmRpbmdBcHBlbmRzLnNldChsaXZlQ2hp bGQtPm9iamVjdElEKCksIEF0dGFjaFdyYXBwZXI6Ok9uTWFpblRocmVhZCk7CisgICAgICAgICAg ICB9CisKKyAgICAgICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoCisgICAgICAgICAgICAgICAgIkNo aWxkIElEICIsIGxpdmVDaGlsZC0+b2JqZWN0SUQoKS5sb2dnaW5nU3RyaW5nKCksICIgb2Ygb3Jp Z2luYWwgb2JqZWN0IElEICIsIGF4T2JqZWN0Lm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAi IHdhcyBmb3VuZCBpbiB0aGUgaXNvbGF0ZWQgdHJlZSB3aXRoIHVuaW5pdGlhbGl6ZWQgbGl2ZSBj aGlsZHJlbi4gVXBkYXRpbmcgaXRzIGlzb2xhdGVkIGNoaWxkcmVuLiIKKyAgICAgICAgICAgICkp OworICAgICAgICAgICAgLy8gRG9uJ3QgaW1tZWRpYXRlbHkgcmVzb2x2ZSBub2RlIGNoYW5nZXMg aW4gdGhlc2UgcmVjdXJzaXZlIGNhbGxzIHRvIHVwZGF0ZUNoaWxkcmVuLiBUaGlzIGF2b2lkcyBk dXBsaWNhdGUgbm9kZSBjaGFuZ2UgY3JlYXRpb24gaW4gdGhpcyBzY2VuYXJpbzoKKyAgICAgICAg ICAgIC8vICAgMS4gU29tZSBzdWJ0cmVlIGlzIHVwZGF0ZWQgaW4gdGhlIGJlbG93IGNhbGwgdG8g dXBkYXRlQ2hpbGRyZW4uCisgICAgICAgICAgICAvLyAgIDIuIExhdGVyIGluIHRoaXMgZnVuY3Rp b24sIHdoZW4gdXBkYXRpbmcgYXhBbmNlc3Rvciwgd2UgdXBkYXRlIHNvbWUgaGlnaGVyIHN1YnRy ZWUgdGhhdCBpbmNsdWRlcyB0aGUgdXBkYXRlZCBzdWJ0cmVlIGZyb20gc3RlcCAxLgorICAgICAg ICAgICAgdXBkYXRlQ2hpbGRyZW4oKmxpdmVDaGlsZCwgUmVzb2x2ZU5vZGVDaGFuZ2VzOjpObyk7 CisgICAgICAgIH0KICAgICB9Ci0jZW5kaWYKIAogICAgIGF1dG8gb2xkSURzID0gbV9ub2RlTWFw LmdldChheEFuY2VzdG9yLT5vYmplY3RJRCgpKTsKICAgICBhdXRvJiBvbGRDaGlsZHJlbklEcyA9 IG9sZElEcy5jaGlsZHJlbklEczsKQEAgLTUyOCw3ICs1NTAsMTEgQEAgdm9pZCBBWElzb2xhdGVk VHJlZTo6dXBkYXRlQ2hpbGRyZW4oQVhDb3JlT2JqZWN0JiBheE9iamVjdCkKICAgICAgICAgaWYg KGF4SUQuaXNWYWxpZCgpKQogICAgICAgICAgICAgcmVtb3ZlU3VidHJlZUZyb21Ob2RlTWFwKGF4 SUQsIGF4QW5jZXN0b3IpOwogICAgIH0KLSAgICBxdWV1ZVJlbW92YWxzQW5kVW5yZXNvbHZlZENo YW5nZXMob2xkQ2hpbGRyZW5JRHMpOworCisgICAgaWYgKHJlc29sdmVOb2RlQ2hhbmdlcyA9PSBS ZXNvbHZlTm9kZUNoYW5nZXM6OlllcykKKyAgICAgICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2 ZWRDaGFuZ2VzKG9sZENoaWxkcmVuSURzKTsKKyAgICBlbHNlCisgICAgICAgIHF1ZXVlUmVtb3Zh bHMob2xkQ2hpbGRyZW5JRHMpOwogCiAgICAgLy8gQWxzbyBxdWV1ZSB1cGRhdGVzIHRvIHRoZSB0 YXJnZXQgbm9kZSBpdHNlbGYgYW5kIGFueSBwcm9wZXJ0aWVzIHRoYXQgZGVwZW5kIG9uIGNoaWxk cmVuKCkuCiAgICAgdXBkYXRlTm9kZUFuZERlcGVuZGVudFByb3BlcnRpZXMoKmF4QW5jZXN0b3Ip OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUv QVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggYjFhNTk0Yzk4NTI1Li4wMzE3YjJlZTg4N2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNv bGF0ZWRUcmVlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaApAQCAtMzQ2LDcgKzM0Niw4IEBAIHB1YmxpYzoKIAogICAgIHZv aWQgZ2VuZXJhdGVTdWJ0cmVlKEFYQ29yZU9iamVjdCYpOwogICAgIHZvaWQgdXBkYXRlTm9kZShB WENvcmVPYmplY3QmKTsKLSAgICB2b2lkIHVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYpOwor ICAgIGVudW0gY2xhc3MgUmVzb2x2ZU5vZGVDaGFuZ2VzIDogYm9vbCB7IE5vLCBZZXMgfTsKKyAg ICB2b2lkIHVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYsIFJlc29sdmVOb2RlQ2hhbmdlcyA9 IFJlc29sdmVOb2RlQ2hhbmdlczo6WWVzKTsKICAgICB2b2lkIHVwZGF0ZU5vZGVQcm9wZXJ0eShB WENvcmVPYmplY3QmLCBBWFByb3BlcnR5TmFtZSk7CiAgICAgdm9pZCB1cGRhdGVOb2RlQW5kRGVw ZW5kZW50UHJvcGVydGllcyhBWENvcmVPYmplY3QmKTsKIAo= 460439 2022-06-22 22:53:05 -0700 2022-06-23 09:44:16 -0700 Patch bug-241735-20220622225304.patch text/plain 7788 tyler_w RnJvbSA0YTU0ZWRiOGRlZjI5NGJjYzczMGM4NTU5NGM2ODVhZGQ2OWJmZGNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUeWxlciBXaWxjb2NrIDx0eWxlcl93QGFwcGxlLmNvbT4KRGF0 ZTogRnJpLCAxNyBKdW4gMjAyMiAxNzoyOTozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIEFYOiBB WElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gc29tZXRpbWVzIGZhaWxzIHRvIHVwZGF0ZQog aXNvbGF0ZWQgc3VidHJlZXMgd2hlbiB0aGUgZ2l2ZW4gbGl2ZSBvYmplY3QgaXMgaWdub3JlZAog aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI0MTczNQoKUmV2aWV3ZWQg YnkgQW5kcmVzIEdvbnphbGV6LgoKT3VyIGN1cnJlbnQgYWxnb3JpdGhtIGluIEFYSXNvbGF0ZWRU cmVlOjp1cGRhdGVDaGlsZHJlbiBpczoKCiAgMS4gSWYgdGhlIG9iamVjdCB3ZSBnb3QgYW4gQVhD aGlsZHJlbkNoYW5nZWQgbm90aWZpY2F0aW9uCiAgZm9yIGlzIGluIHRoZSBpc29sYXRlZCB0cmVl LCB1cGRhdGUgaXRzIGlzb2xhdGVkIGNoaWxkcmVuCgogIDIuIE90aGVyd2lzZSwgYXNjZW5kIHRo ZSBhbmNlc3RyeSB0byB0aGUgbmVhcmVzdAogIGluLWlzb2xhdGVkLXRyZWUgYW5jZXN0b3IsIGFu ZCB1cGRhdGUgdGhlIGNoaWxkcmVuIG9mIHRoYXQKICBvYmplY3QKClRoaXMgaXMgbm90IGFsd2F5 cyBhZGVxdWF0ZSB3aGVuIHRoZSBvYmplY3QgcGFzc2VkIHRvIHVwZGF0ZUNoaWxkcmVuCmlzIGln bm9yZWQsIGFzIGluIHNvbWUgY2FzZXMgdGhlIGFuY2VzdG9yIGhhcyBubyBjaGlsZHJlbiBjaGFu Z2VzCmJ1dCB0aGUgc3VidHJlZXMgb2YgdGhlIGlnbm9yZWQgb2JqZWN0IGRvLgoKVGhpcyBwYXRj aCBmaXhlcyB0aGlzIGJ5IGFsc28gY2hlY2tpbmcgdGhlIGxpdmUtY2hpbGRyZW4gb2YgdGhlIGln bm9yZWQKb2JqZWN0IGZvciBhbnkgdGhhdCBoYXZlIHVuaXRpYWxpemVkIGNoaWxkcmVuLiBJZiBz bywgd2UgY2FsbApBWElzb2xhdGVkVHJlZTo6dXBkYXRlQ2hpbGRyZW4gb24gdGhvc2UgdG9vLgoK KiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaDoKKFdl YkNvcmU6OkFjY2Vzc2liaWxpdHlPYmplY3Q6OmNoaWxkcmVuSW5pdGlhbGl6ZWQgY29uc3QpOgpN b3ZlIGZyb20gcHJpdmF0ZSB0byBwdWJsaWMuCiogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwOgooV2ViQ29yZTo6QVhJc29sYXRlZFRy ZWU6OnVwZGF0ZUNoaWxkcmVuKToKLS0tCiAuLi4vYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5 T2JqZWN0LmggICAgICAgfCAgMiArLQogLi4uL2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5j cHAgICAgICAgICAgIHwgNTAgKysrKysrKysrKysrKystLS0tLQogLi4uL2lzb2xhdGVkdHJlZS9B WElzb2xhdGVkVHJlZS5oICAgICAgICAgICAgIHwgIDMgKy0KIDMgZmlsZXMgY2hhbmdlZCwgNDEg aW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5T2JqZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuaAppbmRleCA4YTFlYmVhNjRiYjUuLjgz MTI0MmI0ODJmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmgKQEAgLTQ5Nyw2ICs0OTcsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBk ZWNyZW1lbnQoKSBvdmVycmlkZSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCB1cGRhdGVSb2xlKCkg eyB9CisgICAgYm9vbCBjaGlsZHJlbkluaXRpYWxpemVkKCkgY29uc3QgeyByZXR1cm4gbV9jaGls ZHJlbkluaXRpYWxpemVkOyB9CiAgICAgY29uc3QgQWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9y JiBjaGlsZHJlbihib29sIHVwZGF0ZUNoaWxkcmVuSWZOZWVkZWQgPSB0cnVlKSBvdmVycmlkZTsK ICAgICB2aXJ0dWFsIHZvaWQgYWRkQ2hpbGRyZW4oKSB7IH0KICAgICBlbnVtIGNsYXNzIERlc2Nl bmRJZklnbm9yZWQgOiB1aW50OF90IHsgTm8sIFllcyB9OwpAQCAtODI3LDcgKzgyOCw2IEBAIHBy aXZhdGU6CiAjZW5kaWYKICAgICAKIHByb3RlY3RlZDogLy8gRklYTUU6IE1ha2UgdGhlIGRhdGEg bWVtYmVycyBwcml2YXRlLgotICAgIGJvb2wgY2hpbGRyZW5Jbml0aWFsaXplZCgpIGNvbnN0IHsg cmV0dXJuIG1fY2hpbGRyZW5Jbml0aWFsaXplZDsgfQogICAgIEFjY2Vzc2liaWxpdHlDaGlsZHJl blZlY3RvciBtX2NoaWxkcmVuOwogICAgIG11dGFibGUgYm9vbCBtX2NoaWxkcmVuSW5pdGlhbGl6 ZWQgeyBmYWxzZSB9OwogICAgIEFjY2Vzc2liaWxpdHlSb2xlIG1fcm9sZSB7IEFjY2Vzc2liaWxp dHlSb2xlOjpVbmtub3duIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKaW5kZXggMjdmZDg5ZmM5 OGYzLi5iMjZlMTYyY2YzMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTIwOSwyMCAr MjA5LDIwIEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6OmdlbmVyYXRlU3VidHJlZShBWENvcmVPYmpl Y3QmIGF4T2JqZWN0KQogICAgIHF1ZXVlUmVtb3ZhbHNBbmRVbnJlc29sdmVkQ2hhbmdlcyh7IH0p OwogfQogCitzdGF0aWMgYm9vbCBzaG91bGRDcmVhdGVOb2RlQ2hhbmdlKEFYQ29yZU9iamVjdCYg YXhPYmplY3QpCit7CisgICAgLy8gV2Ugc2hvdWxkIG5ldmVyIGNyZWF0ZSBhbiBpc29sYXRlZCBv YmplY3QgZnJvbSBhbiBpZ25vcmVkIG9iamVjdCBvciBvbmUgd2l0aCBhbiBpbnZhbGlkIElELgor ICAgIHJldHVybiAhYXhPYmplY3QuYWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpICYmIGF4T2JqZWN0 Lm9iamVjdElEKCkuaXNWYWxpZCgpOworfQorCiBzdGQ6Om9wdGlvbmFsPEFYSXNvbGF0ZWRUcmVl OjpOb2RlQ2hhbmdlPiBBWElzb2xhdGVkVHJlZTo6bm9kZUNoYW5nZUZvck9iamVjdChSZWY8QVhD b3JlT2JqZWN0PiBheE9iamVjdCwgQXR0YWNoV3JhcHBlciBhdHRhY2hXcmFwcGVyKQogewogICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgQVNTRVJUKGF4T2JqZWN0LT5vYmplY3RJRCgp LmlzVmFsaWQoKSk7CiAKLSAgICAvLyBXZSBzaG91bGQgbmV2ZXIgY3JlYXRlIGFuIGlzb2xhdGVk IG9iamVjdCBmcm9tIGFuIGlnbm9yZWQgb2JqZWN0LgotICAgIGlmIChheE9iamVjdC0+YWNjZXNz aWJpbGl0eUlzSWdub3JlZCgpKQorICAgIGlmICghc2hvdWxkQ3JlYXRlTm9kZUNoYW5nZShheE9i amVjdC5nZXQoKSkpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBpZiAoIWF4 T2JqZWN0LT5vYmplY3RJRCgpLmlzVmFsaWQoKSkgewotICAgICAgICAvLyBFaXRoZXIgdGhlIGF4 T2JqZWN0IGhhcyBhbiBpbnZhbGlkIElEIG9yIHNvbWV0aGluZyBlbHNlIHdlbnQgdGVycmlibHkg d3JvbmcuIERvbid0IGJvdGhlciBkb2luZyBhbnl0aGluZyBlbHNlLgotICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLSAgICB9Ci0KICAg ICBhdXRvIG9iamVjdCA9IEFYSXNvbGF0ZWRPYmplY3Q6OmNyZWF0ZShheE9iamVjdCwgdGhpcyk7 CiAgICAgTm9kZUNoYW5nZSBub2RlQ2hhbmdlIHsgb2JqZWN0LCBudWxscHRyIH07CiAKQEAgLTQ1 OCw3ICs0NTgsNyBAQCB2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVOb2RlQW5kRGVwZW5kZW50 UHJvcGVydGllcyhBWENvcmVPYmplY3QmIGF4T2JqZWN0KQogICAgICAgICB1cGRhdGVOb2RlUHJv cGVydHkoKnRyZWVBbmNlc3RvciwgQVhQcm9wZXJ0eU5hbWU6OkFSSUFUcmVlUm93cyk7CiB9CiAK LXZvaWQgQVhJc29sYXRlZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmpl Y3QpCit2b2lkIEFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmIGF4 T2JqZWN0LCBSZXNvbHZlTm9kZUNoYW5nZXMgcmVzb2x2ZU5vZGVDaGFuZ2VzKQogewogICAgIEFY VFJBQ0UoIkFYSXNvbGF0ZWRUcmVlOjp1cGRhdGVDaGlsZHJlbiJfcyk7CiAgICAgQVhMT0coIkZv ciBBWE9iamVjdDoiKTsKQEAgLTQ4OSwxMiArNDg5LDM0IEBAIHZvaWQgQVhJc29sYXRlZFRyZWU6 OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSNpZm5kZWYgTkRFQlVHCiAgICAgaWYgKGF4QW5jZXN0b3IgIT0gJmF4T2JqZWN0 KSB7CiAgICAgICAgIEFYTE9HKG1ha2VTdHJpbmcoIk9yaWdpbmFsIG9iamVjdCB3aXRoIElEICIs IGF4T2JqZWN0Lm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAiIHdhc24ndCBpbiB0aGUgaXNv bGF0ZWQgdHJlZSwgc28gaW5zdGVhZCB1cGRhdGluZyB0aGUgY2xvc2VzdCBpbi1pc29sYXRlZC10 cmVlIGFuY2VzdG9yOiIpKTsKICAgICAgICAgQVhMT0coYXhBbmNlc3Rvcik7CisgICAgICAgIGZv ciAoYXV0byYgY2hpbGQgOiBheE9iamVjdC5jaGlsZHJlbigpKSB7CisgICAgICAgICAgICBhdXRv KiBsaXZlQ2hpbGQgPSBkeW5hbWljRG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4oY2hpbGQu Z2V0KCkpOworICAgICAgICAgICAgaWYgKCFsaXZlQ2hpbGQgfHwgbGl2ZUNoaWxkLT5jaGlsZHJl bkluaXRpYWxpemVkKCkpCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAg IGlmICghbV9ub2RlTWFwLmNvbnRhaW5zKGxpdmVDaGlsZC0+b2JqZWN0SUQoKSkpIHsKKyAgICAg ICAgICAgICAgICBpZiAoIXNob3VsZENyZWF0ZU5vZGVDaGFuZ2UoKmxpdmVDaGlsZCkpCisgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICAgICAgLy8gVGhpcyBjaGls ZCBzaG91bGQgYmUgYWRkZWQgdG8gdGhlIGlzb2xhdGVkIHRyZWUgYnV0IGhhc24ndCBiZWVuIHll dC4KKyAgICAgICAgICAgICAgICAvLyBBZGQgaXQgdG8gdGhlIG5vZGVtYXAgc28gdGhlIHJlY3Vy c2l2ZSBjYWxsIHRvIHVwZGF0ZUNoaWxkcmVuIGJlbG93IHByb3Blcmx5IGJ1aWxkcyB0aGUgc3Vi dHJlZSBmb3IgdGhpcyBvYmplY3QuCisgICAgICAgICAgICAgICAgYXV0byogcGFyZW50ID0gbGl2 ZUNoaWxkLT5wYXJlbnRPYmplY3RVbmlnbm9yZWQoKTsKKyAgICAgICAgICAgICAgICBtX25vZGVN YXAuc2V0KGxpdmVDaGlsZC0+b2JqZWN0SUQoKSwgUGFyZW50Q2hpbGRyZW5JRHMgeyBwYXJlbnQg PyBwYXJlbnQtPm9iamVjdElEKCkgOiBBWElEKCksIGxpdmVDaGlsZC0+Y2hpbGRyZW5JRHMoKSB9 KTsKKyAgICAgICAgICAgICAgICBtX3VucmVzb2x2ZWRQZW5kaW5nQXBwZW5kcy5zZXQobGl2ZUNo aWxkLT5vYmplY3RJRCgpLCBBdHRhY2hXcmFwcGVyOjpPbk1haW5UaHJlYWQpOworICAgICAgICAg ICAgfQorCisgICAgICAgICAgICBBWExPRyhtYWtlU3RyaW5nKAorICAgICAgICAgICAgICAgICJD aGlsZCBJRCAiLCBsaXZlQ2hpbGQtPm9iamVjdElEKCkubG9nZ2luZ1N0cmluZygpLCAiIG9mIG9y aWdpbmFsIG9iamVjdCBJRCAiLCBheE9iamVjdC5vYmplY3RJRCgpLmxvZ2dpbmdTdHJpbmcoKSwg IiB3YXMgZm91bmQgaW4gdGhlIGlzb2xhdGVkIHRyZWUgd2l0aCB1bmluaXRpYWxpemVkIGxpdmUg Y2hpbGRyZW4uIFVwZGF0aW5nIGl0cyBpc29sYXRlZCBjaGlsZHJlbi4iCisgICAgICAgICAgICAp KTsKKyAgICAgICAgICAgIC8vIERvbid0IGltbWVkaWF0ZWx5IHJlc29sdmUgbm9kZSBjaGFuZ2Vz IGluIHRoZXNlIHJlY3Vyc2l2ZSBjYWxscyB0byB1cGRhdGVDaGlsZHJlbi4gVGhpcyBhdm9pZHMg ZHVwbGljYXRlIG5vZGUgY2hhbmdlIGNyZWF0aW9uIGluIHRoaXMgc2NlbmFyaW86CisgICAgICAg ICAgICAvLyAgIDEuIFNvbWUgc3VidHJlZSBpcyB1cGRhdGVkIGluIHRoZSBiZWxvdyBjYWxsIHRv IHVwZGF0ZUNoaWxkcmVuLgorICAgICAgICAgICAgLy8gICAyLiBMYXRlciBpbiB0aGlzIGZ1bmN0 aW9uLCB3aGVuIHVwZGF0aW5nIGF4QW5jZXN0b3IsIHdlIHVwZGF0ZSBzb21lIGhpZ2hlciBzdWJ0 cmVlIHRoYXQgaW5jbHVkZXMgdGhlIHVwZGF0ZWQgc3VidHJlZSBmcm9tIHN0ZXAgMS4KKyAgICAg ICAgICAgIHVwZGF0ZUNoaWxkcmVuKCpsaXZlQ2hpbGQsIFJlc29sdmVOb2RlQ2hhbmdlczo6Tm8p OworICAgICAgICB9CiAgICAgfQotI2VuZGlmCiAKICAgICBhdXRvIG9sZElEcyA9IG1fbm9kZU1h cC5nZXQoYXhBbmNlc3Rvci0+b2JqZWN0SUQoKSk7CiAgICAgYXV0byYgb2xkQ2hpbGRyZW5JRHMg PSBvbGRJRHMuY2hpbGRyZW5JRHM7CkBAIC01MjgsNyArNTUwLDExIEBAIHZvaWQgQVhJc29sYXRl ZFRyZWU6OnVwZGF0ZUNoaWxkcmVuKEFYQ29yZU9iamVjdCYgYXhPYmplY3QpCiAgICAgICAgIGlm IChheElELmlzVmFsaWQoKSkKICAgICAgICAgICAgIHJlbW92ZVN1YnRyZWVGcm9tTm9kZU1hcChh eElELCBheEFuY2VzdG9yKTsKICAgICB9Ci0gICAgcXVldWVSZW1vdmFsc0FuZFVucmVzb2x2ZWRD aGFuZ2VzKG9sZENoaWxkcmVuSURzKTsKKworICAgIGlmIChyZXNvbHZlTm9kZUNoYW5nZXMgPT0g UmVzb2x2ZU5vZGVDaGFuZ2VzOjpZZXMpCisgICAgICAgIHF1ZXVlUmVtb3ZhbHNBbmRVbnJlc29s dmVkQ2hhbmdlcyhvbGRDaGlsZHJlbklEcyk7CisgICAgZWxzZQorICAgICAgICBxdWV1ZVJlbW92 YWxzKG9sZENoaWxkcmVuSURzKTsKIAogICAgIC8vIEFsc28gcXVldWUgdXBkYXRlcyB0byB0aGUg dGFyZ2V0IG5vZGUgaXRzZWxmIGFuZCBhbnkgcHJvcGVydGllcyB0aGF0IGRlcGVuZCBvbiBjaGls ZHJlbigpLgogICAgIHVwZGF0ZU5vZGVBbmREZXBlbmRlbnRQcm9wZXJ0aWVzKCpheEFuY2VzdG9y KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVl L0FYSXNvbGF0ZWRUcmVlLmggYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkVHJlZS5oCmluZGV4IGIxYTU5NGM5ODUyNS4uMDMxN2IyZWU4ODdlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0 cmVlL0FYSXNvbGF0ZWRUcmVlLmgKQEAgLTM0Niw3ICszNDYsOCBAQCBwdWJsaWM6CiAKICAgICB2 b2lkIGdlbmVyYXRlU3VidHJlZShBWENvcmVPYmplY3QmKTsKICAgICB2b2lkIHVwZGF0ZU5vZGUo QVhDb3JlT2JqZWN0Jik7Ci0gICAgdm9pZCB1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmKTsK KyAgICBlbnVtIGNsYXNzIFJlc29sdmVOb2RlQ2hhbmdlcyA6IGJvb2wgeyBObywgWWVzIH07Cisg ICAgdm9pZCB1cGRhdGVDaGlsZHJlbihBWENvcmVPYmplY3QmLCBSZXNvbHZlTm9kZUNoYW5nZXMg PSBSZXNvbHZlTm9kZUNoYW5nZXM6Olllcyk7CiAgICAgdm9pZCB1cGRhdGVOb2RlUHJvcGVydHko QVhDb3JlT2JqZWN0JiwgQVhQcm9wZXJ0eU5hbWUpOwogICAgIHZvaWQgdXBkYXRlTm9kZUFuZERl cGVuZGVudFByb3BlcnRpZXMoQVhDb3JlT2JqZWN0Jik7CiAK 461606 2022-08-14 00:00:43 -0700 2022-08-14 00:00:43 -0700 Shah117363?. test.html application/xml 967 w07m PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPG1ldGEgY2hhcnNldD0iVVRGLTgiPgo8dGl0 bGU+Z2V0Qm91bmRpbmdDbGllbnRSZWN0IHRlc3QgY2FzZTwvdGl0bGU+CjxzdHlsZT4KI2Zvbywg I2Zvby1yZXN1bHQsICNiYXIsICNiYXItcmVzdWx0IHsgZGlzcGxheTogaW5saW5lLWJsb2NrOyB9 CiNmb28sICNiYXIgeyBvdXRsaW5lOiAxcHggc29saWQgZ3JheSB9Cjwvc3R5bGU+CjwvaGVhZD4K PGJvZHk+CjxwPjxjb2RlPmh0bWwgPiBkaXYgPiBkaXY6PC9jb2RlPjwvcD4KPGRpdj4KICAgIDxk aXYgaWQ9ImZvbyI+SGVsbG8gV29ybGQ8L2Rpdj4KICAgIDxkaXYgaWQ9ImZvby1yZXN1bHQiPjwv ZGl2Pgo8L2Rpdj4KPHA+PGNvZGU+aHRtbCA+IHN2ZyA+IGZvcmVpZ25PYmplY3QgPiBkaXY6PC9j b2RlPjwvcD4KPHN2ZyB3aWR0aD0iNDAwIiBoZWlnaHQ9IjEwMCI+CiAgICA8Zm9yZWlnbk9iamVj dCB4PSIxMCIgeT0iMTAiIHdpZHRoPSIzODAiIGhlaWdodD0iODAiPgogICAgICAgIDxkaXYgaWQ9 ImJhciI+SGVsbG8gV29ybGQ8L2Rpdj4KICAgICAgICA8ZGl2IGlkPSJiYXItcmVzdWx0Ij48L2Rp dj4KICAgIDwvZm9yZWlnbk9iamVjdD4KPC9zdmc+CjxzY3JpcHQ+CnZhciBmb29SZWN0ID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2ZvbycpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOwpkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnZm9vLXJlc3VsdCcpLnRleHRDb250ZW50ID0KICAgIGZvb1Jl Y3Qud2lkdGggKyAnw5cnICsgZm9vUmVjdC5oZWlnaHQ7Cgp2YXIgYmFyUmVjdCA9IGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdiYXInKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ2Jhci1yZXN1bHQnKS50ZXh0Q29udGVudCA9CiAgICBiYXJSZWN0Lndp ZHRoICsgJ8OXJyArIGJhclJlY3QuaGVpZ2h0Owo8L3NjcmlwdD4KPC9ib2R5Pgo8L2h0bWw+Cg==