234059 2021-12-08 18:42:05 -0800 Decouple AXObjectCache handleChildrenChanged and postNotification. 2022-02-13 19:50:14 -0800 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall andresg_22 apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white tyler_w webkit-bug-importer oldest_to_newest 1821934 0 andresg_22 2021-12-08 18:42:05 -0800 Decouple AXObjectCache handleChildrenChanged and postNotification. 1821936 1 webkit-bug-importer 2021-12-08 18:42:44 -0800 <rdar://problem/86247404> 1821947 2 446484 andresg_22 2021-12-08 19:05:31 -0800 Created attachment 446484 Patch 1822229 3 446484 cfleizach 2021-12-09 11:27:08 -0800 Comment on attachment 446484 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446484&action=review > Source/WebCore/ChangeLog:12 > + notification (postNotification), which causes a doble deferral of these doble > double > Source/WebCore/ChangeLog:16 > + added or removed, before properties in the rsulting objects may be rsulting > resulting > Source/WebCore/ChangeLog:17 > + updated. This patch fixes this problem by making handleChildrenchanged handleChildrenchanged > handleChildrenChanged > Source/WebCore/accessibility/AXObjectCache.cpp:995 > + childrenChanged(parent->parentObject()); question here - if we're going up the parent chain telling things we need to update, do we need to process this subtree any further? if a parent has changed won't it recreate the entire subtree? > Source/WebCore/accessibility/AXObjectCache.cpp:1801 > + handleChildrenChanged(*get(element->parentNode())); we probably want to defer this along with the modal change or maybe deferModalChange should also implicitly handle children changed on the paren 1822470 4 446647 andresg_22 2021-12-09 18:08:17 -0800 Created attachment 446647 Patch 1822475 5 andresg_22 2021-12-09 18:14:05 -0800 (In reply to chris fleizach from comment #3) > Comment on attachment 446484 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=446484&action=review > > > Source/WebCore/ChangeLog:12 > > + notification (postNotification), which causes a doble deferral of these > > doble > double Fixed. > > > Source/WebCore/ChangeLog:16 > > + added or removed, before properties in the rsulting objects may be > > rsulting > resulting Fixed. > > > Source/WebCore/ChangeLog:17 > > + updated. This patch fixes this problem by making handleChildrenchanged > > handleChildrenchanged > handleChildrenChanged Fixed. > > > Source/WebCore/accessibility/AXObjectCache.cpp:995 > > + childrenChanged(parent->parentObject()); > > question here - if we're going up the parent chain telling things we need to > update, do we need to process this subtree any further? if a parent has > changed won't it recreate the entire subtree? You're right. I thought we might need to go up the entire chain checking whether isIgnored had change, but it doesn't seem to be necessary, at least for the test cases we have. > > > Source/WebCore/accessibility/AXObjectCache.cpp:1801 > > + handleChildrenChanged(*get(element->parentNode())); > > we probably want to defer this along with the modal change > or maybe deferModalChange should also implicitly handle children changed on > the paren Done. thanks! 1823858 6 447090 andresg_22 2021-12-13 17:48:48 -0800 Created attachment 447090 Patch 1824650 7 447314 andresg_22 2021-12-15 19:10:16 -0800 Created attachment 447314 Patch 1839310 8 451417 andresg_22 2022-02-09 11:30:06 -0800 Created attachment 451417 Patch 1839325 9 451417 tyler_w 2022-02-09 11:54:55 -0800 Comment on attachment 451417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451417&action=review > Source/WebCore/accessibility/AXObjectCache.cpp:1049 > + postPlatformNotification(&object, AXChildrenChanged); Do we still need to post this notification since we now immediately handle this children changed event by calling AXObjectCache::childrenChanged and AXObjectCache::updateIsolatedTree? 1839348 10 andresg_22 2022-02-09 12:25:22 -0800 (In reply to Tyler Wilcock from comment #9) > Comment on attachment 451417 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=451417&action=review > > > Source/WebCore/accessibility/AXObjectCache.cpp:1049 > > + postPlatformNotification(&object, AXChildrenChanged); > > Do we still need to post this notification since we now immediately handle > this children changed event by calling AXObjectCache::childrenChanged and > AXObjectCache::updateIsolatedTree? The naming isn't great here, but postPlatformNotification actually just fires the platform notification, as opposed to postNotification which is the one that causes changes in the state of the live tree and consequently in the isolated tree. That's why I see this as a decoupling between the handling the notification which means updating the trees state, and once that is done, notifying clients that something changed, which is postPlatformNotification. 1839351 11 tyler_w 2022-02-09 12:28:02 -0800 (In reply to Andres Gonzalez from comment #10) > (In reply to Tyler Wilcock from comment #9) > > Comment on attachment 451417 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=451417&action=review > > > > > Source/WebCore/accessibility/AXObjectCache.cpp:1049 > > > + postPlatformNotification(&object, AXChildrenChanged); > > > > Do we still need to post this notification since we now immediately handle > > this children changed event by calling AXObjectCache::childrenChanged and > > AXObjectCache::updateIsolatedTree? > > The naming isn't great here, but postPlatformNotification actually just > fires the platform notification, as opposed to postNotification which is the > one that causes changes in the state of the live tree and consequently in > the isolated tree. That's why I see this as a decoupling between the > handling the notification which means updating the trees state, and once > that is done, notifying clients that something changed, which is > postPlatformNotification. Ahh, got it. Nice, yeah this seems like a good change. 1840066 12 451417 cfleizach 2022-02-10 17:16:08 -0800 Comment on attachment 451417 Patch looks good assuming tests pass now 1840129 13 tyler_w 2022-02-10 19:50:16 -0800 I think somebody clicked the "Retry failed tests" button, but that won't include the latest changes from trunk that speed up the test. A new patch might have to be uploaded. 1840329 14 451687 andresg_22 2022-02-11 06:56:23 -0800 Created attachment 451687 Patch 1841067 15 451840 andresg_22 2022-02-13 13:22:09 -0800 Created attachment 451840 Patch 1841112 16 ews-feeder 2022-02-13 19:50:11 -0800 Committed r289723 (247208@main): <https://commits.webkit.org/247208@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451840. 446484 2021-12-08 19:05:31 -0800 2021-12-09 18:08:14 -0800 Patch bug-234059-20211208220529.patch text/plain 6314 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjQ2ZTg4ODVkNDQ3NDc3 ZGM0ZDBmNjg1OTA5NmY4YjdlMTlkZjEzMC4uYzdhODJmZWZkODc1NWUxMjYwNDQzNTQ0Yzk1NGJj MzhmOWVmNTExZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTEyLTA4ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgZml4 ZXMgb3ZlciAzMCBhY2Nlc3NpYmlsaXR5IHRlc3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAg ICAgICAgQWxzbyBmaXhlcyBmbGFraW5lc3MgaW4gYWNjZXNzaWJpbGl0eS9kaWFsb2ctc2hvd01v ZGFsLmh0bWwuCisKKyAgICAgICAgQVhPYmplY3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2Vk IHdhcyBwb3N0aW5nIGFuIEFYQ2hpbGRyZW5DaGFuZ2VkCisgICAgICAgIG5vdGlmaWNhdGlvbiAo cG9zdE5vdGlmaWNhdGlvbiksIHdoaWNoIGNhdXNlcyBhIGRvYmxlIGRlZmVycmFsIG9mIHRoZXNl CisgICAgICAgIG5vdGlmaWNhdGlvbnMsIGluc3RlYWQgb2YgYWN0dWFsbHkgaGFuZGxpbmcgdGhl IG5vdGlmaWNhdGlvbi4KKyAgICAgICAgQ2hpbGRyZW5DaGFuZ2VkIG5vdGlmaWNhdGlvbnMgc2hv dWxkIGJlIGhhbmRsZWQgYmVmb3JlIG1hbnkgb3RoZXIKKyAgICAgICAgbm90aWZpY2F0aW9ucyBv ZiBwcm9wZXJ0eSBjaGFuZ2VzIHNpbmNlIHRoZXkgYXJlIERPTSBtdXRhdGlvbnMsIG9iamVjdHMK KyAgICAgICAgYWRkZWQgb3IgcmVtb3ZlZCwgYmVmb3JlIHByb3BlcnRpZXMgaW4gdGhlIHJzdWx0 aW5nIG9iamVjdHMgbWF5IGJlCisgICAgICAgIHVwZGF0ZWQuIFRoaXMgcGF0Y2ggZml4ZXMgdGhp cyBwcm9ibGVtIGJ5IG1ha2luZyBoYW5kbGVDaGlsZHJlbmNoYW5nZWQKKyAgICAgICAgdG8gYWN0 dWFsbHkgaGFuZGxlIHRoZSBub3RpZmljYXRpb25zIGFuZCB1cGRhdGUgdGhlIGlzb2xhdGVkIHRy ZWUuCisgICAgICAgIEluIHRoZSBwcm9jZXNzIG9mIGZpeGluZyB0aGlzIHByb2JsZW0sIGFsc28g Zml4ZWQgdGhlIGJ1ZyB3aGVyZQorICAgICAgICBBWE9iamVjdENhY2hlOjptX25vdGlmaWNhdGlv bnNUb1Bvc3Qgd2Fzbid0IGJlaW5nIGNsZWFyZWQgYWZ0ZXIgbW92ZWQKKyAgICAgICAgd2hpY2gg bWF5IHJlc3VsdCBvbiB1bmRlZmluZWQgYmVoYXZpb3IuCisgICAgICAgIEluIGFkZGl0aW9uLCBo YW5kbGluZyBvZiB0aGUgIm9wZW4iIGF0dHJpYnV0ZSBmb3IgPGRpYWxvZz4gZWxlbWVudHMgbm93 CisgICAgICAgIHVwZGF0ZXMgY2hpbGRyZW4sIHdoaWNoIGZpeGVzIHRoZSBmbGFraW5lc3Mgb2Jz ZXJ2ZWQgaW4gdGhlCisgICAgICAgIGRpYWxvZy1zaG93TW9kYWwuaHRtbCB0ZXN0LgorCisgICAg ICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkFYT2JqZWN0Q2FjaGU6OmhhbmRsZUNoaWxkcmVuQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3Jl OjpBWE9iamVjdENhY2hlOjpub3RpZmljYXRpb25Qb3N0VGltZXJGaXJlZCk6CisgICAgICAgIChX ZWJDb3JlOjpBWE9iamVjdENhY2hlOjpoYW5kbGVBdHRyaWJ1dGVDaGFuZ2UpOgorICAgICAgICAo V2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6cGVyZm9ybUNhY2hlVXBkYXRlVGltZXJGaXJlZCk6CisK IDIwMjEtMTEtMjkgIEVucmlxdWUgT2Nhw7FhIEdvbnrDoWxleiAgPGVvY2FuaGFAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtXUEVdIENvbnRyb2wgb24tZGlzayBtdWx0aW1lZGlh IGJ1ZmZlcmluZyB2aWEgdGhlIFdQRV9TSEVMTF9ESVNBQkxFX01FRElBX0RJU0tfQ0FDSEUgZW52 aXJvbm1lbnQgdmFyaWFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2Jq ZWN0Q2FjaGUuY3BwCmluZGV4IDJiNmVhZjgxN2M2ZmUzYjlmNTA2MjRkNjFhOTNmOWM4MjhiZjk2 ZmIuLmJiODliMmQzZjQxOWQwMWMxMzhkYTk0ODExNzBjNjlmOGNmMTdmYmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtOTgyLDE4ICs5 ODIsMTggQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQoQWNjZXNz aWJpbGl0eU9iamVjdCYgb2JqZWN0KQogICAgICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8g VGhpcyBtZXRob2QgaXMgbWVhbnQgYXMgYSBxdWljayB3YXkgb2YgbWFya2luZyBhIHBvcnRpb24g b2YgdGhlIGFjY2Vzc2liaWxpdHkgdHJlZSBkaXJ0eS4KICAgICBpZiAoIW9iamVjdC5ub2RlKCkg JiYgIW9iamVjdC5yZW5kZXJlcigpKQogICAgICAgICByZXR1cm47CiAKLSAgICBwb3N0Tm90aWZp Y2F0aW9uKCZvYmplY3QsIG9iamVjdC5kb2N1bWVudCgpLCBBWENoaWxkcmVuQ2hhbmdlZCk7Ci0K ICAgICAvLyBTaG91bGQgbWFrZSB0aGUgc3VidHJlZSBkaXJ0eSBzbyB0aGF0IGV2ZXJ5dGhpbmcg YmVsb3cgd2lsbCBiZSB1cGRhdGVkIGNvcnJlY3RseS4KICAgICBvYmplY3Quc2V0TmVlZHNUb1Vw ZGF0ZVN1YnRyZWUoKTsKIAogICAgIC8vIEdvIHVwIHRoZSBleGlzdGluZyBhbmNlc3RvcnMgY2hh aW4gYW5kIGZpcmUgdGhlIGFwcHJvcHJpYXRlIG5vdGlmaWNhdGlvbnMuCiAgICAgYm9vbCBzaG91 bGRVcGRhdGVQYXJlbnQgPSB0cnVlOwogICAgIGZvciAoYXV0byogcGFyZW50ID0gJm9iamVjdDsg cGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudE9iamVjdElmRXhpc3RzKCkpIHsKKyAgICAg ICAgaWYgKHBhcmVudC0+cGFyZW50T2JqZWN0SWZFeGlzdHMoKSAmJiBwYXJlbnQtPmhhc0lnbm9y ZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAgICAgIGNoaWxkcmVuQ2hhbmdlZChwYXJlbnQtPnBh cmVudE9iamVjdCgpKTsKKwogICAgICAgICBpZiAoc2hvdWxkVXBkYXRlUGFyZW50KQogICAgICAg ICAgICAgcGFyZW50LT5zZXROZWVkc1RvVXBkYXRlQ2hpbGRyZW4oKTsKIApAQCAtMTAxMiw2ICsx MDEyLDEyIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkKEFjY2Vz c2liaWxpdHlPYmplY3QmIG9iamVjdCkKICAgICAgICAgICAgIHNob3VsZFVwZGF0ZVBhcmVudCA9 IGZhbHNlOwogICAgICAgICB9CiAgICAgfQorCisjaWYgRU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNP TEFURURfVFJFRSkKKyAgICB1cGRhdGVJc29sYXRlZFRyZWUob2JqZWN0LCBBWENoaWxkcmVuQ2hh bmdlZCk7CisjZW5kaWYKKworICAgIHBvc3RQbGF0Zm9ybU5vdGlmaWNhdGlvbigmb2JqZWN0LCBB WENoaWxkcmVuQ2hhbmdlZCk7CiB9CiAKIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFuZGxlTWVudU9w ZW5lZChOb2RlKiBub2RlKQpAQCAtMTA4Myw2ICsxMDg5LDcgQEAgdm9pZCBBWE9iamVjdENhY2hl Ojpub3RpZmljYXRpb25Qb3N0VGltZXJGaXJlZCgpCiAgICAgLy8gSW4gdGVzdHMsIHBvc3Rpbmcg bm90aWZpY2F0aW9ucyBoYXMgYSB0ZW5kZW5jeSB0byBpbW1lZGlhdGVseSBxdWV1ZSB1cCBvdGhl ciBub3RpZmljYXRpb25zLCB3aGljaCBjYW4gbGVhZCB0byB1bmV4cGVjdGVkIGJlaGF2aW9yCiAg ICAgLy8gd2hlbiB0aGUgbm90aWZpY2F0aW9uIGxpc3QgaXMgY2xlYXJlZCBhdCB0aGUgZW5kLiBJ bnN0ZWFkIGNvcHkgdGhpcyBsaXN0IGF0IHRoZSBzdGFydC4KICAgICBhdXRvIG5vdGlmaWNhdGlv bnMgPSBXVEZNb3ZlKG1fbm90aWZpY2F0aW9uc1RvUG9zdCk7CisgICAgbV9ub3RpZmljYXRpb25z VG9Qb3N0LmNsZWFyKCk7CiAKICAgICAvLyBGaWx0ZXIgb3V0IHRoZSBub3RpZmljYXRpb25zIHRo YXQgYXJlIG5vdCBnb2luZyB0byBiZSBwb3N0ZWQgdG8gcGxhdGZvcm0gY2xpZW50cy4KICAgICBW ZWN0b3I8c3RkOjpwYWlyPFJlZlB0cjxBWENvcmVPYmplY3Q+LCBBWE5vdGlmaWNhdGlvbj4+IG5v dGlmaWNhdGlvbnNUb1Bvc3Q7CkBAIC0xMTAxLDI0ICsxMTA4LDE3IEBAIHZvaWQgQVhPYmplY3RD YWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQoKQogICAgICAgICB9CiAjZW5kaWYKIAot ICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlzIG1lbnUgcmVhbGx5IGlzIGEgbWVudS4gV2UgZG8g dGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBjcmVhdGUKLSAgICAgICAg Ly8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUgbWVudSBpcyBtYXJrZWQgYXMgb3BlbmluZy4KICAg ICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFYTWVudU9wZW5lZCkgeworICAgICAgICAgICAgLy8g T25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBpcyBpbiBmYWN0IGEgbWVudS4KICAgICAgICAgICAg IG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKTsKICAgICAgICAgICAgIGlm IChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAhPSBBY2Nlc3NpYmlsaXR5Um9sZTo6TWVudSkKICAg ICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChub3RlLnNl Y29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAmJiBub3RlLmZpcnN0LT5wYXJlbnRPYmplY3RJZkV4 aXN0cygpCi0gICAgICAgICAgICAmJiBkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pigqbm90 ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVkVmFsdWUoKSAhPSBub3RlLmZpcnN0LT5hY2Nlc3Np YmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAgICAgICBjaGlsZHJlbkNoYW5nZWQoZG93bmNhc3Q8 QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5maXJzdC0+cGFyZW50T2JqZWN0KCkpKTsKLQogICAg ICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFwcGVuZChub3RlKTsKICAgICB9CiAKICNpZiBFTkFC TEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQotICAgIC8vIEZJWE1FOiB0aGlzIHVwZGF0 ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBwcmVtYXR1cmUgaW4gc29tZSBjYXNlcy4KLSAgICAv LyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFuZ2VkIGFib3ZlIGlzIGhpdCwgd2Ugc2hvdWxkIHVw ZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZS4KICAgICB1 cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0aW9uc1RvUG9zdCk7CiAjZW5kaWYKIApAQCAtMTc5 OCwxMSArMTc5OCwxMSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5n ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgICAgICB1cGRhdGVJ c29sYXRlZFRyZWUoZ2V0KGVsZW1lbnQpLCBBWE9iamVjdENhY2hlOjpBWElkQXR0cmlidXRlQ2hh bmdlZCk7CiAjZW5kaWYKICAgICBlbHNlIGlmIChhdHRyTmFtZSA9PSBvcGVuQXR0ciAmJiBpczxI VE1MRGlhbG9nRWxlbWVudD4oKmVsZW1lbnQpKSB7CisgICAgICAgIGhhbmRsZUNoaWxkcmVuQ2hh bmdlZCgqZ2V0KGVsZW1lbnQtPnBhcmVudE5vZGUoKSkpOwogICAgICAgICBkZWZlck1vZGFsQ2hh bmdlKGVsZW1lbnQpOwogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVudC0+cGFyZW50 Tm9kZSgpKTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1lKCkuc3RyaW5n KCkuc3RhcnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0zMTkyLDggKzMx OTIsNiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQo KQogICAgICAgICByZXR1cm47CiAKICAgICBwZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZSgpOwot ICAgIC8vIEZJWE1FOiBuZWVkIHRvIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZSBhZnRlciB0aGUg YWJvdmUgY2FjaGUgdXBkYXRlLgotICAgIC8vIFRoaXMgaXMgbW9zdCBsaWtlbHkgdGhlIGNhdXNl IG9mIHByb2JsZW1zIHdpdGggdGhlIGlzb2xhdGVkIHRyZWUgdXBkYXRlcy4uCiB9CiAKIHZvaWQg QVhPYmplY3RDYWNoZTo6cGVyZm9ybURlZmVycmVkQ2FjaGVVcGRhdGUoKQo= 446647 2021-12-09 18:08:17 -0800 2021-12-13 17:48:45 -0800 Patch bug-234059-20211209210816.patch text/plain 6545 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjRjNzY4MjdkNzg1NzAw NTQ4ZTAwYTI5ZWY4ZTA0YzQ1NGI0NTY2OC4uZDlhZmFjMDEzZjY2NzE1ZWEwMzg1ZmQ4YTY0MzA3 Njg0YWRkY2ZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTEyLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyBvdmVyIDMwIGFjY2Vzc2liaWxp dHkgdGVzdHMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBBbHNvIGZpeGVzIGZsYWtp bmVzcyBpbiBhY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRtbC4KKworICAgICAgICBB WE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQgd2FzIHBvc3RpbmcgYW4gQVhDaGls ZHJlbkNoYW5nZWQKKyAgICAgICAgbm90aWZpY2F0aW9uIChwb3N0Tm90aWZpY2F0aW9uKSwgd2hp Y2ggY2F1c2VzIGEgZG91YmxlIGRlZmVycmFsIG9mIHRoZXNlCisgICAgICAgIG5vdGlmaWNhdGlv bnMsIGluc3RlYWQgb2YgYWN0dWFsbHkgaGFuZGxpbmcgdGhlIG5vdGlmaWNhdGlvbi4KKyAgICAg ICAgQ2hpbGRyZW5DaGFuZ2VkIG5vdGlmaWNhdGlvbnMgc2hvdWxkIGJlIGhhbmRsZWQgYmVmb3Jl IG1hbnkgb3RoZXIKKyAgICAgICAgbm90aWZpY2F0aW9ucyBvZiBwcm9wZXJ0eSBjaGFuZ2VzIHNp bmNlIHRoZXkgYXJlIERPTSBtdXRhdGlvbnMsIG9iamVjdHMKKyAgICAgICAgYWRkZWQgb3IgcmVt b3ZlZCwgYmVmb3JlIHByb3BlcnRpZXMgaW4gdGhlIHJlc3VsdGluZyBvYmplY3RzIG1heSBiZQor ICAgICAgICB1cGRhdGVkLiBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgcHJvYmxlbSBieSBtYWtpbmcg aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkCisgICAgICAgIHRvIGFjdHVhbGx5IGhhbmRsZSB0aGUgbm90 aWZpY2F0aW9ucyBhbmQgdXBkYXRlIHRoZSBpc29sYXRlZCB0cmVlLgorICAgICAgICBJbiB0aGUg cHJvY2VzcyBvZiBmaXhpbmcgdGhpcyBwcm9ibGVtLCBhbHNvIGZpeGVkIHRoZSBidWcgd2hlcmUK KyAgICAgICAgQVhPYmplY3RDYWNoZTo6bV9ub3RpZmljYXRpb25zVG9Qb3N0IHdhc24ndCBiZWlu ZyBjbGVhcmVkIGFmdGVyIG1vdmVkCisgICAgICAgIHdoaWNoIG1heSByZXN1bHQgb24gdW5kZWZp bmVkIGJlaGF2aW9yLgorICAgICAgICBJbiBhZGRpdGlvbiwgaGFuZGxpbmcgb2YgdGhlICJvcGVu IiBhdHRyaWJ1dGUgZm9yIDxkaWFsb2c+IGVsZW1lbnRzIG5vdworICAgICAgICB1cGRhdGVzIGNo aWxkcmVuLCB3aGljaCBmaXhlcyB0aGUgZmxha2luZXNzIG9ic2VydmVkIGluIHRoZQorICAgICAg ICBkaWFsb2ctc2hvd01vZGFsLmh0bWwgdGVzdC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpoYW5k bGVDaGlsZHJlbkNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6bm90 aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNo ZTo6ZGVmZXJNb2RhbENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpw ZXJmb3JtQ2FjaGVVcGRhdGVUaW1lckZpcmVkKToKKwogMjAyMS0xMi0wOSAgU2FpZCBBYm91LUhh bGxhd2EgIDxzYWlkQGFwcGxlLmNvbT4KIAogICAgICAgICBbR1BVIFByb2Nlc3NdIFtGaWx0ZXJz XSBBZGQgdGhlIGVuY29kaW5nIGFuZCBkZWNvZGluZyBmb3IgTGlnaHRTb3VyY2UKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IDNiZjM4ODNk ZDZhNjBkZjk1YWY4ZGQ3YzY4Yzk2NGNlMzVmNGY2MzQuLjJhOGFiOWQ3ZTUyOWM5OTg5MTVmZjhj NDdkN2UxY2ZmNWE1NzhmMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcApAQCAtOTgxLDE1ICs5ODEsMTYgQEAgdm9pZCBBWE9iamVjdENhY2hl OjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQogICAg ICAgICByZXR1cm47CiAgICAgfQogCi0gICAgLy8gVGhpcyBtZXRob2QgaXMgbWVhbnQgYXMgYSBx dWljayB3YXkgb2YgbWFya2luZyBhIHBvcnRpb24gb2YgdGhlIGFjY2Vzc2liaWxpdHkgdHJlZSBk aXJ0eS4KICAgICBpZiAoIW9iamVjdC5ub2RlKCkgJiYgIW9iamVjdC5yZW5kZXJlcigpKQogICAg ICAgICByZXR1cm47CiAKLSAgICBwb3N0Tm90aWZpY2F0aW9uKCZvYmplY3QsIG9iamVjdC5kb2N1 bWVudCgpLCBBWENoaWxkcmVuQ2hhbmdlZCk7Ci0KICAgICAvLyBTaG91bGQgbWFrZSB0aGUgc3Vi dHJlZSBkaXJ0eSBzbyB0aGF0IGV2ZXJ5dGhpbmcgYmVsb3cgd2lsbCBiZSB1cGRhdGVkIGNvcnJl Y3RseS4KICAgICBvYmplY3Quc2V0TmVlZHNUb1VwZGF0ZVN1YnRyZWUoKTsKIAorICAgIC8vIElm IGlzSWdub3JlZCBoYXMgY2hhbmdlZCBmb3Igb2JqZWN0LCBub3RpZnkgdGhhdCBDaGlsZHJlbkNo YW5nZWQgZm9yIGl0cyBwYXJlbnQuCisgICAgaWYgKG9iamVjdC5wYXJlbnRPYmplY3RJZkV4aXN0 cygpICYmIG9iamVjdC5oYXNJZ25vcmVkVmFsdWVDaGFuZ2VkKCkpCisgICAgICAgIGNoaWxkcmVu Q2hhbmdlZChvYmplY3QucGFyZW50T2JqZWN0KCkpOworCiAgICAgLy8gR28gdXAgdGhlIGV4aXN0 aW5nIGFuY2VzdG9ycyBjaGFpbiBhbmQgZmlyZSB0aGUgYXBwcm9wcmlhdGUgbm90aWZpY2F0aW9u cy4KICAgICBib29sIHNob3VsZFVwZGF0ZVBhcmVudCA9IHRydWU7CiAgICAgZm9yIChhdXRvKiBw YXJlbnQgPSAmb2JqZWN0OyBwYXJlbnQ7IHBhcmVudCA9IHBhcmVudC0+cGFyZW50T2JqZWN0SWZF eGlzdHMoKSkgewpAQCAtMTAxMSw2ICsxMDEyLDEyIEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFu ZGxlQ2hpbGRyZW5DaGFuZ2VkKEFjY2Vzc2liaWxpdHlPYmplY3QmIG9iamVjdCkKICAgICAgICAg ICAgIHNob3VsZFVwZGF0ZVBhcmVudCA9IGZhbHNlOwogICAgICAgICB9CiAgICAgfQorCisjaWYg RU5BQkxFKEFDQ0VTU0lCSUxJVFlfSVNPTEFURURfVFJFRSkKKyAgICB1cGRhdGVJc29sYXRlZFRy ZWUob2JqZWN0LCBBWENoaWxkcmVuQ2hhbmdlZCk7CisjZW5kaWYKKworICAgIHBvc3RQbGF0Zm9y bU5vdGlmaWNhdGlvbigmb2JqZWN0LCBBWENoaWxkcmVuQ2hhbmdlZCk7CiB9CiAKIHZvaWQgQVhP YmplY3RDYWNoZTo6aGFuZGxlTWVudU9wZW5lZChOb2RlKiBub2RlKQpAQCAtMTA4Miw2ICsxMDg5 LDcgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpub3RpZmljYXRpb25Qb3N0VGltZXJGaXJlZCgpCiAg ICAgLy8gSW4gdGVzdHMsIHBvc3Rpbmcgbm90aWZpY2F0aW9ucyBoYXMgYSB0ZW5kZW5jeSB0byBp bW1lZGlhdGVseSBxdWV1ZSB1cCBvdGhlciBub3RpZmljYXRpb25zLCB3aGljaCBjYW4gbGVhZCB0 byB1bmV4cGVjdGVkIGJlaGF2aW9yCiAgICAgLy8gd2hlbiB0aGUgbm90aWZpY2F0aW9uIGxpc3Qg aXMgY2xlYXJlZCBhdCB0aGUgZW5kLiBJbnN0ZWFkIGNvcHkgdGhpcyBsaXN0IGF0IHRoZSBzdGFy dC4KICAgICBhdXRvIG5vdGlmaWNhdGlvbnMgPSBXVEZNb3ZlKG1fbm90aWZpY2F0aW9uc1RvUG9z dCk7CisgICAgbV9ub3RpZmljYXRpb25zVG9Qb3N0LmNsZWFyKCk7CiAKICAgICAvLyBGaWx0ZXIg b3V0IHRoZSBub3RpZmljYXRpb25zIHRoYXQgYXJlIG5vdCBnb2luZyB0byBiZSBwb3N0ZWQgdG8g cGxhdGZvcm0gY2xpZW50cy4KICAgICBWZWN0b3I8c3RkOjpwYWlyPFJlZlB0cjxBWENvcmVPYmpl Y3Q+LCBBWE5vdGlmaWNhdGlvbj4+IG5vdGlmaWNhdGlvbnNUb1Bvc3Q7CkBAIC0xMTAwLDI0ICsx MTA4LDE3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQo KQogICAgICAgICB9CiAjZW5kaWYKIAotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlzIG1lbnUg cmVhbGx5IGlzIGEgbWVudS4gV2UgZG8gdGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2UgZG9uJ3Qg aGF2ZSB0byBjcmVhdGUKLSAgICAgICAgLy8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUgbWVudSBp cyBtYXJrZWQgYXMgb3BlbmluZy4KICAgICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFYTWVudU9w ZW5lZCkgeworICAgICAgICAgICAgLy8gT25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBpcyBpbiBm YWN0IGEgbWVudS4KICAgICAgICAgICAgIG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVuSWZOZWNl c3NhcnkoKTsKICAgICAgICAgICAgIGlmIChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAhPSBBY2Nl c3NpYmlsaXR5Um9sZTo6TWVudSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQogCi0gICAgICAgIGlmIChub3RlLnNlY29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAmJiBub3Rl LmZpcnN0LT5wYXJlbnRPYmplY3RJZkV4aXN0cygpCi0gICAgICAgICAgICAmJiBkb3duY2FzdDxB Y2Nlc3NpYmlsaXR5T2JqZWN0Pigqbm90ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVkVmFsdWUo KSAhPSBub3RlLmZpcnN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAgICAgICBj aGlsZHJlbkNoYW5nZWQoZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5maXJzdC0+ cGFyZW50T2JqZWN0KCkpKTsKLQogICAgICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFwcGVuZChu b3RlKTsKICAgICB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQot ICAgIC8vIEZJWE1FOiB0aGlzIHVwZGF0ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBwcmVtYXR1 cmUgaW4gc29tZSBjYXNlcy4KLSAgICAvLyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFuZ2VkIGFi b3ZlIGlzIGhpdCwgd2Ugc2hvdWxkIHVwZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJmb3JtRGVm ZXJyZWRDYWNoZVVwZGF0ZS4KICAgICB1cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0aW9uc1Rv UG9zdCk7CiAjZW5kaWYKIApAQCAtMTI0Miw4ICsxMjQzLDE0IEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6ZGVmZXJNZW51TGlzdFZhbHVlQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiAKIHZvaWQgQVhP YmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5nZShFbGVtZW50KiBlbGVtZW50KQogewotICAgIGlm IChlbGVtZW50KQorICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIG1fZGVmZXJyZWRNb2RhbENo YW5nZWRMaXN0LmFkZCgqZWxlbWVudCk7CisKKyAgICAgICAgLy8gTm90aWZ5IHRoYXQgcGFyZW50 J3MgY2hpbGRyZW4gaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoYXV0byogYXhQYXJlbnQgPSBn ZXQoZWxlbWVudC0+cGFyZW50Tm9kZSgpKSkKKyAgICAgICAgICAgIG1fZGVmZXJyZWRDaGlsZHJl bkNoYW5nZWRMaXN0LmFkZChheFBhcmVudCk7CisgICAgfQorCiAgICAgaWYgKCFtX3BlcmZvcm1D YWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fcGVyZm9ybUNhY2hlVXBkYXRl VGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CkBAIC0xODAxLDcgKzE4MDgsNiBAQCB2b2lkIEFY T2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZpZWROYW1lJiBh dHRyTmFtZSwgRWxlbWVudAogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVudC0+cGFy ZW50Tm9kZSgpKTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1lKCkuc3Ry aW5nKCkuc3RhcnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0zMTkxLDgg KzMxOTcsNiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmly ZWQoKQogICAgICAgICByZXR1cm47CiAKICAgICBwZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZSgp OwotICAgIC8vIEZJWE1FOiBuZWVkIHRvIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZSBhZnRlciB0 aGUgYWJvdmUgY2FjaGUgdXBkYXRlLgotICAgIC8vIFRoaXMgaXMgbW9zdCBsaWtlbHkgdGhlIGNh dXNlIG9mIHByb2JsZW1zIHdpdGggdGhlIGlzb2xhdGVkIHRyZWUgdXBkYXRlcy4uCiB9CiAKIHZv aWQgQVhPYmplY3RDYWNoZTo6cGVyZm9ybURlZmVycmVkQ2FjaGVVcGRhdGUoKQo= 447090 2021-12-13 17:48:48 -0800 2021-12-15 19:10:13 -0800 Patch bug-234059-20211213204847.patch text/plain 15078 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjOTg2ZDgyNjE5Y2I4 MjlkNmUyYjY4NTI4ZWZkZWY5YTliZjZhYi4uMTlhZDgxNWY2MmZkODRkMjk0NGY3MzcwMDMxMDYz YTAyYjVkNDY2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDIxLTEyLTEzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyBvdmVyIDMwIGFjY2Vzc2liaWxp dHkgdGVzdHMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBBbHNvIGZpeGVzIGZsYWtp bmVzcyBpbiBhY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRtbC4KKworICAgICAgICBB WE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQgd2FzIHBvc3RpbmcgYW4gQVhDaGls ZHJlbkNoYW5nZWQKKyAgICAgICAgbm90aWZpY2F0aW9uIChwb3N0Tm90aWZpY2F0aW9uKSwgd2hp Y2ggY2F1c2VzIGEgZG91YmxlIGRlZmVycmFsIG9mIHRoZXNlCisgICAgICAgIG5vdGlmaWNhdGlv bnMsIGluc3RlYWQgb2YgYWN0dWFsbHkgaGFuZGxpbmcgdGhlIG5vdGlmaWNhdGlvbi4KKyAgICAg ICAgQ2hpbGRyZW5DaGFuZ2VkIG5vdGlmaWNhdGlvbnMgc2hvdWxkIGJlIGhhbmRsZWQgYmVmb3Jl IG1hbnkgb3RoZXIKKyAgICAgICAgbm90aWZpY2F0aW9ucyBvZiBwcm9wZXJ0eSBjaGFuZ2VzIHNp bmNlIHRoZXkgYXJlIERPTSBtdXRhdGlvbnMsIG9iamVjdHMKKyAgICAgICAgYWRkZWQgb3IgcmVt b3ZlZCwgYmVmb3JlIHByb3BlcnRpZXMgaW4gdGhlIHJlc3VsdGluZyBvYmplY3RzIG1heSBiZQor ICAgICAgICB1cGRhdGVkLiBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgcHJvYmxlbSBieSBtYWtpbmcg aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkCisgICAgICAgIHRvIGFjdHVhbGx5IGhhbmRsZSB0aGUgbm90 aWZpY2F0aW9ucyBhbmQgdXBkYXRlIHRoZSBpc29sYXRlZCB0cmVlLgorICAgICAgICBJbiB0aGUg cHJvY2VzcyBvZiBmaXhpbmcgdGhpcyBwcm9ibGVtLCBhbHNvIGZpeGVkIHRoZSBidWcgd2hlcmUK KyAgICAgICAgQVhPYmplY3RDYWNoZTo6bV9ub3RpZmljYXRpb25zVG9Qb3N0IHdhc24ndCBiZWlu ZyBjbGVhcmVkIGFmdGVyIG1vdmVkCisgICAgICAgIHdoaWNoIG1heSByZXN1bHQgb24gdW5kZWZp bmVkIGJlaGF2aW9yLgorICAgICAgICBJbiBhZGRpdGlvbiwgaGFuZGxpbmcgb2YgdGhlICJvcGVu IiBhdHRyaWJ1dGUgZm9yIDxkaWFsb2c+IGVsZW1lbnRzIG5vdworICAgICAgICB1cGRhdGVzIGNo aWxkcmVuLCB3aGljaCBmaXhlcyB0aGUgZmxha2luZXNzIG9ic2VydmVkIGluIHRoZQorICAgICAg ICBkaWFsb2ctc2hvd01vZGFsLmh0bWwgdGVzdC4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkv QVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpoYW5k bGVDaGlsZHJlbkNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6bm90 aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQpOgorICAgICAgICAoV2ViQ29yZTo6QVhPYmplY3RDYWNo ZTo6ZGVmZXJNb2RhbENoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpw ZXJmb3JtQ2FjaGVVcGRhdGVUaW1lckZpcmVkKToKKwogMjAyMS0xMi0xMCAgQWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBFbmFibGUgYmlkaSBoYW5k bGluZyBmb3IgY29udGVudCB3aXRoIGlubGluZSBib3hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXggM2JmMzg4M2RkNmE2MGRmOTVhZjhk ZDdjNjhjOTY0Y2UzNWY0ZjYzNC4uMmE4YWI5ZDdlNTI5Yzk5ODkxNWZmOGM0N2Q3ZTFjZmY1YTU3 OGYyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUu Y3BwCkBAIC05ODEsMTUgKzk4MSwxNiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUNoaWxk cmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0JiBvYmplY3QpCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKLSAgICAvLyBUaGlzIG1ldGhvZCBpcyBtZWFudCBhcyBhIHF1aWNrIHdheSBvZiBt YXJraW5nIGEgcG9ydGlvbiBvZiB0aGUgYWNjZXNzaWJpbGl0eSB0cmVlIGRpcnR5LgogICAgIGlm ICghb2JqZWN0Lm5vZGUoKSAmJiAhb2JqZWN0LnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybjsK IAotICAgIHBvc3ROb3RpZmljYXRpb24oJm9iamVjdCwgb2JqZWN0LmRvY3VtZW50KCksIEFYQ2hp bGRyZW5DaGFuZ2VkKTsKLQogICAgIC8vIFNob3VsZCBtYWtlIHRoZSBzdWJ0cmVlIGRpcnR5IHNv IHRoYXQgZXZlcnl0aGluZyBiZWxvdyB3aWxsIGJlIHVwZGF0ZWQgY29ycmVjdGx5LgogICAgIG9i amVjdC5zZXROZWVkc1RvVXBkYXRlU3VidHJlZSgpOwogCisgICAgLy8gSWYgaXNJZ25vcmVkIGhh cyBjaGFuZ2VkIGZvciBvYmplY3QsIG5vdGlmeSB0aGF0IENoaWxkcmVuQ2hhbmdlZCBmb3IgaXRz IHBhcmVudC4KKyAgICBpZiAob2JqZWN0LnBhcmVudE9iamVjdElmRXhpc3RzKCkgJiYgb2JqZWN0 Lmhhc0lnbm9yZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAgY2hpbGRyZW5DaGFuZ2VkKG9iamVj dC5wYXJlbnRPYmplY3QoKSk7CisKICAgICAvLyBHbyB1cCB0aGUgZXhpc3RpbmcgYW5jZXN0b3Jz IGNoYWluIGFuZCBmaXJlIHRoZSBhcHByb3ByaWF0ZSBub3RpZmljYXRpb25zLgogICAgIGJvb2wg c2hvdWxkVXBkYXRlUGFyZW50ID0gdHJ1ZTsKICAgICBmb3IgKGF1dG8qIHBhcmVudCA9ICZvYmpl Y3Q7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRPYmplY3RJZkV4aXN0cygpKSB7CkBA IC0xMDExLDYgKzEwMTIsMTIgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNo YW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQogICAgICAgICAgICAgc2hvdWxkVXBk YXRlUGFyZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CisKKyNpZiBFTkFCTEUoQUNDRVNT SUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlzb2xhdGVkVHJlZShvYmplY3QsIEFY Q2hpbGRyZW5DaGFuZ2VkKTsKKyNlbmRpZgorCisgICAgcG9zdFBsYXRmb3JtTm90aWZpY2F0aW9u KCZvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKIH0KIAogdm9pZCBBWE9iamVjdENhY2hlOjpo YW5kbGVNZW51T3BlbmVkKE5vZGUqIG5vZGUpCkBAIC0xMDgyLDYgKzEwODksNyBAQCB2b2lkIEFY T2JqZWN0Q2FjaGU6Om5vdGlmaWNhdGlvblBvc3RUaW1lckZpcmVkKCkKICAgICAvLyBJbiB0ZXN0 cywgcG9zdGluZyBub3RpZmljYXRpb25zIGhhcyBhIHRlbmRlbmN5IHRvIGltbWVkaWF0ZWx5IHF1 ZXVlIHVwIG90aGVyIG5vdGlmaWNhdGlvbnMsIHdoaWNoIGNhbiBsZWFkIHRvIHVuZXhwZWN0ZWQg YmVoYXZpb3IKICAgICAvLyB3aGVuIHRoZSBub3RpZmljYXRpb24gbGlzdCBpcyBjbGVhcmVkIGF0 IHRoZSBlbmQuIEluc3RlYWQgY29weSB0aGlzIGxpc3QgYXQgdGhlIHN0YXJ0LgogICAgIGF1dG8g bm90aWZpY2F0aW9ucyA9IFdURk1vdmUobV9ub3RpZmljYXRpb25zVG9Qb3N0KTsKKyAgICBtX25v dGlmaWNhdGlvbnNUb1Bvc3QuY2xlYXIoKTsKIAogICAgIC8vIEZpbHRlciBvdXQgdGhlIG5vdGlm aWNhdGlvbnMgdGhhdCBhcmUgbm90IGdvaW5nIHRvIGJlIHBvc3RlZCB0byBwbGF0Zm9ybSBjbGll bnRzLgogICAgIFZlY3RvcjxzdGQ6OnBhaXI8UmVmUHRyPEFYQ29yZU9iamVjdD4sIEFYTm90aWZp Y2F0aW9uPj4gbm90aWZpY2F0aW9uc1RvUG9zdDsKQEAgLTExMDAsMjQgKzExMDgsMTcgQEAgdm9p ZCBBWE9iamVjdENhY2hlOjpub3RpZmljYXRpb25Qb3N0VGltZXJGaXJlZCgpCiAgICAgICAgIH0K ICNlbmRpZgogCi0gICAgICAgIC8vIEVuc3VyZSB0aGF0IHRoaXMgbWVudSByZWFsbHkgaXMgYSBt ZW51LiBXZSBkbyB0aGlzIGNoZWNrIGhlcmUgc28gdGhhdCB3ZSBkb24ndCBoYXZlIHRvIGNyZWF0 ZQotICAgICAgICAvLyB0aGUgYXhDaGlsZHJlbiB3aGVuIHRoZSBtZW51IGlzIG1hcmtlZCBhcyBv cGVuaW5nLgogICAgICAgICBpZiAobm90ZS5zZWNvbmQgPT0gQVhNZW51T3BlbmVkKSB7CisgICAg ICAgICAgICAvLyBPbmx5IG5vdGlmeSBpZiB0aGUgb2JqZWN0IGlzIGluIGZhY3QgYSBtZW51Lgog ICAgICAgICAgICAgbm90ZS5maXJzdC0+dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOwogICAg ICAgICAgICAgaWYgKG5vdGUuZmlyc3QtPnJvbGVWYWx1ZSgpICE9IEFjY2Vzc2liaWxpdHlSb2xl OjpNZW51KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAg aWYgKG5vdGUuc2Vjb25kID09IEFYQ2hpbGRyZW5DaGFuZ2VkICYmIG5vdGUuZmlyc3QtPnBhcmVu dE9iamVjdElmRXhpc3RzKCkKLSAgICAgICAgICAgICYmIGRvd25jYXN0PEFjY2Vzc2liaWxpdHlP YmplY3Q+KCpub3RlLmZpcnN0KS5sYXN0S25vd25Jc0lnbm9yZWRWYWx1ZSgpICE9IG5vdGUuZmly c3QtPmFjY2Vzc2liaWxpdHlJc0lnbm9yZWQoKSkKLSAgICAgICAgICAgIGNoaWxkcmVuQ2hhbmdl ZChkb3duY2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pihub3RlLmZpcnN0LT5wYXJlbnRPYmplY3Qo KSkpOwotCiAgICAgICAgIG5vdGlmaWNhdGlvbnNUb1Bvc3QuYXBwZW5kKG5vdGUpOwogICAgIH0K IAogI2lmIEVOQUJMRShBQ0NFU1NJQklMSVRZX0lTT0xBVEVEX1RSRUUpCi0gICAgLy8gRklYTUU6 IHRoaXMgdXBkYXRlSXNvbGF0ZWRUcmVlIGhlcmUgbWF5IGJlIHByZW1hdHVyZSBpbiBzb21lIGNh c2VzLgotICAgIC8vIEUuZy4sIGlmIHRoZSBjaGlsZHJlbkNoYW5nZWQgYWJvdmUgaXMgaGl0LCB3 ZSBzaG91bGQgdXBkYXRlSXNvbGF0ZWRUcmVlIGFmdGVyIHBlcmZvcm1EZWZlcnJlZENhY2hlVXBk YXRlLgogICAgIHVwZGF0ZUlzb2xhdGVkVHJlZShub3RpZmljYXRpb25zVG9Qb3N0KTsKICNlbmRp ZgogCkBAIC0xMjQyLDggKzEyNDMsMTQgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpkZWZlck1lbnVM aXN0VmFsdWVDaGFuZ2UoRWxlbWVudCogZWxlbWVudCkKIAogdm9pZCBBWE9iamVjdENhY2hlOjpk ZWZlck1vZGFsQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiB7Ci0gICAgaWYgKGVsZW1lbnQpCisg ICAgaWYgKGVsZW1lbnQpIHsKICAgICAgICAgbV9kZWZlcnJlZE1vZGFsQ2hhbmdlZExpc3QuYWRk KCplbGVtZW50KTsKKworICAgICAgICAvLyBOb3RpZnkgdGhhdCBwYXJlbnQncyBjaGlsZHJlbiBo YXZlIGNoYW5nZWQuCisgICAgICAgIGlmIChhdXRvKiBheFBhcmVudCA9IGdldChlbGVtZW50LT5w YXJlbnROb2RlKCkpKQorICAgICAgICAgICAgbV9kZWZlcnJlZENoaWxkcmVuQ2hhbmdlZExpc3Qu YWRkKGF4UGFyZW50KTsKKyAgICB9CisKICAgICBpZiAoIW1fcGVyZm9ybUNhY2hlVXBkYXRlVGlt ZXIuaXNBY3RpdmUoKSkKICAgICAgICAgbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lci5zdGFydE9u ZVNob3QoMF9zKTsKIH0KQEAgLTE4MDEsNyArMTgwOCw2IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6 aGFuZGxlQXR0cmlidXRlQ2hhbmdlKGNvbnN0IFF1YWxpZmllZE5hbWUmIGF0dHJOYW1lLCBFbGVt ZW50CiAgICAgICAgIHJlY29tcHV0ZUlzSWdub3JlZChlbGVtZW50LT5wYXJlbnROb2RlKCkpOwog ICAgIH0KIAotCiAgICAgaWYgKCFhdHRyTmFtZS5sb2NhbE5hbWUoKS5zdHJpbmcoKS5zdGFydHNX aXRoKCJhcmlhLSIpKQogICAgICAgICByZXR1cm47CiAKQEAgLTMxOTEsOCArMzE5Nyw2IEBAIHZv aWQgQVhPYmplY3RDYWNoZTo6cGVyZm9ybUNhY2hlVXBkYXRlVGltZXJGaXJlZCgpCiAgICAgICAg IHJldHVybjsKIAogICAgIHBlcmZvcm1EZWZlcnJlZENhY2hlVXBkYXRlKCk7Ci0gICAgLy8gRklY TUU6IG5lZWQgdG8gdXBkYXRlIHRoZSBpc29sYXRlZCB0cmVlIGFmdGVyIHRoZSBhYm92ZSBjYWNo ZSB1cGRhdGUuCi0gICAgLy8gVGhpcyBpcyBtb3N0IGxpa2VseSB0aGUgY2F1c2Ugb2YgcHJvYmxl bXMgd2l0aCB0aGUgaXNvbGF0ZWQgdHJlZSB1cGRhdGVzLi4KIH0KIAogdm9pZCBBWE9iamVjdENh Y2hlOjpwZXJmb3JtRGVmZXJyZWRDYWNoZVVwZGF0ZSgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjJlMDE1ZDYzMDg2NDA5 NGIwZmJkY2U5OTk4NGIxY2U0M2ViZDhkOC4uNzY1YTMzYjhiNzQxNTIwMWRiMzg4NzkwNzdjZDAw ZTg5ZDQ0YmYzMSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIxLTEyLTEzICBBbmRyZXMgR29u emFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBBWE9iamVj dENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMg RmxlaXphY2guCisKKyAgICAgICAgTWFrZSB0aGUgZm9sbG93aW5nIHRlc3RzIGFzeW5jOgorCisg ICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3MuaHRtbDoK KyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRtbDoKKwogMjAyMS0x Mi0xMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZD XSBFbmFibGUgYmlkaSBoYW5kbGluZyBmb3IgY29udGVudCB3aXRoIGlubGluZSBib3hlcwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRp YWxvZ3MuaHRtbCBiL0xheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1tb2RhbC1tdWx0aXBs ZS1kaWFsb2dzLmh0bWwKaW5kZXggMjgyYWFlNGZiMjE2OTM1MTZiYTEwMjdiZDlmOWI5ZDZjMjJk ZTYwYS4uNWE3OTM3ZmM2M2RjMDdlMzNkZGVhMmIyMDlmNmVhZWNiMGM4M2I1NyAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9hcmlhLW1vZGFsLW11bHRpcGxlLWRpYWxvZ3Mu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtbW9kYWwtbXVsdGlwbGUt ZGlhbG9ncy5odG1sCkBAIC0xLDcgKzEsOCBAQAogPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9J RVRGLy9EVEQgSFRNTC8vRU4iPgogPGh0bWw+CiA8aGVhZD4KLTxzY3JpcHQgc3JjPSIuLi9yZXNv dXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNl cy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvYWNjZXNz aWJpbGl0eS1oZWxwZXIuanMiPjwvc2NyaXB0PgogPC9oZWFkPgogCiA8c3R5bGU+CkBAIC0yOCwz NyArMjksNTMgQEAKICAgICA8YnV0dG9uIGlkPSJjbG9zZSIgb25jbGljaz0idG9nZ2xlRGlhbG9n KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdib3gyJyksJ2hpZGUnKTsiIGNsYXNzPSJjbG9zZS1i dXR0b24iPkNsb3NlPC9idXR0b24+CiA8L2Rpdj4KIAotCiA8c2NyaXB0PgotCiAgICAgZGVzY3Jp cHRpb24oIlRoaXMgdGVzdHMgdGhhdCBhcmlhLW1vZGFsIHdvcmtzIGNvcnJlY3RseSBvbiBtdWx0 aXBsZSBkaWFsb2dzIik7CisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOwogCiAgICAg aWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewogICAgICAgICAvLyBCYWNrZ3Jv dW5kIHNob3VsZCBiZSBhY2Nlc3NpYmxlIGFmdGVyIGxvYWRpbmcuCiAgICAgICAgIHNob3VsZEJl VHJ1ZSgiYmFja2dyb3VuZEFjY2Vzc2libGUoKSIpOwotICAgICAgICAKLSAgICAgICAgLy8gQ2xp Y2sgdGhlIGRpc3BsYXkgYnV0dG9uLCBkaWFsb2cxIHNob3dzIGFuZCBiYWNrZ3JvdW5kIGJlY29t ZXMgdW5hY2Nlc3NpYmxlLgotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGlzcGxh eUJ0biIpLmNsaWNrKCk7Ci0gICAgICAgIHNob3VsZEJlRmFsc2UoImJhY2tncm91bmRBY2Nlc3Np YmxlKCkiKTsKLSAgICAgICAgc2hvdWxkQmVUcnVlKCJkaWFsb2cxQWNjZXNzaWJsZSgpIik7Ci0g ICAgICAgIAotICAgICAgICAvLyBDbGljayB0aGUgbmV3IGJ1dHRvbiwgZGlhbG9nMiBzaG93cyBh bmQgYmFja2dyb3VuZC9kaWFsb2cxIHNob3VsZCBib3RoIGJlIHVuYWNjZXNzaWJsZS4KLSAgICAg ICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm5ldyIpLmNsaWNrKCk7Ci0gICAgICAgIHNob3Vs ZEJlRmFsc2UoImJhY2tncm91bmRBY2Nlc3NpYmxlKCkiKTsKLSAgICAgICAgc2hvdWxkQmVGYWxz ZSgiZGlhbG9nMUFjY2Vzc2libGUoKSIpOwotICAgICAgICB2YXIgY2xvc2VCdG4gPSBhY2Nlc3Np YmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoImNsb3NlIik7Ci0gICAgICAg IHNob3VsZEJlRmFsc2UoImNsb3NlQnRuLmlzSWdub3JlZCIpOwotICAgICAgICAKLSAgICAgICAg Ly8gQ2xvc2UgZGlhbG9nMiwgZGlhbG9nMSBzaG91bGQgYmVjb21lIGFjY2Vzc2libGUgYnV0IG5v dCB0aGUgYmFja2dyb3VuZAotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY2xvc2Ui KS5jbGljaygpOwotICAgICAgICBzaG91bGRCZUZhbHNlKCJiYWNrZ3JvdW5kQWNjZXNzaWJsZSgp Iik7Ci0gICAgICAgIHNob3VsZEJlVHJ1ZSgiZGlhbG9nMUFjY2Vzc2libGUoKSIpOwotICAgICAg ICAKLSAgICAgICAgLy8gQ2xvc2UgZGlhbG9nMSwgYmFja2dyb3VuZCBzaG91bGQgYmUgYWNjZXNz aWJsZS4KLSAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm9rIikuY2xpY2soKTsKLSAg ICAgICAgc2hvdWxkQmVUcnVlKCJiYWNrZ3JvdW5kQWNjZXNzaWJsZSgpIik7CisKKyAgICAgICAg c2V0VGltZW91dChhc3luYyAoKSA9PiB7CisgICAgICAgICAgICAvLyBDbGljayB0aGUgZGlzcGxh eSBidXR0b24sIGRpYWxvZzEgc2hvd3MgYW5kIGJhY2tncm91bmQgYmVjb21lcyB1bmFjY2Vzc2li bGUuCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiZGlzcGxheUJ0biIpLmNs aWNrKCk7CisgICAgICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKKyAgICAgICAgICAgICAg ICByZXR1cm4gIWJhY2tncm91bmRBY2Nlc3NpYmxlKCkgJiYgZGlhbG9nMUFjY2Vzc2libGUoKTsK KyAgICAgICAgICAgIH0pOworICAgICAgICAgICAgc2hvdWxkQmVGYWxzZSgiYmFja2dyb3VuZEFj Y2Vzc2libGUoKSIpOworICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJkaWFsb2cxQWNjZXNzaWJs ZSgpIik7CisKKyAgICAgICAgICAgIC8vIENsaWNrIHRoZSBuZXcgYnV0dG9uLCBkaWFsb2cyIHNo b3dzIGFuZCBiYWNrZ3JvdW5kL2RpYWxvZzEgc2hvdWxkIGJvdGggYmUgdW5hY2Nlc3NpYmxlLgor ICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoIm5ldyIpLmNsaWNrKCk7CisgICAg ICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKKyAgICAgICAgICAgICAgICByZXR1cm4gIWJh Y2tncm91bmRBY2Nlc3NpYmxlKCkgJiYgIWRpYWxvZzFBY2Nlc3NpYmxlKCk7CisgICAgICAgICAg ICB9KTsKKyAgICAgICAgICAgIHNob3VsZEJlRmFsc2UoImJhY2tncm91bmRBY2Nlc3NpYmxlKCki KTsKKyAgICAgICAgICAgIHNob3VsZEJlRmFsc2UoImRpYWxvZzFBY2Nlc3NpYmxlKCkiKTsKKwor ICAgICAgICAgICAgd2luZG93LmNsb3NlQnRuID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNj ZXNzaWJsZUVsZW1lbnRCeUlkKCJjbG9zZSIpOworICAgICAgICAgICAgc2hvdWxkQmVGYWxzZSgi Y2xvc2VCdG4uaXNJZ25vcmVkIik7CisKKyAgICAgICAgICAgIC8vIENsb3NlIGRpYWxvZzIsIGRp YWxvZzEgc2hvdWxkIGJlY29tZSBhY2Nlc3NpYmxlIGJ1dCBub3QgdGhlIGJhY2tncm91bmQKKyAg ICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjbG9zZSIpLmNsaWNrKCk7CisgICAg ICAgICAgICBhd2FpdCB3YWl0Rm9yKCgpID0+IHsKKyAgICAgICAgICAgICAgICByZXR1cm4gIWJh Y2tncm91bmRBY2Nlc3NpYmxlKCkgJiYgZGlhbG9nMUFjY2Vzc2libGUoKTsKKyAgICAgICAgICAg IH0pOworICAgICAgICAgICAgc2hvdWxkQmVGYWxzZSgiYmFja2dyb3VuZEFjY2Vzc2libGUoKSIp OworICAgICAgICAgICAgc2hvdWxkQmVUcnVlKCJkaWFsb2cxQWNjZXNzaWJsZSgpIik7CisKKyAg ICAgICAgICAgIC8vIENsb3NlIGRpYWxvZzEsIGJhY2tncm91bmQgc2hvdWxkIGJlIGFjY2Vzc2li bGUuCisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgib2siKS5jbGljaygpOwor ICAgICAgICAgICAgYXdhaXQgd2FpdEZvcigoKSA9PiB7CisgICAgICAgICAgICAgICAgcmV0dXJu IGJhY2tncm91bmRBY2Nlc3NpYmxlKCk7CisgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgIHNo b3VsZEJlVHJ1ZSgiYmFja2dyb3VuZEFjY2Vzc2libGUoKSIpOworCisgICAgICAgICAgICBmaW5p c2hKU1Rlc3QoKTsKKyAgICAgICAgfSwgMCk7CiAgICAgfQotICAgIAorCiAgICAgZnVuY3Rpb24g YmFja2dyb3VuZEFjY2Vzc2libGUoKSB7CiAgICAgICAgIHZhciBkaXNwbGF5QnRuID0gYWNjZXNz aWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJkaXNwbGF5QnRuIik7CiAg ICAgICAgIHZhciBiZ0NvbnRlbnQgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxl RWxlbWVudEJ5SWQoImJnQ29udGVudCIpOwpAQCAtNjYsMjkgKzgzLDM0IEBACiAgICAgICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgICAgIHJldHVybiAhZGlzcGxheUJ0bi5pc0lnbm9yZWQgJiYg IWJnQ29udGVudC5pc0lnbm9yZWQ7CiAgICAgfQotICAgIAorCiAgICAgZnVuY3Rpb24gZGlhbG9n MUFjY2Vzc2libGUoKSB7Ci0gICAgICAgICB2YXIgb2tCdG4gPSBhY2Nlc3NpYmlsaXR5Q29udHJv bGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoIm9rIik7Ci0gICAgICAgICB2YXIgbmV3QnRuID0g YWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJuZXciKTsKLSAg ICAgICAgIGlmICghb2tCdG4gfHwgIW5ld0J0bikKLSAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 Ci0gICAgICAgICByZXR1cm4gIW9rQnRuLmlzSWdub3JlZCAmJiAhbmV3QnRuLmlzSWdub3JlZDsK KyAgICAgICAgdmFyIG9rQnRuID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVs ZW1lbnRCeUlkKCJvayIpOworICAgICAgICB2YXIgbmV3QnRuID0gYWNjZXNzaWJpbGl0eUNvbnRy b2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJuZXciKTsKKyAgICAgICAgaWYgKCFva0J0biB8 fCAhbmV3QnRuKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4gIW9r QnRuLmlzSWdub3JlZCAmJiAhbmV3QnRuLmlzSWdub3JlZDsKICAgICB9Ci0gICAgCi0gICAgZnVu Y3Rpb24gdG9nZ2xlRGlhbG9nKGRpYWxvZywgc2gpIHsKLSAgICBpZiAoc2ggPT0gInNob3ciKSB7 Ci0gICAgICAgIC8vIHNob3cgdGhlIGRpYWxvZyAKLSAgICAgICAgZGlhbG9nLnN0eWxlLmRpc3Bs YXkgPSAnYmxvY2snOwotICAgICAgICBkaWFsb2cuc2V0QXR0cmlidXRlKCJhcmlhLW1vZGFsIiwg InRydWUiKTsKLSAgICB9IGVsc2UgewotICAgICAgICBkaWFsb2cuc3R5bGUuZGlzcGxheSA9ICdu b25lJzsKLSAgICAgICAgZGlhbG9nLnNldEF0dHJpYnV0ZSgiYXJpYS1tb2RhbCIsICJmYWxzZSIp OyAKKworICAgIGZ1bmN0aW9uIGRpYWxvZzJBY2Nlc3NpYmxlKCkgeworICAgICAgICBsZXQgZGlh bG9nID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJsZUVsZW1lbnRCeUlkKCJib3gy Iik7CisgICAgICAgIGxldCB0ZXh0ID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNzaWJs ZUVsZW1lbnRCeUlkKCJteURpYWxvZzIiKTsKKyAgICAgICAgbGV0IGJ1dHRvbiA9IGFjY2Vzc2li aWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgiY2xvc2UiKTsKKyAgICAgICAg cmV0dXJuIGRpYWxvZyAmJiAhZGlhbG9nLmlzSWdub3JlZAorICAgICAgICAgICAgJiYgdGV4dCAm JiAhdGV4dC5pc0lnbm9yZWQKKyAgICAgICAgICAgICYmIGJ1dHRvbiAmJiAhYnV0dG9uLmlzSWdu b3JlZDsKICAgICB9Ci19CiAKKyAgICBmdW5jdGlvbiB0b2dnbGVEaWFsb2coZGlhbG9nLCBzaCkg eworICAgICAgICBpZiAoc2ggPT0gInNob3ciKSB7CisgICAgICAgICAgICAvLyBzaG93IHRoZSBk aWFsb2cKKyAgICAgICAgICAgIGRpYWxvZy5zdHlsZS5kaXNwbGF5ID0gJ2Jsb2NrJzsKKyAgICAg ICAgICAgIGRpYWxvZy5zZXRBdHRyaWJ1dGUoImFyaWEtbW9kYWwiLCAidHJ1ZSIpOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgZGlhbG9nLnN0eWxlLmRpc3BsYXkgPSAnbm9uZSc7Cisg ICAgICAgICAgICBkaWFsb2cuc2V0QXR0cmlidXRlKCJhcmlhLW1vZGFsIiwgImZhbHNlIik7Cisg ICAgICAgIH0KKyAgICB9CiA8L3NjcmlwdD4KLQotCi08c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2Vz L2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+CiA8L2JvZHk+Ci08L2h0bWw+ClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgZmlsZQorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9kaWFsb2ctc2hvd01vZGFsLmh0bWwgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5 L2RpYWxvZy1zaG93TW9kYWwuaHRtbAppbmRleCA2NjA4ZDJhZWUzNWY1OWJhOTBjN2YyNmVlNWJm YjNhNWIwNDY1MjUxLi43ODEyYzBjMzM1NTVkMWMzNWI4NzQ1ZGMyZDU4ZWVjODlmNTBiMDc2IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRt bAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRtbApA QCAtMSw3ICsxLDcgQEAKIDwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwv L0VOIj4KIDxodG1sPgogPGhlYWQ+Ci08c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3Qt cHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+ PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2FjY2Vzc2liaWxpdHktaGVscGVy LmpzIj48L3NjcmlwdD4KIDwvaGVhZD4KIApAQCAtMjUsMTkgKzI1LDE5IEBACiAKICAgICBpZiAo d2luZG93LmFjY2Vzc2liaWxpdHlDb250cm9sbGVyKSB7CiAgICAgICAgIHdpbmRvdy5qc1Rlc3RJ c0FzeW5jID0gdHJ1ZTsKLSAgICAgICAgCisKICAgICAgICAgZGVidWcoIkRpYWxvZyBpcyBoaWRk ZW4iKTsKICAgICAgICAgc2hvdWxkQmVUcnVlKCJiYWNrZ3JvdW5kQWNjZXNzaWJsZSgpIik7Ci0g ICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJkaWFsb2ciKS5zaG93TW9kYWwoKTsKLQot ICAgICAgICAvLyBCYWNrZ3JvdW5kIHNob3VsZCBiZSB1bmFjY2Vzc2libGUgYWZ0ZXIgbG9hZGlu Zywgc2luY2UgdGhlCi0gICAgICAgIC8vIGRpYWxvZyBpcyBkaXNwbGF5ZWQKLSAgICAgICAgZGVi dWcoIkRpYWxvZyBpcyBkaXNwbGF5aW5nIik7Ci0gICAgICAgIHNob3VsZEJlRmFsc2UoImJhY2tn cm91bmRBY2Nlc3NpYmxlKCkiKTsKIAotICAgICAgICAvLyBDbG9zZSB0aGUgZGlhbG9nLCBiYWNr Z3JvdW5kIHNob3VsZCBiZSBhY2Nlc3NpYmxlLgotICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgib2siKS5jbGljaygpOwogICAgICAgICBzZXRUaW1lb3V0KGFzeW5jIGZ1bmN0aW9uKCkg eworICAgICAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImRpYWxvZyIpLnNob3dNb2Rh bCgpOworICAgICAgICAgICAgLy8gQmFja2dyb3VuZCBzaG91bGQgYmUgdW5hY2Nlc3NpYmxlLCBz aW5jZSB0aGUgZGlhbG9nIGlzIGRpc3BsYXllZCBtb2RhbC4KKyAgICAgICAgICAgIGF3YWl0IHdh aXRGb3IoKCkgPT4gIWJhY2tncm91bmRBY2Nlc3NpYmxlKCkpOworICAgICAgICAgICAgZGVidWco IkRpYWxvZyBpcyBkaXNwbGF5aW5nIik7CisgICAgICAgICAgICBzaG91bGRCZUZhbHNlKCJiYWNr Z3JvdW5kQWNjZXNzaWJsZSgpIik7CisKKyAgICAgICAgICAgIC8vIENsb3NlIHRoZSBkaWFsb2cs IGJhY2tncm91bmQgc2hvdWxkIGJlIGFjY2Vzc2libGUuCisgICAgICAgICAgICBkb2N1bWVudC5n ZXRFbGVtZW50QnlJZCgib2siKS5jbGljaygpOwogICAgICAgICAgICAgYXdhaXQgd2FpdEZvcigo KSA9PiBiYWNrZ3JvdW5kQWNjZXNzaWJsZSgpKTsKICAgICAgICAgICAgIGRlYnVnKCJEaWFsb2cg aXMgbm90IGRpc3BsYXlpbmciKTsKICAgICAgICAgICAgIHNob3VsZEJlVHJ1ZSgiYmFja2dyb3Vu ZEFjY2Vzc2libGUoKSIpOwpAQCAtMTA0LDYgKzEwNCw1IEBACiAgICAgICAgIHJldHVybiAhZGlz cGxheUJ1dHRvbi5pc0lnbm9yZWQgJiYgIWJhY2tncm91bmRDb250ZW50LmlzSWdub3JlZDsKICAg ICB9CiA8L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KIDwvYm9keT4KIDwvaHRtbD4K 447314 2021-12-15 19:10:16 -0800 2022-02-09 11:30:03 -0800 Patch bug-234059-20211215221015.patch text/plain 5696 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2ODQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzBjOTg2ZDgyNjE5Y2I4 MjlkNmUyYjY4NTI4ZWZkZWY5YTliZjZhYi4uOTA4MTZjOWI4YzhjODNjYTJlYmViN2I2OTZjNTFi MDQ2ZjQyZmI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIxLTEyLTE1ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyBvdmVyIDMwIGFjY2Vzc2liaWxp dHkgdGVzdHMgaW4gaXNvbGF0ZWQgdHJlZSBtb2RlLgorICAgICAgICBBbHNvIGZpeGVzIGZsYWtp bmVzcyBpbiBhY2Nlc3NpYmlsaXR5L2RpYWxvZy1zaG93TW9kYWwuaHRtbC4KKworICAgICAgICBB WE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQgd2FzIHBvc3RpbmcgYW4gQVhDaGls ZHJlbkNoYW5nZWQKKyAgICAgICAgbm90aWZpY2F0aW9uIChwb3N0Tm90aWZpY2F0aW9uKSwgd2hp Y2ggY2F1c2VzIGEgZG91YmxlIGRlZmVycmFsIG9mIHRoZXNlCisgICAgICAgIG5vdGlmaWNhdGlv bnMsIGluc3RlYWQgb2YgYWN0dWFsbHkgaGFuZGxpbmcgdGhlIG5vdGlmaWNhdGlvbi4KKyAgICAg ICAgQ2hpbGRyZW5DaGFuZ2VkIG5vdGlmaWNhdGlvbnMgc2hvdWxkIGJlIGhhbmRsZWQgYmVmb3Jl IG1hbnkgb3RoZXIKKyAgICAgICAgbm90aWZpY2F0aW9ucyBvZiBwcm9wZXJ0eSBjaGFuZ2VzIHNp bmNlIHRoZXkgYXJlIERPTSBtdXRhdGlvbnMsIG9iamVjdHMKKyAgICAgICAgYWRkZWQgb3IgcmVt b3ZlZCwgYmVmb3JlIHByb3BlcnRpZXMgaW4gdGhlIHJlc3VsdGluZyBvYmplY3RzIG1heSBiZQor ICAgICAgICB1cGRhdGVkLiBUaGlzIHBhdGNoIGZpeGVzIHRoaXMgcHJvYmxlbSBieSBtYWtpbmcg aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkCisgICAgICAgIHRvIGFjdHVhbGx5IGhhbmRsZSB0aGUgbm90 aWZpY2F0aW9ucyBhbmQgdXBkYXRlIHRoZSBpc29sYXRlZCB0cmVlLgorICAgICAgICBJbiBhZGRp dGlvbiwgaGFuZGxpbmcgb2YgdGhlICJvcGVuIiBhdHRyaWJ1dGUgZm9yIDxkaWFsb2c+IGVsZW1l bnRzIG5vdworICAgICAgICB1cGRhdGVzIGNoaWxkcmVuLCB3aGljaCBmaXhlcyB0aGUgZmxha2lu ZXNzIG9ic2VydmVkIGluIHRoZQorICAgICAgICBkaWFsb2ctc2hvd01vZGFsLmh0bWwgdGVzdC4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBWE9iamVjdENhY2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQpOgorICAgICAgICAo V2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5nZSk6CisgICAgICAgIChXZWJD b3JlOjpBWE9iamVjdENhY2hlOjpwZXJmb3JtQ2FjaGVVcGRhdGVUaW1lckZpcmVkKToKKwogMjAy MS0xMi0xMCAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11b SUZDXSBFbmFibGUgYmlkaSBoYW5kbGluZyBmb3IgY29udGVudCB3aXRoIGlubGluZSBib3hlcwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKaW5kZXgg M2JmMzg4M2RkNmE2MGRmOTVhZjhkZDdjNjhjOTY0Y2UzNWY0ZjYzNC4uN2VhMjVlMDhjMTAzY2Ex Y2VjZWU4MzFhZWNmZDVjOWFkOTBkYjExMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCkBAIC05ODEsMTUgKzk4MSwxNiBAQCB2b2lkIEFYT2Jq ZWN0Q2FjaGU6OmhhbmRsZUNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0JiBvYmpl Y3QpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBUaGlzIG1ldGhvZCBpcyBtZWFu dCBhcyBhIHF1aWNrIHdheSBvZiBtYXJraW5nIGEgcG9ydGlvbiBvZiB0aGUgYWNjZXNzaWJpbGl0 eSB0cmVlIGRpcnR5LgogICAgIGlmICghb2JqZWN0Lm5vZGUoKSAmJiAhb2JqZWN0LnJlbmRlcmVy KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHBvc3ROb3RpZmljYXRpb24oJm9iamVjdCwgb2Jq ZWN0LmRvY3VtZW50KCksIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKLQogICAgIC8vIFNob3VsZCBtYWtl IHRoZSBzdWJ0cmVlIGRpcnR5IHNvIHRoYXQgZXZlcnl0aGluZyBiZWxvdyB3aWxsIGJlIHVwZGF0 ZWQgY29ycmVjdGx5LgogICAgIG9iamVjdC5zZXROZWVkc1RvVXBkYXRlU3VidHJlZSgpOwogCisg ICAgLy8gSWYgaXNJZ25vcmVkIGhhcyBjaGFuZ2VkIGZvciBvYmplY3QsIG5vdGlmeSB0aGF0IENo aWxkcmVuQ2hhbmdlZCBmb3IgaXRzIHBhcmVudC4KKyAgICBpZiAob2JqZWN0LnBhcmVudE9iamVj dElmRXhpc3RzKCkgJiYgb2JqZWN0Lmhhc0lnbm9yZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAg Y2hpbGRyZW5DaGFuZ2VkKG9iamVjdC5wYXJlbnRPYmplY3QoKSk7CisKICAgICAvLyBHbyB1cCB0 aGUgZXhpc3RpbmcgYW5jZXN0b3JzIGNoYWluIGFuZCBmaXJlIHRoZSBhcHByb3ByaWF0ZSBub3Rp ZmljYXRpb25zLgogICAgIGJvb2wgc2hvdWxkVXBkYXRlUGFyZW50ID0gdHJ1ZTsKICAgICBmb3Ig KGF1dG8qIHBhcmVudCA9ICZvYmplY3Q7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRP YmplY3RJZkV4aXN0cygpKSB7CkBAIC0xMDExLDYgKzEwMTIsMTIgQEAgdm9pZCBBWE9iamVjdENh Y2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQog ICAgICAgICAgICAgc2hvdWxkVXBkYXRlUGFyZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9 CisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlz b2xhdGVkVHJlZShvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKKyNlbmRpZgorCisgICAgcG9z dFBsYXRmb3JtTm90aWZpY2F0aW9uKCZvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKIH0KIAog dm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVNZW51T3BlbmVkKE5vZGUqIG5vZGUpCkBAIC0xMTAw LDI0ICsxMTA3LDE3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVy RmlyZWQoKQogICAgICAgICB9CiAjZW5kaWYKIAotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlz IG1lbnUgcmVhbGx5IGlzIGEgbWVudS4gV2UgZG8gdGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2Ug ZG9uJ3QgaGF2ZSB0byBjcmVhdGUKLSAgICAgICAgLy8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUg bWVudSBpcyBtYXJrZWQgYXMgb3BlbmluZy4KICAgICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFY TWVudU9wZW5lZCkgeworICAgICAgICAgICAgLy8gT25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBp cyBpbiBmYWN0IGEgbWVudS4KICAgICAgICAgICAgIG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVu SWZOZWNlc3NhcnkoKTsKICAgICAgICAgICAgIGlmIChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAh PSBBY2Nlc3NpYmlsaXR5Um9sZTo6TWVudSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQogCi0gICAgICAgIGlmIChub3RlLnNlY29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAm JiBub3RlLmZpcnN0LT5wYXJlbnRPYmplY3RJZkV4aXN0cygpCi0gICAgICAgICAgICAmJiBkb3du Y2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pigqbm90ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVk VmFsdWUoKSAhPSBub3RlLmZpcnN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAg ICAgICBjaGlsZHJlbkNoYW5nZWQoZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5m aXJzdC0+cGFyZW50T2JqZWN0KCkpKTsKLQogICAgICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFw cGVuZChub3RlKTsKICAgICB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9U UkVFKQotICAgIC8vIEZJWE1FOiB0aGlzIHVwZGF0ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBw cmVtYXR1cmUgaW4gc29tZSBjYXNlcy4KLSAgICAvLyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFu Z2VkIGFib3ZlIGlzIGhpdCwgd2Ugc2hvdWxkIHVwZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJm b3JtRGVmZXJyZWRDYWNoZVVwZGF0ZS4KICAgICB1cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0 aW9uc1RvUG9zdCk7CiAjZW5kaWYKIApAQCAtMTI0Miw4ICsxMjQyLDE0IEBAIHZvaWQgQVhPYmpl Y3RDYWNoZTo6ZGVmZXJNZW51TGlzdFZhbHVlQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiAKIHZv aWQgQVhPYmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5nZShFbGVtZW50KiBlbGVtZW50KQogewot ICAgIGlmIChlbGVtZW50KQorICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIG1fZGVmZXJyZWRN b2RhbENoYW5nZWRMaXN0LmFkZCgqZWxlbWVudCk7CisKKyAgICAgICAgLy8gTm90aWZ5IHRoYXQg cGFyZW50J3MgY2hpbGRyZW4gaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoYXV0byogYXhQYXJl bnQgPSBnZXQoZWxlbWVudC0+cGFyZW50Tm9kZSgpKSkKKyAgICAgICAgICAgIG1fZGVmZXJyZWRD aGlsZHJlbkNoYW5nZWRMaXN0LmFkZChheFBhcmVudCk7CisgICAgfQorCiAgICAgaWYgKCFtX3Bl cmZvcm1DYWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fcGVyZm9ybUNhY2hl VXBkYXRlVGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CkBAIC0xODAxLDcgKzE4MDcsNiBAQCB2 b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZpZWRO YW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVu dC0+cGFyZW50Tm9kZSgpKTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1l KCkuc3RyaW5nKCkuc3RhcnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0z MTkxLDggKzMxOTYsNiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRp bWVyRmlyZWQoKQogICAgICAgICByZXR1cm47CiAKICAgICBwZXJmb3JtRGVmZXJyZWRDYWNoZVVw ZGF0ZSgpOwotICAgIC8vIEZJWE1FOiBuZWVkIHRvIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZSBh ZnRlciB0aGUgYWJvdmUgY2FjaGUgdXBkYXRlLgotICAgIC8vIFRoaXMgaXMgbW9zdCBsaWtlbHkg dGhlIGNhdXNlIG9mIHByb2JsZW1zIHdpdGggdGhlIGlzb2xhdGVkIHRyZWUgdXBkYXRlcy4uCiB9 CiAKIHZvaWQgQVhPYmplY3RDYWNoZTo6cGVyZm9ybURlZmVycmVkQ2FjaGVVcGRhdGUoKQo= 451417 2022-02-09 11:30:06 -0800 2022-02-11 06:56:20 -0800 Patch bug-234059-20220209143005.patch text/plain 8290 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NDI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjYjhhYTUzOWE3MTA5 ZGI3YjE3YTllMzQ0OTEyNjVkODA3ODgwMi4uZDMzNTAwZGIzMzViOWI4N2NkNjRmZGI4MWNjODg5 YjIxMjIwYzBkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAyLTA5ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyB+NyBhY2Nlc3NpYmlsaXR5IHRl c3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgQWxzbyBmaXhlcyBmbGFraW5lc3Mg aW4gYWNjZXNzaWJpbGl0eS9kaWFsb2ctc2hvd01vZGFsLmh0bWwuCisKKyAgICAgICAgQVhPYmpl Y3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkIHdhcyBwb3N0aW5nIGFuIEFYQ2hpbGRyZW5D aGFuZ2VkCisgICAgICAgIG5vdGlmaWNhdGlvbiAocG9zdE5vdGlmaWNhdGlvbiksIHdoaWNoIGNh dXNlcyBhIGRvdWJsZSBkZWZlcnJhbCBvZiB0aGVzZQorICAgICAgICBub3RpZmljYXRpb25zLCBp bnN0ZWFkIG9mIGFjdHVhbGx5IGhhbmRsaW5nIHRoZSBub3RpZmljYXRpb24uCisgICAgICAgIENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb25zIHNob3VsZCBiZSBoYW5kbGVkIGJlZm9yZSBtYW55 IG90aGVyCisgICAgICAgIG5vdGlmaWNhdGlvbnMgb2YgcHJvcGVydHkgY2hhbmdlcyBzaW5jZSB0 aGV5IGFyZSBET00gbXV0YXRpb25zLCBvYmplY3RzCisgICAgICAgIGFkZGVkIG9yIHJlbW92ZWQs IGJlZm9yZSBwcm9wZXJ0aWVzIGluIHRoZSByZXN1bHRpbmcgb2JqZWN0cyBtYXkgYmUKKyAgICAg ICAgdXBkYXRlZC4gVGhpcyBwYXRjaCBmaXhlcyB0aGlzIHByb2JsZW0gYnkgbWFraW5nIGhhbmRs ZUNoaWxkcmVuQ2hhbmdlZAorICAgICAgICB0byBhY3R1YWxseSBoYW5kbGUgdGhlIG5vdGlmaWNh dGlvbnMgYW5kIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgSW4gYWRkaXRpb24s IGhhbmRsaW5nIG9mIHRoZSAib3BlbiIgYXR0cmlidXRlIGZvciA8ZGlhbG9nPiBlbGVtZW50cyBu b3cKKyAgICAgICAgdXBkYXRlcyBjaGlsZHJlbiwgd2hpY2ggZml4ZXMgdGhlIGZsYWtpbmVzcyBv YnNlcnZlZCBpbiB0aGUKKyAgICAgICAgZGlhbG9nLXNob3dNb2RhbC5odG1sIHRlc3QuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6Om5vdGlmaWNhdGlvblBvc3RUaW1lckZpcmVkKToKKyAgICAgICAg KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmRlZmVyTW9kYWxDaGFuZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQXR0cmlidXRlQ2hhbmdlKToKKyAgICAgICAgKFdl YkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0 cmVlKToKKyAgICAgICAgUmVtb3ZlZCBhbHRlcm5hdGl2ZSBmaXggd2hlcmUgd2Ugd2VyZSBwcm9j ZXNzaW5nIHRoZSBwZW5kaW5nCisgICAgICAgIENoaWxkcmVuQ2hhbmdlZCBOb3RpZmljYXRpb25z IGJlZm9yZSB1cGRhdGluZyB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorCiAyMDIyLTAyLTA4ICBBbmRyZXMg R29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBJbml0aWFsaXplIHRo ZSBBWElzb2xhdGVkT2JqZWN0IEFjY2Vzc2liaWxpdHlUZXh0IHByb3BlcnR5IGxhemlseS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGE5 NWQyYWJlMjNkYTYwMTY5OTBiNmM1ZmMwOTI4NDdhMWY3NzEzODEuLmYzYTZmYWQ1ZTAzZDkzOTQx MTcxOGM4ZDhmMTkyZmIxMzAzNGM2ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BWE9iamVjdENhY2hlLmNwcApAQCAtMTAxMCwxNSArMTAxMCwxNiBAQCB2b2lkIEFYT2Jq ZWN0Q2FjaGU6OmhhbmRsZUNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0JiBvYmpl Y3QpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBUaGlzIG1ldGhvZCBpcyBtZWFu dCBhcyBhIHF1aWNrIHdheSBvZiBtYXJraW5nIGEgcG9ydGlvbiBvZiB0aGUgYWNjZXNzaWJpbGl0 eSB0cmVlIGRpcnR5LgogICAgIGlmICghb2JqZWN0Lm5vZGUoKSAmJiAhb2JqZWN0LnJlbmRlcmVy KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHBvc3ROb3RpZmljYXRpb24oJm9iamVjdCwgb2Jq ZWN0LmRvY3VtZW50KCksIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKLQogICAgIC8vIFNob3VsZCBtYWtl IHRoZSBzdWJ0cmVlIGRpcnR5IHNvIHRoYXQgZXZlcnl0aGluZyBiZWxvdyB3aWxsIGJlIHVwZGF0 ZWQgY29ycmVjdGx5LgogICAgIG9iamVjdC5zZXROZWVkc1RvVXBkYXRlU3VidHJlZSgpOwogCisg ICAgLy8gSWYgaXNJZ25vcmVkIGhhcyBjaGFuZ2VkIGZvciBvYmplY3QsIG5vdGlmeSB0aGF0IENo aWxkcmVuQ2hhbmdlZCBmb3IgaXRzIHBhcmVudC4KKyAgICBpZiAob2JqZWN0LnBhcmVudE9iamVj dElmRXhpc3RzKCkgJiYgb2JqZWN0Lmhhc0lnbm9yZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAg Y2hpbGRyZW5DaGFuZ2VkKG9iamVjdC5wYXJlbnRPYmplY3QoKSk7CisKICAgICAvLyBHbyB1cCB0 aGUgZXhpc3RpbmcgYW5jZXN0b3JzIGNoYWluIGFuZCBmaXJlIHRoZSBhcHByb3ByaWF0ZSBub3Rp ZmljYXRpb25zLgogICAgIGJvb2wgc2hvdWxkVXBkYXRlUGFyZW50ID0gdHJ1ZTsKICAgICBmb3Ig KGF1dG8qIHBhcmVudCA9ICZvYmplY3Q7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRP YmplY3RJZkV4aXN0cygpKSB7CkBAIC0xMDQwLDYgKzEwNDEsMTIgQEAgdm9pZCBBWE9iamVjdENh Y2hlOjpoYW5kbGVDaGlsZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQog ICAgICAgICAgICAgc2hvdWxkVXBkYXRlUGFyZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9 CisKKyNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlz b2xhdGVkVHJlZShvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKKyNlbmRpZgorCisgICAgcG9z dFBsYXRmb3JtTm90aWZpY2F0aW9uKCZvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKIH0KIAog dm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVNZW51T3BlbmVkKE5vZGUqIG5vZGUpCkBAIC0xMTI5 LDI0ICsxMTM2LDE3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVy RmlyZWQoKQogICAgICAgICB9CiAjZW5kaWYKIAotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlz IG1lbnUgcmVhbGx5IGlzIGEgbWVudS4gV2UgZG8gdGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2Ug ZG9uJ3QgaGF2ZSB0byBjcmVhdGUKLSAgICAgICAgLy8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUg bWVudSBpcyBtYXJrZWQgYXMgb3BlbmluZy4KICAgICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFY TWVudU9wZW5lZCkgeworICAgICAgICAgICAgLy8gT25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBp cyBpbiBmYWN0IGEgbWVudS4KICAgICAgICAgICAgIG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVu SWZOZWNlc3NhcnkoKTsKICAgICAgICAgICAgIGlmIChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAh PSBBY2Nlc3NpYmlsaXR5Um9sZTo6TWVudSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAg ICAgICAgfQogCi0gICAgICAgIGlmIChub3RlLnNlY29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAm JiBub3RlLmZpcnN0LT5wYXJlbnRPYmplY3RJZkV4aXN0cygpCi0gICAgICAgICAgICAmJiBkb3du Y2FzdDxBY2Nlc3NpYmlsaXR5T2JqZWN0Pigqbm90ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVk VmFsdWUoKSAhPSBub3RlLmZpcnN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAg ICAgICBjaGlsZHJlbkNoYW5nZWQoZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5m aXJzdC0+cGFyZW50T2JqZWN0KCkpKTsKLQogICAgICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFw cGVuZChub3RlKTsKICAgICB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9U UkVFKQotICAgIC8vIEZJWE1FOiB0aGlzIHVwZGF0ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBw cmVtYXR1cmUgaW4gc29tZSBjYXNlcy4KLSAgICAvLyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFu Z2VkIGFib3ZlIGlzIGhpdCwgd2Ugc2hvdWxkIHVwZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJm b3JtRGVmZXJyZWRDYWNoZVVwZGF0ZS4KICAgICB1cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0 aW9uc1RvUG9zdCk7CiAjZW5kaWYKIApAQCAtMTI3MSw4ICsxMjcxLDE0IEBAIHZvaWQgQVhPYmpl Y3RDYWNoZTo6ZGVmZXJNZW51TGlzdFZhbHVlQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiAKIHZv aWQgQVhPYmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5nZShFbGVtZW50KiBlbGVtZW50KQogewot ICAgIGlmIChlbGVtZW50KQorICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIG1fZGVmZXJyZWRN b2RhbENoYW5nZWRMaXN0LmFkZCgqZWxlbWVudCk7CisKKyAgICAgICAgLy8gTm90aWZ5IHRoYXQg cGFyZW50J3MgY2hpbGRyZW4gaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoYXV0byogYXhQYXJl bnQgPSBnZXQoZWxlbWVudC0+cGFyZW50Tm9kZSgpKSkKKyAgICAgICAgICAgIG1fZGVmZXJyZWRD aGlsZHJlbkNoYW5nZWRMaXN0LmFkZChheFBhcmVudCk7CisgICAgfQorCiAgICAgaWYgKCFtX3Bl cmZvcm1DYWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fcGVyZm9ybUNhY2hl VXBkYXRlVGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CkBAIC0xODI5LDcgKzE4MzUsNiBAQCB2 b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZpZWRO YW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVu dC0+cGFyZW50Tm9kZSgpKTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1l KCkuc3RyaW5nKCkuc3RhcnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0x ODQ4LDcgKzE4NTMsOSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5n ZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgIGVsc2UgaWYgKGF0 dHJOYW1lID09IGFyaWFfZXhwYW5kZWRBdHRyKQogICAgICAgICBoYW5kbGVBcmlhRXhwYW5kZWRD aGFuZ2UoZWxlbWVudCk7CiAgICAgZWxzZSBpZiAoYXR0ck5hbWUgPT0gYXJpYV9oaWRkZW5BdHRy KSB7Ci0gICAgICAgIGNoaWxkcmVuQ2hhbmdlZChlbGVtZW50LT5wYXJlbnROb2RlKCksIGVsZW1l bnQpOworICAgICAgICBpZiAoYXV0byogcGFyZW50ID0gZ2V0KGVsZW1lbnQtPnBhcmVudE5vZGUo KSkpCisgICAgICAgICAgICBoYW5kbGVDaGlsZHJlbkNoYW5nZWQoKnBhcmVudCk7CisKICAgICAg ICAgaWYgKG1fY3VycmVudE1vZGFsRWxlbWVudCAmJiBtX2N1cnJlbnRNb2RhbEVsZW1lbnQtPmlz RGVzY2VuZGFudE9mKGVsZW1lbnQpKSB7CiAgICAgICAgICAgICBtX21vZGFsTm9kZXNJbml0aWFs aXplZCA9IGZhbHNlOwogICAgICAgICAgICAgZGVmZXJNb2RhbENoYW5nZShtX2N1cnJlbnRNb2Rh bEVsZW1lbnQuZ2V0KCkpOwpAQCAtMzIyOCw4ICszMjM1LDYgQEAgdm9pZCBBWE9iamVjdENhY2hl OjpwZXJmb3JtQ2FjaGVVcGRhdGVUaW1lckZpcmVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg cGVyZm9ybURlZmVycmVkQ2FjaGVVcGRhdGUoKTsKLSAgICAvLyBGSVhNRTogbmVlZCB0byB1cGRh dGUgdGhlIGlzb2xhdGVkIHRyZWUgYWZ0ZXIgdGhlIGFib3ZlIGNhY2hlIHVwZGF0ZS4KLSAgICAv LyBUaGlzIGlzIG1vc3QgbGlrZWx5IHRoZSBjYXVzZSBvZiBwcm9ibGVtcyB3aXRoIHRoZSBpc29s YXRlZCB0cmVlIHVwZGF0ZXMuLgogfQogCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OnByb2Nlc3NEZWZl cnJlZENoaWxkcmVuQ2hhbmdlZExpc3QoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDVi MDhlMmI3MDllMTUzNjQyNDM0N2NlNzFhZTQ0OWY4ZjBlMjkwYjYuLjE3MDgzY2IxNDlhNGVmZTNm ZTU1MjFmMjE2Mjg4N2I0MWI4ZGEyYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTI4 MSwxMCArMjgxLDYgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6Y29sbGVjdE5vZGVDaGFuZ2VzRm9y U3VidHJlZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElEIHAKICAgICBBWFRSQUNFKCJBWElz b2xhdGVkVHJlZTo6Y29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSIpOwogICAgIEFTU0VSVChp c01haW5UaHJlYWQoKSk7CiAKLSAgICBpZiAoIW1fY3JlYXRpbmdTdWJ0cmVlKQotICAgICAgICBh eE9iamVjdENhY2hlKCktPnByb2Nlc3NEZWZlcnJlZENoaWxkcmVuQ2hhbmdlZExpc3QoKTsKLSAg ICBTZXRGb3JTY29wZTxib29sPiBjcmVhdGluZ1N1YnRyZWUobV9jcmVhdGluZ1N1YnRyZWUsIHRy dWUpOwotCiAgICAgYXV0byBub2RlQ2hhbmdlID0gbm9kZUNoYW5nZUZvck9iamVjdChheE9iamVj dCwgcGFyZW50SUQsIGF0dGFjaFdyYXBwZXIpOwogICAgIGlmIChpZHNCZWluZ0NoYW5nZWQpCiAg ICAgICAgIGlkc0JlaW5nQ2hhbmdlZC0+YWRkKG5vZGVDaGFuZ2UuaXNvbGF0ZWRPYmplY3QtPm9i amVjdElEKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv aXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggNzc3NTZjNTc3MjI3ODI1NGQ5N2M2 MTMzZGUyNGY1ZTNjNGQyNDY4OC4uNDExYWU4YTg1YjBjNWM5ZThkZmM0OTZjNTY0YjEwM2RjZjNi MzE1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lz b2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oCkBAIC00MjMsOCArNDIzLDYgQEAgcHJpdmF0ZToK ICAgICBkb3VibGUgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzIFdURl9HVUFSREVEX0JZX0xPQ0so bV9jaGFuZ2VMb2dMb2NrKSB7IDAgfTsKICAgICBkb3VibGUgbV9sb2FkaW5nUHJvZ3Jlc3MgeyAw IH07CiAgICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7Ci0KLSAgICBib29sIG1fY3JlYXRpbmdTdWJ0 cmVlIHsgZmFsc2UgfTsKIH07CiAKIGlubGluZSBBWE9iamVjdENhY2hlKiBBWElzb2xhdGVkVHJl ZTo6YXhPYmplY3RDYWNoZSgpIGNvbnN0Cg== 451687 2022-02-11 06:56:23 -0800 2022-02-13 13:22:06 -0800 Patch bug-234059-20220211095622.patch text/plain 8275 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRhYzQ3ZjU2YzVlZTQ5 ODdlZTZmNjdhZTRlMTg5MjcxOWUzY2FiNi4uM2U1NDQxM2ZkMzQ2MWM2ZGQwMTU2MWJhMTJmMzQ2 Mzk2NmEwMDM1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAyLTExICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyB+NyBhY2Nlc3NpYmlsaXR5IHRl c3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgQWxzbyBmaXhlcyBmbGFraW5lc3Mg aW4gYWNjZXNzaWJpbGl0eS9kaWFsb2ctc2hvd01vZGFsLmh0bWwuCisKKyAgICAgICAgQVhPYmpl Y3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkIHdhcyBwb3N0aW5nIGFuIEFYQ2hpbGRyZW5D aGFuZ2VkCisgICAgICAgIG5vdGlmaWNhdGlvbiAocG9zdE5vdGlmaWNhdGlvbiksIHdoaWNoIGNh dXNlcyBhIGRvdWJsZSBkZWZlcnJhbCBvZiB0aGVzZQorICAgICAgICBub3RpZmljYXRpb25zLCBp bnN0ZWFkIG9mIGFjdHVhbGx5IGhhbmRsaW5nIHRoZSBub3RpZmljYXRpb24uCisgICAgICAgIENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb25zIHNob3VsZCBiZSBoYW5kbGVkIGJlZm9yZSBtYW55 IG90aGVyCisgICAgICAgIG5vdGlmaWNhdGlvbnMgb2YgcHJvcGVydHkgY2hhbmdlcyBzaW5jZSB0 aGV5IGFyZSBET00gbXV0YXRpb25zLCBvYmplY3RzCisgICAgICAgIGFkZGVkIG9yIHJlbW92ZWQs IGJlZm9yZSBwcm9wZXJ0aWVzIGluIHRoZSByZXN1bHRpbmcgb2JqZWN0cyBtYXkgYmUKKyAgICAg ICAgdXBkYXRlZC4gVGhpcyBwYXRjaCBmaXhlcyB0aGlzIHByb2JsZW0gYnkgbWFraW5nIGhhbmRs ZUNoaWxkcmVuQ2hhbmdlZAorICAgICAgICB0byBhY3R1YWxseSBoYW5kbGUgdGhlIG5vdGlmaWNh dGlvbnMgYW5kIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgSW4gYWRkaXRpb24s IGhhbmRsaW5nIG9mIHRoZSAib3BlbiIgYXR0cmlidXRlIGZvciA8ZGlhbG9nPiBlbGVtZW50cyBu b3cKKyAgICAgICAgdXBkYXRlcyBjaGlsZHJlbiwgd2hpY2ggZml4ZXMgdGhlIGZsYWtpbmVzcyBv YnNlcnZlZCBpbiB0aGUKKyAgICAgICAgZGlhbG9nLXNob3dNb2RhbC5odG1sIHRlc3QuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6Om5vdGlmaWNhdGlvblBvc3RUaW1lckZpcmVkKToKKyAgICAgICAg KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmRlZmVyTW9kYWxDaGFuZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQXR0cmlidXRlQ2hhbmdlKToKKyAgICAgICAgKFdl YkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0 cmVlKToKKyAgICAgICAgUmVtb3ZlZCBhbHRlcm5hdGl2ZSBmaXggd2hlcmUgd2Ugd2VyZSBwcm9j ZXNzaW5nIHRoZSBwZW5kaW5nCisgICAgICAgIENoaWxkcmVuQ2hhbmdlZCBOb3RpZmljYXRpb25z IGJlZm9yZSB1cGRhdGluZyB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorCiAyMDIyLTAyLTExICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ1NTIENvbnRhaW5lciBRdWVy aWVzXSBJbXBsZW1lbnQgY29udGFpbmVyIG5hbWUgbWF0Y2hpbmcKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGE5NWQyYWJlMjNkYTYwMTY5 OTBiNmM1ZmMwOTI4NDdhMWY3NzEzODEuLmYzYTZmYWQ1ZTAzZDkzOTQxMTcxOGM4ZDhmMTkyZmIx MzAzNGM2ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENh Y2hlLmNwcApAQCAtMTAxMCwxNSArMTAxMCwxNiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRs ZUNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0JiBvYmplY3QpCiAgICAgICAgIHJl dHVybjsKICAgICB9CiAKLSAgICAvLyBUaGlzIG1ldGhvZCBpcyBtZWFudCBhcyBhIHF1aWNrIHdh eSBvZiBtYXJraW5nIGEgcG9ydGlvbiBvZiB0aGUgYWNjZXNzaWJpbGl0eSB0cmVlIGRpcnR5Lgog ICAgIGlmICghb2JqZWN0Lm5vZGUoKSAmJiAhb2JqZWN0LnJlbmRlcmVyKCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHBvc3ROb3RpZmljYXRpb24oJm9iamVjdCwgb2JqZWN0LmRvY3VtZW50KCks IEFYQ2hpbGRyZW5DaGFuZ2VkKTsKLQogICAgIC8vIFNob3VsZCBtYWtlIHRoZSBzdWJ0cmVlIGRp cnR5IHNvIHRoYXQgZXZlcnl0aGluZyBiZWxvdyB3aWxsIGJlIHVwZGF0ZWQgY29ycmVjdGx5Lgog ICAgIG9iamVjdC5zZXROZWVkc1RvVXBkYXRlU3VidHJlZSgpOwogCisgICAgLy8gSWYgaXNJZ25v cmVkIGhhcyBjaGFuZ2VkIGZvciBvYmplY3QsIG5vdGlmeSB0aGF0IENoaWxkcmVuQ2hhbmdlZCBm b3IgaXRzIHBhcmVudC4KKyAgICBpZiAob2JqZWN0LnBhcmVudE9iamVjdElmRXhpc3RzKCkgJiYg b2JqZWN0Lmhhc0lnbm9yZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAgY2hpbGRyZW5DaGFuZ2Vk KG9iamVjdC5wYXJlbnRPYmplY3QoKSk7CisKICAgICAvLyBHbyB1cCB0aGUgZXhpc3RpbmcgYW5j ZXN0b3JzIGNoYWluIGFuZCBmaXJlIHRoZSBhcHByb3ByaWF0ZSBub3RpZmljYXRpb25zLgogICAg IGJvb2wgc2hvdWxkVXBkYXRlUGFyZW50ID0gdHJ1ZTsKICAgICBmb3IgKGF1dG8qIHBhcmVudCA9 ICZvYmplY3Q7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRPYmplY3RJZkV4aXN0cygp KSB7CkBAIC0xMDQwLDYgKzEwNDEsMTIgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVDaGls ZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQogICAgICAgICAgICAgc2hv dWxkVXBkYXRlUGFyZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CisKKyNpZiBFTkFCTEUo QUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlzb2xhdGVkVHJlZShvYmpl Y3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKKyNlbmRpZgorCisgICAgcG9zdFBsYXRmb3JtTm90aWZp Y2F0aW9uKCZvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKIH0KIAogdm9pZCBBWE9iamVjdENh Y2hlOjpoYW5kbGVNZW51T3BlbmVkKE5vZGUqIG5vZGUpCkBAIC0xMTI5LDI0ICsxMTM2LDE3IEBA IHZvaWQgQVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQoKQogICAgICAg ICB9CiAjZW5kaWYKIAotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlzIG1lbnUgcmVhbGx5IGlz IGEgbWVudS4gV2UgZG8gdGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2UgZG9uJ3QgaGF2ZSB0byBj cmVhdGUKLSAgICAgICAgLy8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUgbWVudSBpcyBtYXJrZWQg YXMgb3BlbmluZy4KICAgICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFYTWVudU9wZW5lZCkgewor ICAgICAgICAgICAgLy8gT25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBpcyBpbiBmYWN0IGEgbWVu dS4KICAgICAgICAgICAgIG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVuSWZOZWNlc3NhcnkoKTsK ICAgICAgICAgICAgIGlmIChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAhPSBBY2Nlc3NpYmlsaXR5 Um9sZTo6TWVudSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAg ICAgIGlmIChub3RlLnNlY29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAmJiBub3RlLmZpcnN0LT5w YXJlbnRPYmplY3RJZkV4aXN0cygpCi0gICAgICAgICAgICAmJiBkb3duY2FzdDxBY2Nlc3NpYmls aXR5T2JqZWN0Pigqbm90ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVkVmFsdWUoKSAhPSBub3Rl LmZpcnN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAgICAgICBjaGlsZHJlbkNo YW5nZWQoZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5maXJzdC0+cGFyZW50T2Jq ZWN0KCkpKTsKLQogICAgICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFwcGVuZChub3RlKTsKICAg ICB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQotICAgIC8vIEZJ WE1FOiB0aGlzIHVwZGF0ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBwcmVtYXR1cmUgaW4gc29t ZSBjYXNlcy4KLSAgICAvLyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFuZ2VkIGFib3ZlIGlzIGhp dCwgd2Ugc2hvdWxkIHVwZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJmb3JtRGVmZXJyZWRDYWNo ZVVwZGF0ZS4KICAgICB1cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0aW9uc1RvUG9zdCk7CiAj ZW5kaWYKIApAQCAtMTI3MSw4ICsxMjcxLDE0IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6ZGVmZXJN ZW51TGlzdFZhbHVlQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiAKIHZvaWQgQVhPYmplY3RDYWNo ZTo6ZGVmZXJNb2RhbENoYW5nZShFbGVtZW50KiBlbGVtZW50KQogewotICAgIGlmIChlbGVtZW50 KQorICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIG1fZGVmZXJyZWRNb2RhbENoYW5nZWRMaXN0 LmFkZCgqZWxlbWVudCk7CisKKyAgICAgICAgLy8gTm90aWZ5IHRoYXQgcGFyZW50J3MgY2hpbGRy ZW4gaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoYXV0byogYXhQYXJlbnQgPSBnZXQoZWxlbWVu dC0+cGFyZW50Tm9kZSgpKSkKKyAgICAgICAgICAgIG1fZGVmZXJyZWRDaGlsZHJlbkNoYW5nZWRM aXN0LmFkZChheFBhcmVudCk7CisgICAgfQorCiAgICAgaWYgKCFtX3BlcmZvcm1DYWNoZVVwZGF0 ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fcGVyZm9ybUNhY2hlVXBkYXRlVGltZXIuc3Rh cnRPbmVTaG90KDBfcyk7CiB9CkBAIC0xODI5LDcgKzE4MzUsNiBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSwg RWxlbWVudAogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVudC0+cGFyZW50Tm9kZSgp KTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1lKCkuc3RyaW5nKCkuc3Rh cnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xODQ4LDcgKzE4NTMsOSBA QCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZp ZWROYW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgIGVsc2UgaWYgKGF0dHJOYW1lID09IGFyaWFf ZXhwYW5kZWRBdHRyKQogICAgICAgICBoYW5kbGVBcmlhRXhwYW5kZWRDaGFuZ2UoZWxlbWVudCk7 CiAgICAgZWxzZSBpZiAoYXR0ck5hbWUgPT0gYXJpYV9oaWRkZW5BdHRyKSB7Ci0gICAgICAgIGNo aWxkcmVuQ2hhbmdlZChlbGVtZW50LT5wYXJlbnROb2RlKCksIGVsZW1lbnQpOworICAgICAgICBp ZiAoYXV0byogcGFyZW50ID0gZ2V0KGVsZW1lbnQtPnBhcmVudE5vZGUoKSkpCisgICAgICAgICAg ICBoYW5kbGVDaGlsZHJlbkNoYW5nZWQoKnBhcmVudCk7CisKICAgICAgICAgaWYgKG1fY3VycmVu dE1vZGFsRWxlbWVudCAmJiBtX2N1cnJlbnRNb2RhbEVsZW1lbnQtPmlzRGVzY2VuZGFudE9mKGVs ZW1lbnQpKSB7CiAgICAgICAgICAgICBtX21vZGFsTm9kZXNJbml0aWFsaXplZCA9IGZhbHNlOwog ICAgICAgICAgICAgZGVmZXJNb2RhbENoYW5nZShtX2N1cnJlbnRNb2RhbEVsZW1lbnQuZ2V0KCkp OwpAQCAtMzIyOCw4ICszMjM1LDYgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwZXJmb3JtQ2FjaGVV cGRhdGVUaW1lckZpcmVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcGVyZm9ybURlZmVycmVk Q2FjaGVVcGRhdGUoKTsKLSAgICAvLyBGSVhNRTogbmVlZCB0byB1cGRhdGUgdGhlIGlzb2xhdGVk IHRyZWUgYWZ0ZXIgdGhlIGFib3ZlIGNhY2hlIHVwZGF0ZS4KLSAgICAvLyBUaGlzIGlzIG1vc3Qg bGlrZWx5IHRoZSBjYXVzZSBvZiBwcm9ibGVtcyB3aXRoIHRoZSBpc29sYXRlZCB0cmVlIHVwZGF0 ZXMuLgogfQogCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OnByb2Nlc3NEZWZlcnJlZENoaWxkcmVuQ2hh bmdlZExpc3QoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29s YXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0 eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDdmYzE3OWE2MTM2NDEyOGEz MmIzM2QyNWJhOTUzYWM0OWI1ZDYzMzQuLjdlZjA2MmEwYzYwOGMxYThlZjMxMThhZTQ0NDkxNjUy MGRjZDc2YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTI4MCwxMCArMjgwLDYgQEAg dm9pZCBBWElzb2xhdGVkVHJlZTo6Y29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZShBWENvcmVP YmplY3QmIGF4T2JqZWN0LCBBWElEIHAKICAgICBBWFRSQUNFKCJBWElzb2xhdGVkVHJlZTo6Y29s bGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSIpOwogICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7 CiAKLSAgICBpZiAoIW1fY3JlYXRpbmdTdWJ0cmVlKQotICAgICAgICBheE9iamVjdENhY2hlKCkt PnByb2Nlc3NEZWZlcnJlZENoaWxkcmVuQ2hhbmdlZExpc3QoKTsKLSAgICBTZXRGb3JTY29wZTxi b29sPiBjcmVhdGluZ1N1YnRyZWUobV9jcmVhdGluZ1N1YnRyZWUsIHRydWUpOwotCiAgICAgYXV0 byBub2RlQ2hhbmdlID0gbm9kZUNoYW5nZUZvck9iamVjdChheE9iamVjdCwgcGFyZW50SUQsIGF0 dGFjaFdyYXBwZXIpOwogICAgIGlmIChpZHNCZWluZ0NoYW5nZWQpCiAgICAgICAgIGlkc0JlaW5n Q2hhbmdlZC0+YWRkKG5vZGVDaGFuZ2UuaXNvbGF0ZWRPYmplY3QtPm9iamVjdElEKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29s YXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FY SXNvbGF0ZWRUcmVlLmgKaW5kZXggYmQyY2E3MmE2NDlhZjdlNWM2NzJkNDJlMzZkMzNhZDc4ZGMx ZjU1ZC4uNGFlMTI3MWE5Yzc0NTcwZDllNzhjZjc5YTU1MTQ0ZTBkMWJjZDNlNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRy ZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElz b2xhdGVkVHJlZS5oCkBAIC00MjIsOCArNDIyLDYgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9w ZW5kaW5nTG9hZGluZ1Byb2dyZXNzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFuZ2VMb2dMb2Nr KSB7IDAgfTsKICAgICBkb3VibGUgbV9sb2FkaW5nUHJvZ3Jlc3MgeyAwIH07CiAgICAgTG9jayBt X2NoYW5nZUxvZ0xvY2s7Ci0KLSAgICBib29sIG1fY3JlYXRpbmdTdWJ0cmVlIHsgZmFsc2UgfTsK IH07CiAKIGlubGluZSBBWE9iamVjdENhY2hlKiBBWElzb2xhdGVkVHJlZTo6YXhPYmplY3RDYWNo ZSgpIGNvbnN0Cg== 451840 2022-02-13 13:22:09 -0800 2022-02-13 19:50:13 -0800 Patch bug-234059-20220213162208.patch text/plain 8284 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGI3NzcyZTQ3ODI2ODZi OGE2ZmM0YzViMDMxZjQ0NGY5MWRlYzhlYi4uNTczYWY0ZTBkNTBkNDhjNTU4ZmIzOTAwYjNlNjk5 NzhlNmVhODI5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDIyLTAyLTEzICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBEZWNvdXBsZSBB WE9iamVjdENhY2hlIGhhbmRsZUNoaWxkcmVuQ2hhbmdlZCBhbmQgcG9zdE5vdGlmaWNhdGlvbi4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vODYyNDc0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Q2hyaXMgRmxlaXphY2guCisKKyAgICAgICAgVGhpcyBmaXhlcyB+NyBhY2Nlc3NpYmlsaXR5IHRl c3RzIGluIGlzb2xhdGVkIHRyZWUgbW9kZS4KKyAgICAgICAgQWxzbyBmaXhlcyBmbGFraW5lc3Mg aW4gYWNjZXNzaWJpbGl0eS9kaWFsb2ctc2hvd01vZGFsLmh0bWwuCisKKyAgICAgICAgQVhPYmpl Y3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkIHdhcyBwb3N0aW5nIGFuIEFYQ2hpbGRyZW5D aGFuZ2VkCisgICAgICAgIG5vdGlmaWNhdGlvbiAocG9zdE5vdGlmaWNhdGlvbiksIHdoaWNoIGNh dXNlcyBhIGRvdWJsZSBkZWZlcnJhbCBvZiB0aGVzZQorICAgICAgICBub3RpZmljYXRpb25zLCBp bnN0ZWFkIG9mIGFjdHVhbGx5IGhhbmRsaW5nIHRoZSBub3RpZmljYXRpb24uCisgICAgICAgIENo aWxkcmVuQ2hhbmdlZCBub3RpZmljYXRpb25zIHNob3VsZCBiZSBoYW5kbGVkIGJlZm9yZSBtYW55 IG90aGVyCisgICAgICAgIG5vdGlmaWNhdGlvbnMgb2YgcHJvcGVydHkgY2hhbmdlcyBzaW5jZSB0 aGV5IGFyZSBET00gbXV0YXRpb25zLCBvYmplY3RzCisgICAgICAgIGFkZGVkIG9yIHJlbW92ZWQs IGJlZm9yZSBwcm9wZXJ0aWVzIGluIHRoZSByZXN1bHRpbmcgb2JqZWN0cyBtYXkgYmUKKyAgICAg ICAgdXBkYXRlZC4gVGhpcyBwYXRjaCBmaXhlcyB0aGlzIHByb2JsZW0gYnkgbWFraW5nIGhhbmRs ZUNoaWxkcmVuQ2hhbmdlZAorICAgICAgICB0byBhY3R1YWxseSBoYW5kbGUgdGhlIG5vdGlmaWNh dGlvbnMgYW5kIHVwZGF0ZSB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgSW4gYWRkaXRpb24s IGhhbmRsaW5nIG9mIHRoZSAib3BlbiIgYXR0cmlidXRlIGZvciA8ZGlhbG9nPiBlbGVtZW50cyBu b3cKKyAgICAgICAgdXBkYXRlcyBjaGlsZHJlbiwgd2hpY2ggZml4ZXMgdGhlIGZsYWtpbmVzcyBv YnNlcnZlZCBpbiB0aGUKKyAgICAgICAgZGlhbG9nLXNob3dNb2RhbC5odG1sIHRlc3QuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQ2hpbGRyZW5DaGFuZ2VkKToKKyAgICAgICAgKFdlYkNv cmU6OkFYT2JqZWN0Q2FjaGU6Om5vdGlmaWNhdGlvblBvc3RUaW1lckZpcmVkKToKKyAgICAgICAg KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmRlZmVyTW9kYWxDaGFuZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6QVhPYmplY3RDYWNoZTo6aGFuZGxlQXR0cmlidXRlQ2hhbmdlKToKKyAgICAgICAgKFdl YkNvcmU6OkFYT2JqZWN0Q2FjaGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQpOgorICAg ICAgICAqIGFjY2Vzc2liaWxpdHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkFYSXNvbGF0ZWRUcmVlOjpjb2xsZWN0Tm9kZUNoYW5nZXNGb3JTdWJ0 cmVlKToKKyAgICAgICAgUmVtb3ZlZCBhbHRlcm5hdGl2ZSBmaXggd2hlcmUgd2Ugd2VyZSBwcm9j ZXNzaW5nIHRoZSBwZW5kaW5nCisgICAgICAgIENoaWxkcmVuQ2hhbmdlZCBOb3RpZmljYXRpb25z IGJlZm9yZSB1cGRhdGluZyB0aGUgaXNvbGF0ZWQgdHJlZS4KKyAgICAgICAgKiBhY2Nlc3NpYmls aXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5oOgorCiAyMDIyLTAyLTEzICBBbGFuIEJ1 anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJbnRlZ3JhdGlvbl0gSW50 cm9kdWNlIEJveDo6RWxlbWVudFR5cGU6OkludGVncmF0aW9uSW5saW5lQmxvY2sKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwCmluZGV4IGE5NWQyYWJl MjNkYTYwMTY5OTBiNmM1ZmMwOTI4NDdhMWY3NzEzODEuLmYzYTZmYWQ1ZTAzZDkzOTQxMTcxOGM4 ZDhmMTkyZmIxMzAzNGM2ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B WE9iamVjdENhY2hlLmNwcApAQCAtMTAxMCwxNSArMTAxMCwxNiBAQCB2b2lkIEFYT2JqZWN0Q2Fj aGU6OmhhbmRsZUNoaWxkcmVuQ2hhbmdlZChBY2Nlc3NpYmlsaXR5T2JqZWN0JiBvYmplY3QpCiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBUaGlzIG1ldGhvZCBpcyBtZWFudCBhcyBh IHF1aWNrIHdheSBvZiBtYXJraW5nIGEgcG9ydGlvbiBvZiB0aGUgYWNjZXNzaWJpbGl0eSB0cmVl IGRpcnR5LgogICAgIGlmICghb2JqZWN0Lm5vZGUoKSAmJiAhb2JqZWN0LnJlbmRlcmVyKCkpCiAg ICAgICAgIHJldHVybjsKIAotICAgIHBvc3ROb3RpZmljYXRpb24oJm9iamVjdCwgb2JqZWN0LmRv Y3VtZW50KCksIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKLQogICAgIC8vIFNob3VsZCBtYWtlIHRoZSBz dWJ0cmVlIGRpcnR5IHNvIHRoYXQgZXZlcnl0aGluZyBiZWxvdyB3aWxsIGJlIHVwZGF0ZWQgY29y cmVjdGx5LgogICAgIG9iamVjdC5zZXROZWVkc1RvVXBkYXRlU3VidHJlZSgpOwogCisgICAgLy8g SWYgaXNJZ25vcmVkIGhhcyBjaGFuZ2VkIGZvciBvYmplY3QsIG5vdGlmeSB0aGF0IENoaWxkcmVu Q2hhbmdlZCBmb3IgaXRzIHBhcmVudC4KKyAgICBpZiAob2JqZWN0LnBhcmVudE9iamVjdElmRXhp c3RzKCkgJiYgb2JqZWN0Lmhhc0lnbm9yZWRWYWx1ZUNoYW5nZWQoKSkKKyAgICAgICAgY2hpbGRy ZW5DaGFuZ2VkKG9iamVjdC5wYXJlbnRPYmplY3QoKSk7CisKICAgICAvLyBHbyB1cCB0aGUgZXhp c3RpbmcgYW5jZXN0b3JzIGNoYWluIGFuZCBmaXJlIHRoZSBhcHByb3ByaWF0ZSBub3RpZmljYXRp b25zLgogICAgIGJvb2wgc2hvdWxkVXBkYXRlUGFyZW50ID0gdHJ1ZTsKICAgICBmb3IgKGF1dG8q IHBhcmVudCA9ICZvYmplY3Q7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnRPYmplY3RJ ZkV4aXN0cygpKSB7CkBAIC0xMDQwLDYgKzEwNDEsMTIgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpo YW5kbGVDaGlsZHJlbkNoYW5nZWQoQWNjZXNzaWJpbGl0eU9iamVjdCYgb2JqZWN0KQogICAgICAg ICAgICAgc2hvdWxkVXBkYXRlUGFyZW50ID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CisKKyNp ZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQorICAgIHVwZGF0ZUlzb2xhdGVk VHJlZShvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKKyNlbmRpZgorCisgICAgcG9zdFBsYXRm b3JtTm90aWZpY2F0aW9uKCZvYmplY3QsIEFYQ2hpbGRyZW5DaGFuZ2VkKTsKIH0KIAogdm9pZCBB WE9iamVjdENhY2hlOjpoYW5kbGVNZW51T3BlbmVkKE5vZGUqIG5vZGUpCkBAIC0xMTI5LDI0ICsx MTM2LDE3IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQo KQogICAgICAgICB9CiAjZW5kaWYKIAotICAgICAgICAvLyBFbnN1cmUgdGhhdCB0aGlzIG1lbnUg cmVhbGx5IGlzIGEgbWVudS4gV2UgZG8gdGhpcyBjaGVjayBoZXJlIHNvIHRoYXQgd2UgZG9uJ3Qg aGF2ZSB0byBjcmVhdGUKLSAgICAgICAgLy8gdGhlIGF4Q2hpbGRyZW4gd2hlbiB0aGUgbWVudSBp cyBtYXJrZWQgYXMgb3BlbmluZy4KICAgICAgICAgaWYgKG5vdGUuc2Vjb25kID09IEFYTWVudU9w ZW5lZCkgeworICAgICAgICAgICAgLy8gT25seSBub3RpZnkgaWYgdGhlIG9iamVjdCBpcyBpbiBm YWN0IGEgbWVudS4KICAgICAgICAgICAgIG5vdGUuZmlyc3QtPnVwZGF0ZUNoaWxkcmVuSWZOZWNl c3NhcnkoKTsKICAgICAgICAgICAgIGlmIChub3RlLmZpcnN0LT5yb2xlVmFsdWUoKSAhPSBBY2Nl c3NpYmlsaXR5Um9sZTo6TWVudSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg fQogCi0gICAgICAgIGlmIChub3RlLnNlY29uZCA9PSBBWENoaWxkcmVuQ2hhbmdlZCAmJiBub3Rl LmZpcnN0LT5wYXJlbnRPYmplY3RJZkV4aXN0cygpCi0gICAgICAgICAgICAmJiBkb3duY2FzdDxB Y2Nlc3NpYmlsaXR5T2JqZWN0Pigqbm90ZS5maXJzdCkubGFzdEtub3duSXNJZ25vcmVkVmFsdWUo KSAhPSBub3RlLmZpcnN0LT5hY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkpCi0gICAgICAgICAgICBj aGlsZHJlbkNoYW5nZWQoZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU9iamVjdD4obm90ZS5maXJzdC0+ cGFyZW50T2JqZWN0KCkpKTsKLQogICAgICAgICBub3RpZmljYXRpb25zVG9Qb3N0LmFwcGVuZChu b3RlKTsKICAgICB9CiAKICNpZiBFTkFCTEUoQUNDRVNTSUJJTElUWV9JU09MQVRFRF9UUkVFKQot ICAgIC8vIEZJWE1FOiB0aGlzIHVwZGF0ZUlzb2xhdGVkVHJlZSBoZXJlIG1heSBiZSBwcmVtYXR1 cmUgaW4gc29tZSBjYXNlcy4KLSAgICAvLyBFLmcuLCBpZiB0aGUgY2hpbGRyZW5DaGFuZ2VkIGFi b3ZlIGlzIGhpdCwgd2Ugc2hvdWxkIHVwZGF0ZUlzb2xhdGVkVHJlZSBhZnRlciBwZXJmb3JtRGVm ZXJyZWRDYWNoZVVwZGF0ZS4KICAgICB1cGRhdGVJc29sYXRlZFRyZWUobm90aWZpY2F0aW9uc1Rv UG9zdCk7CiAjZW5kaWYKIApAQCAtMTI3MSw4ICsxMjcxLDE0IEBAIHZvaWQgQVhPYmplY3RDYWNo ZTo6ZGVmZXJNZW51TGlzdFZhbHVlQ2hhbmdlKEVsZW1lbnQqIGVsZW1lbnQpCiAKIHZvaWQgQVhP YmplY3RDYWNoZTo6ZGVmZXJNb2RhbENoYW5nZShFbGVtZW50KiBlbGVtZW50KQogewotICAgIGlm IChlbGVtZW50KQorICAgIGlmIChlbGVtZW50KSB7CiAgICAgICAgIG1fZGVmZXJyZWRNb2RhbENo YW5nZWRMaXN0LmFkZCgqZWxlbWVudCk7CisKKyAgICAgICAgLy8gTm90aWZ5IHRoYXQgcGFyZW50 J3MgY2hpbGRyZW4gaGF2ZSBjaGFuZ2VkLgorICAgICAgICBpZiAoYXV0byogYXhQYXJlbnQgPSBn ZXQoZWxlbWVudC0+cGFyZW50Tm9kZSgpKSkKKyAgICAgICAgICAgIG1fZGVmZXJyZWRDaGlsZHJl bkNoYW5nZWRMaXN0LmFkZChheFBhcmVudCk7CisgICAgfQorCiAgICAgaWYgKCFtX3BlcmZvcm1D YWNoZVVwZGF0ZVRpbWVyLmlzQWN0aXZlKCkpCiAgICAgICAgIG1fcGVyZm9ybUNhY2hlVXBkYXRl VGltZXIuc3RhcnRPbmVTaG90KDBfcyk7CiB9CkBAIC0xODI5LDcgKzE4MzUsNiBAQCB2b2lkIEFY T2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25zdCBRdWFsaWZpZWROYW1lJiBh dHRyTmFtZSwgRWxlbWVudAogICAgICAgICByZWNvbXB1dGVJc0lnbm9yZWQoZWxlbWVudC0+cGFy ZW50Tm9kZSgpKTsKICAgICB9CiAKLQogICAgIGlmICghYXR0ck5hbWUubG9jYWxOYW1lKCkuc3Ry aW5nKCkuc3RhcnRzV2l0aCgiYXJpYS0iKSkKICAgICAgICAgcmV0dXJuOwogCkBAIC0xODQ4LDcg KzE4NTMsOSBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZUF0dHJpYnV0ZUNoYW5nZShjb25z dCBRdWFsaWZpZWROYW1lJiBhdHRyTmFtZSwgRWxlbWVudAogICAgIGVsc2UgaWYgKGF0dHJOYW1l ID09IGFyaWFfZXhwYW5kZWRBdHRyKQogICAgICAgICBoYW5kbGVBcmlhRXhwYW5kZWRDaGFuZ2Uo ZWxlbWVudCk7CiAgICAgZWxzZSBpZiAoYXR0ck5hbWUgPT0gYXJpYV9oaWRkZW5BdHRyKSB7Ci0g ICAgICAgIGNoaWxkcmVuQ2hhbmdlZChlbGVtZW50LT5wYXJlbnROb2RlKCksIGVsZW1lbnQpOwor ICAgICAgICBpZiAoYXV0byogcGFyZW50ID0gZ2V0KGVsZW1lbnQtPnBhcmVudE5vZGUoKSkpCisg ICAgICAgICAgICBoYW5kbGVDaGlsZHJlbkNoYW5nZWQoKnBhcmVudCk7CisKICAgICAgICAgaWYg KG1fY3VycmVudE1vZGFsRWxlbWVudCAmJiBtX2N1cnJlbnRNb2RhbEVsZW1lbnQtPmlzRGVzY2Vu ZGFudE9mKGVsZW1lbnQpKSB7CiAgICAgICAgICAgICBtX21vZGFsTm9kZXNJbml0aWFsaXplZCA9 IGZhbHNlOwogICAgICAgICAgICAgZGVmZXJNb2RhbENoYW5nZShtX2N1cnJlbnRNb2RhbEVsZW1l bnQuZ2V0KCkpOwpAQCAtMzIyOCw4ICszMjM1LDYgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpwZXJm b3JtQ2FjaGVVcGRhdGVUaW1lckZpcmVkKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgcGVyZm9y bURlZmVycmVkQ2FjaGVVcGRhdGUoKTsKLSAgICAvLyBGSVhNRTogbmVlZCB0byB1cGRhdGUgdGhl IGlzb2xhdGVkIHRyZWUgYWZ0ZXIgdGhlIGFib3ZlIGNhY2hlIHVwZGF0ZS4KLSAgICAvLyBUaGlz IGlzIG1vc3QgbGlrZWx5IHRoZSBjYXVzZSBvZiBwcm9ibGVtcyB3aXRoIHRoZSBpc29sYXRlZCB0 cmVlIHVwZGF0ZXMuLgogfQogCiB2b2lkIEFYT2JqZWN0Q2FjaGU6OnByb2Nlc3NEZWZlcnJlZENo aWxkcmVuQ2hhbmdlZExpc3QoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJc29sYXRlZFRyZWUuY3BwCmluZGV4IDdmYzE3OWE2 MTM2NDEyOGEzMmIzM2QyNWJhOTUzYWM0OWI1ZDYzMzQuLjdlZjA2MmEwYzYwOGMxYThlZjMxMThh ZTQ0NDkxNjUyMGRjZDc2YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvaXNvbGF0ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9h Y2Nlc3NpYmlsaXR5L2lzb2xhdGVkdHJlZS9BWElzb2xhdGVkVHJlZS5jcHAKQEAgLTI4MCwxMCAr MjgwLDYgQEAgdm9pZCBBWElzb2xhdGVkVHJlZTo6Y29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJl ZShBWENvcmVPYmplY3QmIGF4T2JqZWN0LCBBWElEIHAKICAgICBBWFRSQUNFKCJBWElzb2xhdGVk VHJlZTo6Y29sbGVjdE5vZGVDaGFuZ2VzRm9yU3VidHJlZSIpOwogICAgIEFTU0VSVChpc01haW5U aHJlYWQoKSk7CiAKLSAgICBpZiAoIW1fY3JlYXRpbmdTdWJ0cmVlKQotICAgICAgICBheE9iamVj dENhY2hlKCktPnByb2Nlc3NEZWZlcnJlZENoaWxkcmVuQ2hhbmdlZExpc3QoKTsKLSAgICBTZXRG b3JTY29wZTxib29sPiBjcmVhdGluZ1N1YnRyZWUobV9jcmVhdGluZ1N1YnRyZWUsIHRydWUpOwot CiAgICAgYXV0byBub2RlQ2hhbmdlID0gbm9kZUNoYW5nZUZvck9iamVjdChheE9iamVjdCwgcGFy ZW50SUQsIGF0dGFjaFdyYXBwZXIpOwogICAgIGlmIChpZHNCZWluZ0NoYW5nZWQpCiAgICAgICAg IGlkc0JlaW5nQ2hhbmdlZC0+YWRkKG5vZGVDaGFuZ2UuaXNvbGF0ZWRPYmplY3QtPm9iamVjdElE KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRy ZWUvQVhJc29sYXRlZFRyZWUuaCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvaXNvbGF0 ZWR0cmVlL0FYSXNvbGF0ZWRUcmVlLmgKaW5kZXggYmQyY2E3MmE2NDlhZjdlNWM2NzJkNDJlMzZk MzNhZDc4ZGMxZjU1ZC4uNGFlMTI3MWE5Yzc0NTcwZDllNzhjZjc5YTU1MTQ0ZTBkMWJjZDNlNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pc29sYXRlZHRyZWUvQVhJ c29sYXRlZFRyZWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lzb2xhdGVk dHJlZS9BWElzb2xhdGVkVHJlZS5oCkBAIC00MjIsOCArNDIyLDYgQEAgcHJpdmF0ZToKICAgICBk b3VibGUgbV9wZW5kaW5nTG9hZGluZ1Byb2dyZXNzIFdURl9HVUFSREVEX0JZX0xPQ0sobV9jaGFu Z2VMb2dMb2NrKSB7IDAgfTsKICAgICBkb3VibGUgbV9sb2FkaW5nUHJvZ3Jlc3MgeyAwIH07CiAg ICAgTG9jayBtX2NoYW5nZUxvZ0xvY2s7Ci0KLSAgICBib29sIG1fY3JlYXRpbmdTdWJ0cmVlIHsg ZmFsc2UgfTsKIH07CiAKIGlubGluZSBBWE9iamVjdENhY2hlKiBBWElzb2xhdGVkVHJlZTo6YXhP YmplY3RDYWNoZSgpIGNvbnN0Cg==