236476 2022-02-10 17:21:34 -0800 [GTK] Sync gtk-overlay-scrolling setting to web process 2022-03-08 06:51:48 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro mcatanzaro alicem aperez bugs-noreply mcatanzaro oldest_to_newest 1840067 0 mcatanzaro 2022-02-10 17:21:34 -0800 Instead of checking only this environment variable, let's check the GtkSetting value as well. This is possible since r280077 now that we have GtkSettingsManager and GtkSettingsManagerProxy. Note the environment variable surprisingly actually overrides the value in settings. Also note the environment variable is specific to GTK 3 only. 1840068 1 451624 mcatanzaro 2022-02-10 17:24:57 -0800 Created attachment 451624 Patch 1840069 2 451624 mcatanzaro 2022-02-10 17:29:05 -0800 Comment on attachment 451624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451624&action=review > Source/WebCore/platform/adwaita/ScrollbarThemeAdwaita.cpp:74 > - static bool shouldUuseOverlayScrollbars = g_strcmp0(g_getenv("GTK_OVERLAY_SCROLLING"), "0"); > - return shouldUuseOverlayScrollbars; > + return shouldUseOverlayScrollbars(); Note this isn't quite right, because it's no longer static, so ScrollbarThemeAdwaita will check for settings changes, but RenderThemeScrollbar actually is still static so it won't check... I should change one or the other before landing this, probably RenderThemeScrollbar. Opinions welcome. 1840314 3 mcatanzaro 2022-02-11 06:01:20 -0800 I suppose I'll change it to be not static. 1840315 4 451683 mcatanzaro 2022-02-11 06:03:06 -0800 Created attachment 451683 Patch 1843011 5 mcatanzaro 2022-02-17 11:57:01 -0800 Ping reviewers. 1843018 6 alicem 2022-02-17 12:00:54 -0800 Do scrollbar invalidate if you change the setting in runtime? Existing code listens to "notify::gtk-theme-name", so I suppose you'll need to listen to "notify::gtk-overlay-scrolling" as well. 1843047 7 451683 mcatanzaro 2022-02-17 12:25:06 -0800 Comment on attachment 451683 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=451683&action=review > Source/WebKit/UIProcess/gtk/GtkSettingsManager.cpp:209 > g_signal_connect_swapped(m_settings, "notify::gtk-cursor-blink", G_CALLBACK(settingsChangedCallback), this); > g_signal_connect_swapped(m_settings, "notify::gtk-cursor-blink-time", G_CALLBACK(settingsChangedCallback), this); > g_signal_connect_swapped(m_settings, "notify::gtk-primary-button-warps-slider", G_CALLBACK(settingsChangedCallback), this); > + g_signal_connect_swapped(m_settings, "notify::gtk-overlay-scrolling", G_CALLBACK(settingsChangedCallback), this); We have notifies for everything here. 1843055 8 alicem 2022-02-17 12:32:09 -0800 That's UI process, I mean on the web process side. 1843057 9 alicem 2022-02-17 12:33:04 -0800 To be more specific, check this line in ScrollbarThemeGtk.cpp: g_signal_connect(gtk_settings_get_default(), "notify::gtk-theme-name", G_CALLBACK(themeChangedCallback), nullptr); 1843099 10 mcatanzaro 2022-02-17 13:26:54 -0800 Well it won't *immediately* notice changes, but it should notice next time scrollbars are drawn, because the change does get synced to the web process, yes? It's checking the setting each time. The setting is just a bool, so there isn't anything else to sync like there is in themeChangedCallback. 1843108 11 alicem 2022-02-17 13:44:06 -0800 Well, hence I wonder if it should call themeChanged() so it notices the changes immediately? :) 1844399 12 mcatanzaro 2022-02-21 15:06:34 -0800 OK, sure. 1844400 13 452780 mcatanzaro 2022-02-21 15:06:57 -0800 Created attachment 452780 Patch 1849240 14 ews-feeder 2022-03-08 06:51:44 -0800 Committed r290988 (248166@main): <https://commits.webkit.org/248166@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452780. 451624 2022-02-10 17:24:57 -0800 2022-02-11 06:03:03 -0800 Patch bug-236476-20220210192456.patch text/plain 10949 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTUxNzJkYjQyY2IzMTkw YWM0N2M2NmMzNjY3MzY1MjdkMzRjNGIzMC4uN2QyNDViMTc5ZWMzMjdkMWFkNGYwYjk2ZDE0YTM3 M2U4YWEwYTNlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTEwICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIFN5 bmMgZ3RrLW92ZXJsYXktc2Nyb2xsaW5nIHNldHRpbmcgdG8gd2ViIHByb2Nlc3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQ3NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY2hlY2tp bmcgb25seSB0aGlzIGVudmlyb25tZW50IHZhcmlhYmxlLCBsZXQncyBjaGVjayB0aGUgR3RrU2V0 dGluZyB2YWx1ZSBhcworICAgICAgICB3ZWxsLiBUaGlzIGlzIHBvc3NpYmxlIHNpbmNlIHIyODAw Nzcgbm93IHRoYXQgd2UgaGF2ZSBHdGtTZXR0aW5nc01hbmFnZXIgYW5kCisgICAgICAgIEd0a1Nl dHRpbmdzTWFuYWdlclByb3h5LiBOb3RlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBzdXJwcmlz aW5nbHkgYWN0dWFsbHkgb3ZlcnJpZGVzIHRoZQorICAgICAgICB2YWx1ZSBpbiBzZXR0aW5ncy4g QWxzbyBub3RlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBpcyBzcGVjaWZpYyB0byBHVEsgMyBv bmx5LgorCisgICAgICAgICogcGxhdGZvcm0vYWR3YWl0YS9TY3JvbGxiYXJUaGVtZUFkd2FpdGEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVBZHdhaXRhOjp1c2VzT3Zlcmxh eVNjcm9sbGJhcnMgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkVXNlT3ZlcmxheVNjcm9sbGJhcnMpOgorICAg ICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVTY3JvbGxiYXI6OlJlbmRlclRoZW1lU2Nyb2xsYmFyKToKKwogMjAyMi0wMi0xMCAgS2ltbW8g S2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltYWdlQnVmZmVyOjpn ZXQvcHV0UGl4ZWxCdWZmZXIgc2hvdWxkIG5vdCBnbyB0aHJvdWdoIERpc3BsYXlMaXN0CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CmluZGV4IGZjY2E3ZDFkOGM3NjBkODhjODY4NDdmMTUxMDdhNzdlZDUzODkxMjAuLmRkYzNlNDhm NjE4NzBiOGJjOTBhZGVlMzcwNGEzYzQ4YmYyYjExNjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMjItMDItMTAgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+ CisKKyAgICAgICAgW0dUS10gU3luYyBndGstb3ZlcmxheS1zY3JvbGxpbmcgc2V0dGluZyB0byB3 ZWIgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM2NDc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBTaGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpH dGtTZXR0aW5nc1N0YXRlOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpHdGtTZXR0 aW5nc1N0YXRlOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0 ZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcDoKKyAg ICAgICAgKFdlYktpdDo6R3RrU2V0dGluZ3NNYW5hZ2VyOjpvdmVybGF5U2Nyb2xsaW5nIGNvbnN0 KToKKyAgICAgICAgKFdlYktpdDo6R3RrU2V0dGluZ3NNYW5hZ2VyOjpzZXR0aW5nc0RpZENoYW5n ZSk6CisgICAgICAgIChXZWJLaXQ6Okd0a1NldHRpbmdzTWFuYWdlcjo6R3RrU2V0dGluZ3NNYW5h Z2VyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5oOgorICAg ICAgICAqIFdlYlByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlclByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6R3RrU2V0dGluZ3NNYW5hZ2VyUHJveHk6OmFwcGx5U2V0dGluZ3MpOgorCiAy MDIyLTAyLTEwICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAg ICAgSW1hZ2VCdWZmZXI6OmdldC9wdXRQaXhlbEJ1ZmZlciBzaG91bGQgbm90IGdvIHRocm91Z2gg RGlzcGxheUxpc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Fkd2FpdGEv U2Nyb2xsYmFyVGhlbWVBZHdhaXRhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Fkd2Fp dGEvU2Nyb2xsYmFyVGhlbWVBZHdhaXRhLmNwcAppbmRleCA3ODBkYjk5YTFhNzk5NGFmZmMzNWVl NDY1ZTM1NjRlZTllMGVkZmM5Li5iNDY5YzAzYTEyMzUzMzBkOGEwYTk2MzdkZmM1NWQ3YmJmNTFh MjUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hZHdhaXRhL1Njcm9sbGJh clRoZW1lQWR3YWl0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYWR3YWl0YS9T Y3JvbGxiYXJUaGVtZUFkd2FpdGEuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAjaW5jbHVkZSAiQ29s b3IuaCIKICNpbmNsdWRlICJGbG9hdFJvdW5kZWRSZWN0LmgiCiAjaW5jbHVkZSAiR3JhcGhpY3ND b250ZXh0LmgiCisjaW5jbHVkZSAiR3RrVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1N b3VzZUV2ZW50LmgiCiAjaW5jbHVkZSAiU2Nyb2xsYWJsZUFyZWEuaCIKICNpbmNsdWRlICJTY3Jv bGxiYXIuaCIKQEAgLTcwLDggKzcxLDcgQEAgdm9pZCBTY3JvbGxiYXJUaGVtZUFkd2FpdGE6OnVw ZGF0ZVNjcm9sbGJhck92ZXJsYXlTdHlsZShTY3JvbGxiYXImIHNjcm9sbGJhcikKIGJvb2wgU2Ny b2xsYmFyVGhlbWVBZHdhaXRhOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMoKSBjb25zdAogewogI2lm IFBMQVRGT1JNKEdUSykKLSAgICBzdGF0aWMgYm9vbCBzaG91bGRVdXNlT3ZlcmxheVNjcm9sbGJh cnMgPSBnX3N0cmNtcDAoZ19nZXRlbnYoIkdUS19PVkVSTEFZX1NDUk9MTElORyIpLCAiMCIpOwot ICAgIHJldHVybiBzaG91bGRVdXNlT3ZlcmxheVNjcm9sbGJhcnM7CisgICAgcmV0dXJuIHNob3Vs ZFVzZU92ZXJsYXlTY3JvbGxiYXJzKCk7CiAjZWxzZQogICAgIHJldHVybiB0cnVlOwogI2VuZGlm CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwCmluZGV4IDdi MGQ2ZGU5OGIzODMzYzZlMjJiOTU5NzBiOWM1NThjNDAzMmI2NTEuLmEzNDNjMjllNGQ2ZTZlNWQy YzU1NzkyYTM3YmE4N2NkOWZkNDE0MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HdGtVdGlsaXRpZXMuY3BwCkBAIC0yMDcsNCArMjA3LDE4IEBAIHZvaWQgbW9uaXRvcldvcmtB cmVhKEdka01vbml0b3IqIG1vbml0b3IsIEdka1JlY3RhbmdsZSogYXJlYSkKICNlbmRpZgogfQog Citib29sIHNob3VsZFVzZU92ZXJsYXlTY3JvbGxiYXJzKCkKK3sKKyNpZiAhVVNFKEdUSzQpCisg ICAgaWYgKCFnX3N0cmNtcDAgKGdfZ2V0ZW52ICgiR1RLX09WRVJMQVlfU0NST0xMSU5HIiksICIw IikpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorCisgICAgZ2Jvb2xlYW4gb3Zlcmxh eVNjcm9sbGluZzsKKyAgICBnX29iamVjdF9nZXQoZ3RrX3NldHRpbmdzX2dldF9kZWZhdWx0KCks CisgICAgICAgICJndGstb3ZlcmxheS1zY3JvbGxpbmciLAorICAgICAgICAmb3ZlcmxheVNjcm9s bGluZywgbnVsbHB0cik7CisgICAgcmV0dXJuICEhb3ZlcmxheVNjcm9sbGluZzsKK30KKwogfSAv LyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0d0a1V0aWxpdGllcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxp dGllcy5oCmluZGV4IGE1ZmFjYjIxMGQxY2NlYmQwOGFlNmY0NmYxZjM0YTRjOWJjMmVmNzkuLjk2 MTI0Zjk2ZTM1MjcxMTY0OGU3ZGY4OWRlMzZiODk5YTY1ZjhlZjcgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKQEAgLTU3LDQgKzU3LDYgQEAgV0VCQ09SRV9F WFBPUlQgR2RrRHJhZ0FjdGlvbiBkcmFnT3BlcmF0aW9uVG9TaW5nbGVHZGtEcmFnQWN0aW9uKE9w dGlvblNldDxEcmFnT3AKIAogdm9pZCBtb25pdG9yV29ya0FyZWEoR2RrTW9uaXRvciosIEdka1Jl Y3RhbmdsZSopOwogCitib29sIHNob3VsZFVzZU92ZXJsYXlTY3JvbGxiYXJzKCk7CisKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9SZW5kZXJUaGVtZVNjcm9sbGJhci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv UmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwCmluZGV4IGU2MzUzYzNhNTdkZTNiZDlkODFjZmU3YjBl MTQwOGZhNTJjZDgxNjYuLmRlNzk4ZmQ0MDBhODQ0NzU5MmJiNTYwZWIwOTVkNzNmYzY0YmJlODUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZVNjcm9s bGJhci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lU2Ny b2xsYmFyLmNwcApAQCAtMjgsNiArMjgsNyBAQAogCiAjaWYgIVVTRShHVEs0KQogCisjaW5jbHVk ZSAiR3RrVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KICNpbmNsdWRlIDx3 dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIApAQCAtNzcsNyArNzgsNyBAQCBSZW5kZXJUaGVtZVNjcm9s bGJhcjo6UmVuZGVyVGhlbWVTY3JvbGxiYXIoR3RrT3JpZW50YXRpb24gb3JpZW50YXRpb24sIE1v ZGUgbW9kZQogICAgICAgICBpbmZvLmNsYXNzTGlzdC5hcHBlbmQoImhvcml6b250YWwiKTsKICAg ICAgICAgaW5mby5jbGFzc0xpc3QuYXBwZW5kKCJib3R0b20iKTsKICAgICB9Ci0gICAgc3RhdGlj IGJvb2wgdXNlc092ZXJsYXlTY3JvbGxiYXJzID0gZ19zdHJjbXAwKGdfZ2V0ZW52KCJHVEtfT1ZF UkxBWV9TQ1JPTExJTkciKSwgIjAiKTsKKyAgICBzdGF0aWMgYm9vbCB1c2VzT3ZlcmxheVNjcm9s bGJhcnMgPSBzaG91bGRVc2VPdmVybGF5U2Nyb2xsYmFycygpOwogICAgIGlmICh1c2VzT3Zlcmxh eVNjcm9sbGJhcnMpCiAgICAgICAgIGluZm8uY2xhc3NMaXN0LmFwcGVuZCgib3ZlcmxheS1pbmRp Y2F0b3IiKTsKICAgICBpZiAobW9kZSA9PSBNb2RlOjpGdWxsKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9TaGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuY3BwIGIvU291cmNlL1dlYktpdC9T aGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuY3BwCmluZGV4IDYzODdkNWNjMDg1ZjVhOTU1ZjM2 OTg1MjJjNjZjNWQyYjFjMDlkNGEuLmFmYTA1YzY1NjFmNTQyZjM3MzBiNWNiOTU3YzNkZWU5ZmMw ODgyNmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0 YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5j cHAKQEAgLTQyLDYgKzQyLDcgQEAgdm9pZCBHdGtTZXR0aW5nc1N0YXRlOjplbmNvZGUoSVBDOjpF bmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgY3Vyc29yQmxpbms7CiAgICAg ZW5jb2RlciA8PCBjdXJzb3JCbGlua1RpbWU7CiAgICAgZW5jb2RlciA8PCBwcmltYXJ5QnV0dG9u V2FycHNTbGlkZXI7CisgICAgZW5jb2RlciA8PCBvdmVybGF5U2Nyb2xsaW5nOwogfQogCiBzdGQ6 Om9wdGlvbmFsPEd0a1NldHRpbmdzU3RhdGU+IEd0a1NldHRpbmdzU3RhdGU6OmRlY29kZShJUEM6 OkRlY29kZXImIGRlY29kZXIpCkBAIC03OCw2ICs3OSw5IEBAIHN0ZDo6b3B0aW9uYWw8R3RrU2V0 dGluZ3NTdGF0ZT4gR3RrU2V0dGluZ3NTdGF0ZTo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2Rl cikKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHN0YXRlLnByaW1hcnlCdXR0b25XYXJwc1NsaWRl cikpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CiAKKyAgICBpZiAoIWRlY29kZXIuZGVj b2RlKHN0YXRlLm92ZXJsYXlTY3JvbGxpbmcpKQorICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0 OworCiAgICAgcmV0dXJuIHN0YXRlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL0d0 a1NldHRpbmdzU3RhdGUuaAppbmRleCBhZTY5ZWNlMmY5MzdlNTlmOWZjNDYxNjhhZDk4ZmNiNzA1 MTM4YjE0Li5iNmVmZTE2ZDM2OWRhM2QwMjE4ZWY4MjVlYmQxNzhjMDgzZjhiOWNhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmgKQEAgLTUwLDYgKzUwLDcg QEAgc3RydWN0IEd0a1NldHRpbmdzU3RhdGUgewogICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4gY3Vy c29yQmxpbms7CiAgICAgc3RkOjpvcHRpb25hbDxpbnQ+IGN1cnNvckJsaW5rVGltZTsKICAgICBz dGQ6Om9wdGlvbmFsPGJvb2w+IHByaW1hcnlCdXR0b25XYXJwc1NsaWRlcjsKKyAgICBzdGQ6Om9w dGlvbmFsPGJvb2w+IG92ZXJsYXlTY3JvbGxpbmc7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdl ci5jcHAKaW5kZXggZjMyMTE4NWNhN2VkOWEyYTI1N2QwMWFiZWFjNDU4MzliNzk5ZjViMC4uYzUw MmQyZGM1MmU3ZjdkNDg4OWRmMjZlYmJmMzNhZmMzYmMxNGI2MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5jcHAKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5jcHAKQEAgLTExOCw2ICsx MTgsMTMgQEAgYm9vbCBHdGtTZXR0aW5nc01hbmFnZXI6OnByaW1hcnlCdXR0b25XYXJwc1NsaWRl cigpIGNvbnN0CiAgICAgcmV0dXJuIGJ1dHRvblNldHRpbmcgPyB0cnVlIDogZmFsc2U7CiB9CiAK K2Jvb2wgR3RrU2V0dGluZ3NNYW5hZ2VyOjpvdmVybGF5U2Nyb2xsaW5nKCkgY29uc3QKK3sKKyAg ICBnYm9vbGVhbiBvdmVybGF5U2Nyb2xsaW5nU2V0dGluZzsKKyAgICBnX29iamVjdF9nZXQobV9z ZXR0aW5ncywgImd0ay1vdmVybGF5LXNjcm9sbGluZyIsICZvdmVybGF5U2Nyb2xsaW5nU2V0dGlu ZywgbnVsbHB0cik7CisgICAgcmV0dXJuIG92ZXJsYXlTY3JvbGxpbmdTZXR0aW5nID8gdHJ1ZSA6 IGZhbHNlOworfQorCiB2b2lkIEd0a1NldHRpbmdzTWFuYWdlcjo6c2V0dGluZ3NEaWRDaGFuZ2Uo KQogewogICAgIEd0a1NldHRpbmdzU3RhdGUgc3RhdGU7CkBAIC0xNjIsNiArMTY5LDEwIEBAIHZv aWQgR3RrU2V0dGluZ3NNYW5hZ2VyOjpzZXR0aW5nc0RpZENoYW5nZSgpCiAgICAgaWYgKG1fc2V0 dGluZ3NTdGF0ZS5wcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIgIT0gcHJpbWFyeUJ1dHRvbldhcnBz U2xpZGVyKQogICAgICAgICBtX3NldHRpbmdzU3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVy ID0gc3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyID0gcHJpbWFyeUJ1dHRvbldhcnBzU2xp ZGVyOwogCisgICAgYXV0byBvdmVybGF5U2Nyb2xsaW5nID0gdGhpcy0+b3ZlcmxheVNjcm9sbGlu ZygpOworICAgIGlmIChtX3NldHRpbmdzU3RhdGUub3ZlcmxheVNjcm9sbGluZyAhPSBvdmVybGF5 U2Nyb2xsaW5nKQorICAgICAgICBtX3NldHRpbmdzU3RhdGUub3ZlcmxheVNjcm9sbGluZyA9IHN0 YXRlLm92ZXJsYXlTY3JvbGxpbmcgPSBvdmVybGF5U2Nyb2xsaW5nOworCiAgICAgZm9yIChhdXRv JiBwcm9jZXNzUG9vbCA6IFdlYlByb2Nlc3NQb29sOjphbGxQcm9jZXNzUG9vbHMoKSkKICAgICAg ICAgcHJvY2Vzc1Bvb2wtPnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6R3RrU2V0dGluZ3NN YW5hZ2VyUHJveHk6OlNldHRpbmdzRGlkQ2hhbmdlKHN0YXRlKSk7CiB9CkBAIC0xODMsNiArMTk0 LDcgQEAgR3RrU2V0dGluZ3NNYW5hZ2VyOjpHdGtTZXR0aW5nc01hbmFnZXIoKQogICAgIG1fc2V0 dGluZ3NTdGF0ZS5jdXJzb3JCbGluayA9IGN1cnNvckJsaW5rKCk7CiAgICAgbV9zZXR0aW5nc1N0 YXRlLmN1cnNvckJsaW5rVGltZSA9IGN1cnNvckJsaW5rVGltZSgpOwogICAgIG1fc2V0dGluZ3NT dGF0ZS5wcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIgPSBwcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIo KTsKKyAgICBtX3NldHRpbmdzU3RhdGUub3ZlcmxheVNjcm9sbGluZyA9IG92ZXJsYXlTY3JvbGxp bmcoKTsKIAogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3NldHRpbmdzLCAibm90aWZ5 OjpndGstdGhlbWUtbmFtZSIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDaGFuZ2VkQ2FsbGJhY2spLCB0 aGlzKTsKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9zZXR0aW5ncywgIm5vdGlmeTo6 Z3RrLWZvbnQtbmFtZSIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDaGFuZ2VkQ2FsbGJhY2spLCB0aGlz KTsKQEAgLTE5NCw2ICsyMDYsNyBAQCBHdGtTZXR0aW5nc01hbmFnZXI6Okd0a1NldHRpbmdzTWFu YWdlcigpCiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fc2V0dGluZ3MsICJub3RpZnk6 Omd0ay1jdXJzb3ItYmxpbmsiLCBHX0NBTExCQUNLKHNldHRpbmdzQ2hhbmdlZENhbGxiYWNrKSwg dGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fc2V0dGluZ3MsICJub3RpZnk6 Omd0ay1jdXJzb3ItYmxpbmstdGltZSIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDaGFuZ2VkQ2FsbGJh Y2spLCB0aGlzKTsKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9zZXR0aW5ncywgIm5v dGlmeTo6Z3RrLXByaW1hcnktYnV0dG9uLXdhcnBzLXNsaWRlciIsIEdfQ0FMTEJBQ0soc2V0dGlu Z3NDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQo bV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLW92ZXJsYXktc2Nyb2xsaW5nIiwgR19DQUxMQkFDSyhz ZXR0aW5nc0NoYW5nZWRDYWxsYmFjayksIHRoaXMpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJL aXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01h bmFnZXIuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXIu aAppbmRleCBmYjQ0YTk3MmVmYjM3NjllZGQyOTIxNzMyMzMwZWZlNmUzYjBjOGM0Li5jZjllOGVi YzIzNTNlZDBkZmQ1NjYzZTNmOWJkODVkYjI5YWY3MWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5oCkBAIC01Myw2ICs1Myw3IEBAIHBy aXZhdGU6CiAgICAgYm9vbCBjdXJzb3JCbGluaygpIGNvbnN0OwogICAgIGludCBjdXJzb3JCbGlu a1RpbWUoKSBjb25zdDsKICAgICBib29sIHByaW1hcnlCdXR0b25XYXJwc1NsaWRlcigpIGNvbnN0 OworICAgIGJvb2wgb3ZlcmxheVNjcm9sbGluZygpIGNvbnN0OwogCiAgICAgR3RrU2V0dGluZ3Mq IG1fc2V0dGluZ3M7CiAgICAgR3RrU2V0dGluZ3NTdGF0ZSBtX3NldHRpbmdzU3RhdGU7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlclBy b3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2Vy UHJveHkuY3BwCmluZGV4IGNjZTlkMzdjY2Y3ZjY0MWYyOTNmNThmNWY3NWY4MDQ5NDI5Mzk2MTMu LjA5YmZmOTI0NDdjY2QyZjU4YTNjYjM1NTkyMmM5MzI5ZDg0M2YzYjEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyUHJveHku Y3BwCkBAIC04NSw2ICs4NSw5IEBAIHZvaWQgR3RrU2V0dGluZ3NNYW5hZ2VyUHJveHk6OmFwcGx5 U2V0dGluZ3MoR3RrU2V0dGluZ3NTdGF0ZSYmIHN0YXRlKQogCiAgICAgaWYgKHN0YXRlLnByaW1h cnlCdXR0b25XYXJwc1NsaWRlcikKICAgICAgICAgZ19vYmplY3Rfc2V0KG1fc2V0dGluZ3MsICJn dGstcHJpbWFyeS1idXR0b24td2FycHMtc2xpZGVyIiwgKnN0YXRlLnByaW1hcnlCdXR0b25XYXJw c1NsaWRlciwgbnVsbHB0cik7CisKKyAgICBpZiAoc3RhdGUub3ZlcmxheVNjcm9sbGluZykKKyAg ICAgICAgZ19vYmplY3Rfc2V0KG1fc2V0dGluZ3MsICJndGstb3ZlcmxheS1zY3JvbGxpbmciLCAq c3RhdGUub3ZlcmxheVNjcm9sbGluZywgbnVsbHB0cik7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdl YktpdAo= 451683 2022-02-11 06:03:06 -0800 2022-02-21 15:06:54 -0800 Patch bug-236476-20220211080305.patch text/plain 10854 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjg5NjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRhYzQ3ZjU2YzVlZTQ5 ODdlZTZmNjdhZTRlMTg5MjcxOWUzY2FiNi4uZTg3YjQyZDY3YjRiZjk5OTQ4Y2M3M2M5MDkyMWZl MmJjNWU1ZDQ3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAyLTExICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIFN5 bmMgZ3RrLW92ZXJsYXktc2Nyb2xsaW5nIHNldHRpbmcgdG8gd2ViIHByb2Nlc3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQ3NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2YgY2hlY2tp bmcgb25seSB0aGlzIGVudmlyb25tZW50IHZhcmlhYmxlLCBsZXQncyBjaGVjayB0aGUgR3RrU2V0 dGluZyB2YWx1ZSBhcworICAgICAgICB3ZWxsLiBUaGlzIGlzIHBvc3NpYmxlIHNpbmNlIHIyODAw Nzcgbm93IHRoYXQgd2UgaGF2ZSBHdGtTZXR0aW5nc01hbmFnZXIgYW5kCisgICAgICAgIEd0a1Nl dHRpbmdzTWFuYWdlclByb3h5LiBOb3RlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBzdXJwcmlz aW5nbHkgYWN0dWFsbHkgb3ZlcnJpZGVzIHRoZQorICAgICAgICB2YWx1ZSBpbiBzZXR0aW5ncy4g QWxzbyBub3RlIHRoZSBlbnZpcm9ubWVudCB2YXJpYWJsZSBpcyBzcGVjaWZpYyB0byBHVEsgMyBv bmx5LgorCisgICAgICAgICogcGxhdGZvcm0vYWR3YWl0YS9TY3JvbGxiYXJUaGVtZUFkd2FpdGEu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVBZHdhaXRhOjp1c2VzT3Zlcmxh eVNjcm9sbGJhcnMgY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkVXNlT3ZlcmxheVNjcm9sbGJhcnMpOgorICAg ICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9n dGsvUmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhl bWVTY3JvbGxiYXI6OlJlbmRlclRoZW1lU2Nyb2xsYmFyKToKKwogMjAyMi0wMi0xMSAgQW50dGkg S29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NTUyBDb250YWluZXIgUXVl cmllc10gSW1wbGVtZW50IGNvbnRhaW5lciBuYW1lIG1hdGNoaW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM2ZjFj OTNjODNhMjQ3MGJjMzU2NzI2YTM1MmRmZmQ3MjZhZjZkNGUuLmQ1YmJlY2Y5OGIwNDFhYjFjOGYx OWRjMDQ1MzQzMTE3Y2YzZWJhNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjItMDIt MTEgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAg W0dUS10gU3luYyBndGstb3ZlcmxheS1zY3JvbGxpbmcgc2V0dGluZyB0byB3ZWIgcHJvY2Vzcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2NDc2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQv Z3RrL0d0a1NldHRpbmdzU3RhdGUuY3BwOgorICAgICAgICAoV2ViS2l0OjpHdGtTZXR0aW5nc1N0 YXRlOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpHdGtTZXR0aW5nc1N0YXRlOjpk ZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktp dDo6R3RrU2V0dGluZ3NNYW5hZ2VyOjpvdmVybGF5U2Nyb2xsaW5nIGNvbnN0KToKKyAgICAgICAg KFdlYktpdDo6R3RrU2V0dGluZ3NNYW5hZ2VyOjpzZXR0aW5nc0RpZENoYW5nZSk6CisgICAgICAg IChXZWJLaXQ6Okd0a1NldHRpbmdzTWFuYWdlcjo6R3RrU2V0dGluZ3NNYW5hZ2VyKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 R3RrU2V0dGluZ3NNYW5hZ2VyUHJveHk6OmFwcGx5U2V0dGluZ3MpOgorCiAyMDIyLTAyLTExICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU09V UF0gRml4IG1lbW9yeSBsZWFrIGluIFdlYktpdERpcmVjdG9yeUlucHV0U3RyZWFtCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hZHdhaXRhL1Njcm9sbGJhclRoZW1lQWR3YWl0 YS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hZHdhaXRhL1Njcm9sbGJhclRoZW1lQWR3 YWl0YS5jcHAKaW5kZXggNzgwZGI5OWExYTc5OTRhZmZjMzVlZTQ2NWUzNTY0ZWU5ZTBlZGZjOS4u NmFmMDhiODg0NjZiZGIwYTI3YzU3NThmYjNmZGZiZjkxNTczMGM2YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYWR3YWl0YS9TY3JvbGxiYXJUaGVtZUFkd2FpdGEuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Fkd2FpdGEvU2Nyb2xsYmFyVGhlbWVBZHdhaXRh LmNwcApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIlRoZW1lQWR3YWl0YS5oIgogCiAjaWYg UExBVEZPUk0oR1RLKQorI2luY2x1ZGUgIkd0a1V0aWxpdGllcy5oIgogI2luY2x1ZGUgPGd0ay9n dGsuaD4KICNlbmRpZgogCkBAIC03MCw4ICs3MSw3IEBAIHZvaWQgU2Nyb2xsYmFyVGhlbWVBZHdh aXRhOjp1cGRhdGVTY3JvbGxiYXJPdmVybGF5U3R5bGUoU2Nyb2xsYmFyJiBzY3JvbGxiYXIpCiBi b29sIFNjcm9sbGJhclRoZW1lQWR3YWl0YTo6dXNlc092ZXJsYXlTY3JvbGxiYXJzKCkgY29uc3QK IHsKICNpZiBQTEFURk9STShHVEspCi0gICAgc3RhdGljIGJvb2wgc2hvdWxkVXVzZU92ZXJsYXlT Y3JvbGxiYXJzID0gZ19zdHJjbXAwKGdfZ2V0ZW52KCJHVEtfT1ZFUkxBWV9TQ1JPTExJTkciKSwg IjAiKTsKLSAgICByZXR1cm4gc2hvdWxkVXVzZU92ZXJsYXlTY3JvbGxiYXJzOworICAgIHJldHVy biBzaG91bGRVc2VPdmVybGF5U2Nyb2xsYmFycygpOwogI2Vsc2UKICAgICByZXR1cm4gdHJ1ZTsK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxp dGllcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcApp bmRleCA3YjBkNmRlOThiMzgzM2M2ZTIyYjk1OTcwYjljNTU4YzQwMzJiNjUxLi5hMzQzYzI5ZTRk NmU2ZTVkMmM1NTc5MmEzN2JhODdjZDlmZDQxNDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmNwcApAQCAtMjA3LDQgKzIwNywxOCBAQCB2b2lkIG1vbml0 b3JXb3JrQXJlYShHZGtNb25pdG9yKiBtb25pdG9yLCBHZGtSZWN0YW5nbGUqIGFyZWEpCiAjZW5k aWYKIH0KIAorYm9vbCBzaG91bGRVc2VPdmVybGF5U2Nyb2xsYmFycygpCit7CisjaWYgIVVTRShH VEs0KQorICAgIGlmICghZ19zdHJjbXAwIChnX2dldGVudiAoIkdUS19PVkVSTEFZX1NDUk9MTElO RyIpLCAiMCIpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKKworICAgIGdib29sZWFu IG92ZXJsYXlTY3JvbGxpbmc7CisgICAgZ19vYmplY3RfZ2V0KGd0a19zZXR0aW5nc19nZXRfZGVm YXVsdCgpLAorICAgICAgICAiZ3RrLW92ZXJsYXktc2Nyb2xsaW5nIiwKKyAgICAgICAgJm92ZXJs YXlTY3JvbGxpbmcsIG51bGxwdHIpOworICAgIHJldHVybiAhIW92ZXJsYXlTY3JvbGxpbmc7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9H dGtVdGlsaXRpZXMuaAppbmRleCBhNWZhY2IyMTBkMWNjZWJkMDhhZTZmNDZmMWYzNGE0YzliYzJl Zjc5Li45NjEyNGY5NmUzNTI3MTE2NDhlN2RmODlkZTM2Yjg5OWE2NWY4ZWY3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5oCkBAIC01Nyw0ICs1Nyw2IEBAIFdF QkNPUkVfRVhQT1JUIEdka0RyYWdBY3Rpb24gZHJhZ09wZXJhdGlvblRvU2luZ2xlR2RrRHJhZ0Fj dGlvbihPcHRpb25TZXQ8RHJhZ09wCiAKIHZvaWQgbW9uaXRvcldvcmtBcmVhKEdka01vbml0b3Iq LCBHZGtSZWN0YW5nbGUqKTsKIAorYm9vbCBzaG91bGRVc2VPdmVybGF5U2Nyb2xsYmFycygpOwor CiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1JlbmRlclRoZW1lU2Nyb2xsYmFyLmNwcAppbmRleCBlNjM1M2MzYTU3ZGUzYmQ5ZDgx Y2ZlN2IwZTE0MDhmYTUyY2Q4MTY2Li4yYTMxMjMwYzRhY2NiMDVmYjg0ZDI3ZTEzNTljZDUwNmEz ZmE5YjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUmVuZGVyVGhl bWVTY3JvbGxiYXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJU aGVtZVNjcm9sbGJhci5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lmICFVU0UoR1RLNCkKIAor I2luY2x1ZGUgIkd0a1V0aWxpdGllcy5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5j bHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKQEAgLTc3LDggKzc4LDcgQEAgUmVuZGVyVGhl bWVTY3JvbGxiYXI6OlJlbmRlclRoZW1lU2Nyb2xsYmFyKEd0a09yaWVudGF0aW9uIG9yaWVudGF0 aW9uLCBNb2RlIG1vZGUKICAgICAgICAgaW5mby5jbGFzc0xpc3QuYXBwZW5kKCJob3Jpem9udGFs Iik7CiAgICAgICAgIGluZm8uY2xhc3NMaXN0LmFwcGVuZCgiYm90dG9tIik7CiAgICAgfQotICAg IHN0YXRpYyBib29sIHVzZXNPdmVybGF5U2Nyb2xsYmFycyA9IGdfc3RyY21wMChnX2dldGVudigi R1RLX09WRVJMQVlfU0NST0xMSU5HIiksICIwIik7Ci0gICAgaWYgKHVzZXNPdmVybGF5U2Nyb2xs YmFycykKKyAgICBpZiAoc2hvdWxkVXNlT3ZlcmxheVNjcm9sbGJhcnMoKSkKICAgICAgICAgaW5m by5jbGFzc0xpc3QuYXBwZW5kKCJvdmVybGF5LWluZGljYXRvciIpOwogICAgIGlmIChtb2RlID09 IE1vZGU6OkZ1bGwpCiAgICAgICAgIGluZm8uY2xhc3NMaXN0LmFwcGVuZCgiaG92ZXJpbmciKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmNw cCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmNwcAppbmRleCA2 Mzg3ZDVjYzA4NWY1YTk1NWYzNjk4NTIyYzY2YzVkMmIxYzA5ZDRhLi5hZmEwNWM2NTYxZjU0MmYz NzMwYjVjYjk1N2MzZGVlOWZjMDg4MjZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3Rr L0d0a1NldHRpbmdzU3RhdGUuY3BwCkBAIC00Miw2ICs0Miw3IEBAIHZvaWQgR3RrU2V0dGluZ3NT dGF0ZTo6ZW5jb2RlKElQQzo6RW5jb2RlciYgZW5jb2RlcikgY29uc3QKICAgICBlbmNvZGVyIDw8 IGN1cnNvckJsaW5rOwogICAgIGVuY29kZXIgPDwgY3Vyc29yQmxpbmtUaW1lOwogICAgIGVuY29k ZXIgPDwgcHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyOworICAgIGVuY29kZXIgPDwgb3ZlcmxheVNj cm9sbGluZzsKIH0KIAogc3RkOjpvcHRpb25hbDxHdGtTZXR0aW5nc1N0YXRlPiBHdGtTZXR0aW5n c1N0YXRlOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQpAQCAtNzgsNiArNzksOSBAQCBz dGQ6Om9wdGlvbmFsPEd0a1NldHRpbmdzU3RhdGU+IEd0a1NldHRpbmdzU3RhdGU6OmRlY29kZShJ UEM6OkRlY29kZXImIGRlY29kZXIpCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShzdGF0ZS5wcmlt YXJ5QnV0dG9uV2FycHNTbGlkZXIpKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0OwogCisg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShzdGF0ZS5vdmVybGF5U2Nyb2xsaW5nKSkKKyAgICAgICAg cmV0dXJuIHN0ZDo6bnVsbG9wdDsKKwogICAgIHJldHVybiBzdGF0ZTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuaCBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmgKaW5kZXggYWU2OWVjZTJmOTM3ZTU5 ZjlmYzQ2MTY4YWQ5OGZjYjcwNTEzOGIxNC4uYjZlZmUxNmQzNjlkYTNkMDIxOGVmODI1ZWJkMTc4 YzA4M2Y4YjljYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL0d0a1NldHRp bmdzU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0 ZS5oCkBAIC01MCw2ICs1MCw3IEBAIHN0cnVjdCBHdGtTZXR0aW5nc1N0YXRlIHsKICAgICBzdGQ6 Om9wdGlvbmFsPGJvb2w+IGN1cnNvckJsaW5rOwogICAgIHN0ZDo6b3B0aW9uYWw8aW50PiBjdXJz b3JCbGlua1RpbWU7CiAgICAgc3RkOjpvcHRpb25hbDxib29sPiBwcmltYXJ5QnV0dG9uV2FycHNT bGlkZXI7CisgICAgc3RkOjpvcHRpb25hbDxib29sPiBvdmVybGF5U2Nyb2xsaW5nOwogfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0 ay9HdGtTZXR0aW5nc01hbmFnZXIuY3BwCmluZGV4IGYzMjExODVjYTdlZDlhMmEyNTdkMDFhYmVh YzQ1ODM5Yjc5OWY1YjAuLmM1MDJkMmRjNTJlN2Y3ZDQ4ODlkZjI2ZWJiZjMzYWZjM2JjMTRiNjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFn ZXIuY3BwCkBAIC0xMTgsNiArMTE4LDEzIEBAIGJvb2wgR3RrU2V0dGluZ3NNYW5hZ2VyOjpwcmlt YXJ5QnV0dG9uV2FycHNTbGlkZXIoKSBjb25zdAogICAgIHJldHVybiBidXR0b25TZXR0aW5nID8g dHJ1ZSA6IGZhbHNlOwogfQogCitib29sIEd0a1NldHRpbmdzTWFuYWdlcjo6b3ZlcmxheVNjcm9s bGluZygpIGNvbnN0Cit7CisgICAgZ2Jvb2xlYW4gb3ZlcmxheVNjcm9sbGluZ1NldHRpbmc7Cisg ICAgZ19vYmplY3RfZ2V0KG1fc2V0dGluZ3MsICJndGstb3ZlcmxheS1zY3JvbGxpbmciLCAmb3Zl cmxheVNjcm9sbGluZ1NldHRpbmcsIG51bGxwdHIpOworICAgIHJldHVybiBvdmVybGF5U2Nyb2xs aW5nU2V0dGluZyA/IHRydWUgOiBmYWxzZTsKK30KKwogdm9pZCBHdGtTZXR0aW5nc01hbmFnZXI6 OnNldHRpbmdzRGlkQ2hhbmdlKCkKIHsKICAgICBHdGtTZXR0aW5nc1N0YXRlIHN0YXRlOwpAQCAt MTYyLDYgKzE2OSwxMCBAQCB2b2lkIEd0a1NldHRpbmdzTWFuYWdlcjo6c2V0dGluZ3NEaWRDaGFu Z2UoKQogICAgIGlmIChtX3NldHRpbmdzU3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyICE9 IHByaW1hcnlCdXR0b25XYXJwc1NsaWRlcikKICAgICAgICAgbV9zZXR0aW5nc1N0YXRlLnByaW1h cnlCdXR0b25XYXJwc1NsaWRlciA9IHN0YXRlLnByaW1hcnlCdXR0b25XYXJwc1NsaWRlciA9IHBy aW1hcnlCdXR0b25XYXJwc1NsaWRlcjsKIAorICAgIGF1dG8gb3ZlcmxheVNjcm9sbGluZyA9IHRo aXMtPm92ZXJsYXlTY3JvbGxpbmcoKTsKKyAgICBpZiAobV9zZXR0aW5nc1N0YXRlLm92ZXJsYXlT Y3JvbGxpbmcgIT0gb3ZlcmxheVNjcm9sbGluZykKKyAgICAgICAgbV9zZXR0aW5nc1N0YXRlLm92 ZXJsYXlTY3JvbGxpbmcgPSBzdGF0ZS5vdmVybGF5U2Nyb2xsaW5nID0gb3ZlcmxheVNjcm9sbGlu ZzsKKwogICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wgOiBXZWJQcm9jZXNzUG9vbDo6YWxsUHJv Y2Vzc1Bvb2xzKCkpCiAgICAgICAgIHByb2Nlc3NQb29sLT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVz c2FnZXM6Okd0a1NldHRpbmdzTWFuYWdlclByb3h5OjpTZXR0aW5nc0RpZENoYW5nZShzdGF0ZSkp OwogfQpAQCAtMTgzLDYgKzE5NCw3IEBAIEd0a1NldHRpbmdzTWFuYWdlcjo6R3RrU2V0dGluZ3NN YW5hZ2VyKCkKICAgICBtX3NldHRpbmdzU3RhdGUuY3Vyc29yQmxpbmsgPSBjdXJzb3JCbGluaygp OwogICAgIG1fc2V0dGluZ3NTdGF0ZS5jdXJzb3JCbGlua1RpbWUgPSBjdXJzb3JCbGlua1RpbWUo KTsKICAgICBtX3NldHRpbmdzU3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyID0gcHJpbWFy eUJ1dHRvbldhcnBzU2xpZGVyKCk7CisgICAgbV9zZXR0aW5nc1N0YXRlLm92ZXJsYXlTY3JvbGxp bmcgPSBvdmVybGF5U2Nyb2xsaW5nKCk7CiAKICAgICBnX3NpZ25hbF9jb25uZWN0X3N3YXBwZWQo bV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLXRoZW1lLW5hbWUiLCBHX0NBTExCQUNLKHNldHRpbmdz Q2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1f c2V0dGluZ3MsICJub3RpZnk6Omd0ay1mb250LW5hbWUiLCBHX0NBTExCQUNLKHNldHRpbmdzQ2hh bmdlZENhbGxiYWNrKSwgdGhpcyk7CkBAIC0xOTQsNiArMjA2LDcgQEAgR3RrU2V0dGluZ3NNYW5h Z2VyOjpHdGtTZXR0aW5nc01hbmFnZXIoKQogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZCht X3NldHRpbmdzLCAibm90aWZ5OjpndGstY3Vyc29yLWJsaW5rIiwgR19DQUxMQkFDSyhzZXR0aW5n c0NoYW5nZWRDYWxsYmFjayksIHRoaXMpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZCht X3NldHRpbmdzLCAibm90aWZ5OjpndGstY3Vyc29yLWJsaW5rLXRpbWUiLCBHX0NBTExCQUNLKHNl dHRpbmdzQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2Fw cGVkKG1fc2V0dGluZ3MsICJub3RpZnk6Omd0ay1wcmltYXJ5LWJ1dHRvbi13YXJwcy1zbGlkZXIi LCBHX0NBTExCQUNLKHNldHRpbmdzQ2hhbmdlZENhbGxiYWNrKSwgdGhpcyk7CisgICAgZ19zaWdu YWxfY29ubmVjdF9zd2FwcGVkKG1fc2V0dGluZ3MsICJub3RpZnk6Omd0ay1vdmVybGF5LXNjcm9s bGluZyIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKIH0KIAog fSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsv R3RrU2V0dGluZ3NNYW5hZ2VyLmgKaW5kZXggZmI0NGE5NzJlZmIzNzY5ZWRkMjkyMTczMjMzMGVm ZTZlM2IwYzhjNC4uY2Y5ZThlYmMyMzUzZWQwZGZkNTY2M2UzZjliZDg1ZGIyOWFmNzFhNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXIuaApA QCAtNTMsNiArNTMsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgY3Vyc29yQmxpbmsoKSBjb25zdDsK ICAgICBpbnQgY3Vyc29yQmxpbmtUaW1lKCkgY29uc3Q7CiAgICAgYm9vbCBwcmltYXJ5QnV0dG9u V2FycHNTbGlkZXIoKSBjb25zdDsKKyAgICBib29sIG92ZXJsYXlTY3JvbGxpbmcoKSBjb25zdDsK IAogICAgIEd0a1NldHRpbmdzKiBtX3NldHRpbmdzOwogICAgIEd0a1NldHRpbmdzU3RhdGUgbV9z ZXR0aW5nc1N0YXRlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2d0ay9H dGtTZXR0aW5nc01hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvZ3Rr L0d0a1NldHRpbmdzTWFuYWdlclByb3h5LmNwcAppbmRleCBjY2U5ZDM3Y2NmN2Y2NDFmMjkzZjU4 ZjVmNzVmODA0OTQyOTM5NjEzLi4wOWJmZjkyNDQ3Y2NkMmY1OGEzY2IzNTU5MjJjOTMyOWQ4NDNm M2IxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvZ3RrL0d0a1NldHRpbmdz TWFuYWdlclByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvZ3RrL0d0a1Nl dHRpbmdzTWFuYWdlclByb3h5LmNwcApAQCAtODUsNiArODUsOSBAQCB2b2lkIEd0a1NldHRpbmdz TWFuYWdlclByb3h5OjphcHBseVNldHRpbmdzKEd0a1NldHRpbmdzU3RhdGUmJiBzdGF0ZSkKIAog ICAgIGlmIChzdGF0ZS5wcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIpCiAgICAgICAgIGdfb2JqZWN0 X3NldChtX3NldHRpbmdzLCAiZ3RrLXByaW1hcnktYnV0dG9uLXdhcnBzLXNsaWRlciIsICpzdGF0 ZS5wcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIsIG51bGxwdHIpOworCisgICAgaWYgKHN0YXRlLm92 ZXJsYXlTY3JvbGxpbmcpCisgICAgICAgIGdfb2JqZWN0X3NldChtX3NldHRpbmdzLCAiZ3RrLW92 ZXJsYXktc2Nyb2xsaW5nIiwgKnN0YXRlLm92ZXJsYXlTY3JvbGxpbmcsIG51bGxwdHIpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK 452780 2022-02-21 15:06:57 -0800 2022-03-08 06:51:46 -0800 Patch bug-236476-20220221170656.patch text/plain 11392 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDllNzVlNjI3OTI0ZDFl NmRmMDRiZmRiZWMzZTlhYTJkZmQwYjhmNS4uODk4MDEwYmMzMjVkYzNjZTE2ZTkwN2UxZGJlODNi MWI4MTk5ZGQyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIFN5 bmMgZ3RrLW92ZXJsYXktc2Nyb2xsaW5nIHNldHRpbmcgdG8gd2ViIHByb2Nlc3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjQ3NgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vYWR3YWl0 YS9TY3JvbGxiYXJUaGVtZUFkd2FpdGEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYmFy VGhlbWVBZHdhaXRhOjp1c2VzT3ZlcmxheVNjcm9sbGJhcnMgY29uc3QpOgorICAgICAgICAqIHBs YXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxkVXNl T3ZlcmxheVNjcm9sbGJhcnMpOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVTY3JvbGxiYXI6OlJlbmRlclRoZW1lU2Nyb2xsYmFy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2Nyb2xsYmFyVGhlbWVHdGs6OlNjcm9sbGJhclRoZW1lR3RrKToKKwogMjAy Mi0wMi0yMSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NT UyBDb250YWluZXIgUXVlcmllc10gU3VwcG9ydCBuZXN0ZWQgY29udGFpbmVyIHF1ZXJpZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggYmJjYjM2MTRlYjlhNWU3YWUzODUwYWFhZjQ0ODQ2ZDBmM2UxYTRkNy4uODQ3NDA4 Zjc3MmViNjYwYWU1MzhhMzY4Y2I4YzAxODAxMTkyODRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MiBAQAorMjAyMi0wMi0yMSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGdub21lLm9y Zz4KKworICAgICAgICBbR1RLXSBTeW5jIGd0ay1vdmVybGF5LXNjcm9sbGluZyBzZXR0aW5nIHRv IHdlYiBwcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzY0NzYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5jcHA6CisgICAgICAgIChXZWJLaXQ6 Okd0a1NldHRpbmdzU3RhdGU6OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6Okd0a1Nl dHRpbmdzU3RhdGU6OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0 YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXIuY3BwOgor ICAgICAgICAoV2ViS2l0OjpHdGtTZXR0aW5nc01hbmFnZXI6Om92ZXJsYXlTY3JvbGxpbmcgY29u c3QpOgorICAgICAgICAoV2ViS2l0OjpHdGtTZXR0aW5nc01hbmFnZXI6OnNldHRpbmdzRGlkQ2hh bmdlKToKKyAgICAgICAgKFdlYktpdDo6R3RrU2V0dGluZ3NNYW5hZ2VyOjpHdGtTZXR0aW5nc01h bmFnZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmg6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyUHJveHkuY3BwOgorICAg ICAgICAoV2ViS2l0OjpHdGtTZXR0aW5nc01hbmFnZXJQcm94eTo6YXBwbHlTZXR0aW5ncyk6CisK IDIwMjItMDItMjEgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFttYWNPU10gUmVtb3ZlIHJlc291cmNlIGFjY2VzcyBpbiBzYW5kYm94IGZvciBvbGRlciBP UyB2ZXJzaW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYWR3YWl0YS9T Y3JvbGxiYXJUaGVtZUFkd2FpdGEuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYWR3YWl0 YS9TY3JvbGxiYXJUaGVtZUFkd2FpdGEuY3BwCmluZGV4IDQ2NzU3ZWUzODYxZWViOGU0MTA2Yzgw MGM5MDk5MTVjZmVhNjA4ZGQuLmVkMDQ3N2VkODhlNDUwNzUwODMxNmFmNjk3YTY1YTk1NDZjOWI0 ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Fkd2FpdGEvU2Nyb2xsYmFy VGhlbWVBZHdhaXRhLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hZHdhaXRhL1Nj cm9sbGJhclRoZW1lQWR3YWl0YS5jcHAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlICJUaGVt ZUFkd2FpdGEuaCIKIAogI2lmIFBMQVRGT1JNKEdUSykKKyNpbmNsdWRlICJHdGtVdGlsaXRpZXMu aCIKICNpbmNsdWRlIDxndGsvZ3RrLmg+CiAjZW5kaWYKIApAQCAtNzAsOCArNzEsNyBAQCB2b2lk IFNjcm9sbGJhclRoZW1lQWR3YWl0YTo6dXBkYXRlU2Nyb2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9s bGJhciYgc2Nyb2xsYmFyKQogYm9vbCBTY3JvbGxiYXJUaGVtZUFkd2FpdGE6OnVzZXNPdmVybGF5 U2Nyb2xsYmFycygpIGNvbnN0CiB7CiAjaWYgUExBVEZPUk0oR1RLKQotICAgIHN0YXRpYyBib29s IHNob3VsZFV1c2VPdmVybGF5U2Nyb2xsYmFycyA9IGdfc3RyY21wMChnX2dldGVudigiR1RLX09W RVJMQVlfU0NST0xMSU5HIiksICIwIik7Ci0gICAgcmV0dXJuIHNob3VsZFV1c2VPdmVybGF5U2Ny b2xsYmFyczsKKyAgICByZXR1cm4gc2hvdWxkVXNlT3ZlcmxheVNjcm9sbGJhcnMoKTsKICNlbHNl CiAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L0d0a1V0aWxpdGllcy5jcHAKaW5kZXggN2IwZDZkZTk4YjM4MzNjNmUyMmI5NTk3MGI5YzU1OGM0 MDMyYjY1MS4uYTM0M2MyOWU0ZDZlNmU1ZDJjNTU3OTJhMzdiYTg3Y2Q5ZmQ0MTQyYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxpdGllcy5jcHAKQEAgLTIwNyw0ICsy MDcsMTggQEAgdm9pZCBtb25pdG9yV29ya0FyZWEoR2RrTW9uaXRvciogbW9uaXRvciwgR2RrUmVj dGFuZ2xlKiBhcmVhKQogI2VuZGlmCiB9CiAKK2Jvb2wgc2hvdWxkVXNlT3ZlcmxheVNjcm9sbGJh cnMoKQoreworI2lmICFVU0UoR1RLNCkKKyAgICBpZiAoIWdfc3RyY21wMCAoZ19nZXRlbnYgKCJH VEtfT1ZFUkxBWV9TQ1JPTExJTkciKSwgIjAiKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworI2Vu ZGlmCisKKyAgICBnYm9vbGVhbiBvdmVybGF5U2Nyb2xsaW5nOworICAgIGdfb2JqZWN0X2dldChn dGtfc2V0dGluZ3NfZ2V0X2RlZmF1bHQoKSwKKyAgICAgICAgImd0ay1vdmVybGF5LXNjcm9sbGlu ZyIsCisgICAgICAgICZvdmVybGF5U2Nyb2xsaW5nLCBudWxscHRyKTsKKyAgICByZXR1cm4gISFv dmVybGF5U2Nyb2xsaW5nOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR3RrVXRpbGl0aWVzLmgKaW5kZXggYTVmYWNiMjEwZDFjY2ViZDA4 YWU2ZjQ2ZjFmMzRhNGM5YmMyZWY3OS4uOTYxMjRmOTZlMzUyNzExNjQ4ZTdkZjg5ZGUzNmI4OTlh NjVmOGVmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0d0a1V0aWxp dGllcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HdGtVdGlsaXRpZXMuaApA QCAtNTcsNCArNTcsNiBAQCBXRUJDT1JFX0VYUE9SVCBHZGtEcmFnQWN0aW9uIGRyYWdPcGVyYXRp b25Ub1NpbmdsZUdka0RyYWdBY3Rpb24oT3B0aW9uU2V0PERyYWdPcAogCiB2b2lkIG1vbml0b3JX b3JrQXJlYShHZGtNb25pdG9yKiwgR2RrUmVjdGFuZ2xlKik7CiAKK2Jvb2wgc2hvdWxkVXNlT3Zl cmxheVNjcm9sbGJhcnMoKTsKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1JlbmRlclRoZW1lU2Nyb2xsYmFyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9SZW5kZXJUaGVtZVNjcm9sbGJhci5jcHAKaW5kZXgg ZTYzNTNjM2E1N2RlM2JkOWQ4MWNmZTdiMGUxNDA4ZmE1MmNkODE2Ni4uMmEzMTIzMGM0YWNjYjA1 ZmI4NGQyN2UxMzU5Y2Q1MDZhM2ZhOWI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1JlbmRlclRoZW1lU2Nyb2xsYmFyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvUmVuZGVyVGhlbWVTY3JvbGxiYXIuY3BwCkBAIC0yOCw2ICsyOCw3IEBACiAK ICNpZiAhVVNFKEdUSzQpCiAKKyNpbmNsdWRlICJHdGtVdGlsaXRpZXMuaCIKICNpbmNsdWRlIDx3 dGYvSGFzaE1hcC5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCkBAIC03Nyw4 ICs3OCw3IEBAIFJlbmRlclRoZW1lU2Nyb2xsYmFyOjpSZW5kZXJUaGVtZVNjcm9sbGJhcihHdGtP cmllbnRhdGlvbiBvcmllbnRhdGlvbiwgTW9kZSBtb2RlCiAgICAgICAgIGluZm8uY2xhc3NMaXN0 LmFwcGVuZCgiaG9yaXpvbnRhbCIpOwogICAgICAgICBpbmZvLmNsYXNzTGlzdC5hcHBlbmQoImJv dHRvbSIpOwogICAgIH0KLSAgICBzdGF0aWMgYm9vbCB1c2VzT3ZlcmxheVNjcm9sbGJhcnMgPSBn X3N0cmNtcDAoZ19nZXRlbnYoIkdUS19PVkVSTEFZX1NDUk9MTElORyIpLCAiMCIpOwotICAgIGlm ICh1c2VzT3ZlcmxheVNjcm9sbGJhcnMpCisgICAgaWYgKHNob3VsZFVzZU92ZXJsYXlTY3JvbGxi YXJzKCkpCiAgICAgICAgIGluZm8uY2xhc3NMaXN0LmFwcGVuZCgib3ZlcmxheS1pbmRpY2F0b3Ii KTsKICAgICBpZiAobW9kZSA9PSBNb2RlOjpGdWxsKQogICAgICAgICBpbmZvLmNsYXNzTGlzdC5h cHBlbmQoImhvdmVyaW5nIik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Nj cm9sbGJhclRoZW1lR3RrLmNwcAppbmRleCBkNDQ4NjVmYzU5ZmJiMmM1ZjgwNGEyMTVjNGJlODIw MmIwMDg4OGVjLi43ODE2MWQ5N2M2ODhmMzBjZWNhZTU1MTc5MjdjM2U0ZDM1NGM0OTMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsYmFyVGhlbWVHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxiYXJUaGVtZUd0ay5jcHAK QEAgLTU4LDYgKzU4LDcgQEAgU2Nyb2xsYmFyVGhlbWVHdGs6OlNjcm9sbGJhclRoZW1lR3RrKCkK ICAgICBzdGF0aWMgYm9vbCB0aGVtZU1vbml0b3JJbml0aWFsaXplZCA9IGZhbHNlOwogICAgIGlm ICghdGhlbWVNb25pdG9ySW5pdGlhbGl6ZWQpIHsKICAgICAgICAgZ19zaWduYWxfY29ubmVjdChn dGtfc2V0dGluZ3NfZ2V0X2RlZmF1bHQoKSwgIm5vdGlmeTo6Z3RrLXRoZW1lLW5hbWUiLCBHX0NB TExCQUNLKHRoZW1lQ2hhbmdlZENhbGxiYWNrKSwgbnVsbHB0cik7CisgICAgICAgIGdfc2lnbmFs X2Nvbm5lY3QoZ3RrX3NldHRpbmdzX2dldF9kZWZhdWx0KCksICJub3RpZnk6Omd0ay1vdmVybGF5 LXNjcm9sbGluZyIsIEdfQ0FMTEJBQ0sodGhlbWVDaGFuZ2VkQ2FsbGJhY2spLCBudWxscHRyKTsK ICAgICAgICAgdGhlbWVNb25pdG9ySW5pdGlhbGl6ZWQgPSB0cnVlOwogICAgICAgICB1cGRhdGVU aGVtZVByb3BlcnRpZXMoKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9ndGsvR3RrU2V0dGluZ3NTdGF0ZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvR3Rr U2V0dGluZ3NTdGF0ZS5jcHAKaW5kZXggNjM4N2Q1Y2MwODVmNWE5NTVmMzY5ODUyMmM2NmM1ZDJi MWMwOWQ0YS4uYWZhMDVjNjU2MWY1NDJmMzczMGI1Y2I5NTdjM2RlZTlmYzA4ODI2YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmNwcApAQCAtNDIsNiAr NDIsNyBAQCB2b2lkIEd0a1NldHRpbmdzU3RhdGU6OmVuY29kZShJUEM6OkVuY29kZXImIGVuY29k ZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBjdXJzb3JCbGluazsKICAgICBlbmNvZGVyIDw8IGN1 cnNvckJsaW5rVGltZTsKICAgICBlbmNvZGVyIDw8IHByaW1hcnlCdXR0b25XYXJwc1NsaWRlcjsK KyAgICBlbmNvZGVyIDw8IG92ZXJsYXlTY3JvbGxpbmc7CiB9CiAKIHN0ZDo6b3B0aW9uYWw8R3Rr U2V0dGluZ3NTdGF0ZT4gR3RrU2V0dGluZ3NTdGF0ZTo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVj b2RlcikKQEAgLTc4LDYgKzc5LDkgQEAgc3RkOjpvcHRpb25hbDxHdGtTZXR0aW5nc1N0YXRlPiBH dGtTZXR0aW5nc1N0YXRlOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQogICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUoc3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyKSkKICAgICAgICAg cmV0dXJuIHN0ZDo6bnVsbG9wdDsKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUoc3RhdGUub3Zl cmxheVNjcm9sbGluZykpCisgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7CisKICAgICByZXR1 cm4gc3RhdGU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9HdGtT ZXR0aW5nc1N0YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvR3RrU2V0dGluZ3NTdGF0 ZS5oCmluZGV4IGFlNjllY2UyZjkzN2U1OWY5ZmM0NjE2OGFkOThmY2I3MDUxMzhiMTQuLmI2ZWZl MTZkMzY5ZGEzZDAyMThlZjgyNWViZDE3OGMwODNmOGI5Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL2d0ay9HdGtTZXR0aW5nc1N0YXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9T aGFyZWQvZ3RrL0d0a1NldHRpbmdzU3RhdGUuaApAQCAtNTAsNiArNTAsNyBAQCBzdHJ1Y3QgR3Rr U2V0dGluZ3NTdGF0ZSB7CiAgICAgc3RkOjpvcHRpb25hbDxib29sPiBjdXJzb3JCbGluazsKICAg ICBzdGQ6Om9wdGlvbmFsPGludD4gY3Vyc29yQmxpbmtUaW1lOwogICAgIHN0ZDo6b3B0aW9uYWw8 Ym9vbD4gcHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyOworICAgIHN0ZDo6b3B0aW9uYWw8Ym9vbD4g b3ZlcmxheVNjcm9sbGluZzsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcAppbmRleCBm MzIxMTg1Y2E3ZWQ5YTJhMjU3ZDAxYWJlYWM0NTgzOWI3OTlmNWIwLi5jNTAyZDJkYzUyZTdmN2Q0 ODg5ZGYyNmViYmYzM2FmYzNiYzE0YjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmNwcApAQCAtMTE4LDYgKzExOCwxMyBAQCBib29s IEd0a1NldHRpbmdzTWFuYWdlcjo6cHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyKCkgY29uc3QKICAg ICByZXR1cm4gYnV0dG9uU2V0dGluZyA/IHRydWUgOiBmYWxzZTsKIH0KIAorYm9vbCBHdGtTZXR0 aW5nc01hbmFnZXI6Om92ZXJsYXlTY3JvbGxpbmcoKSBjb25zdAoreworICAgIGdib29sZWFuIG92 ZXJsYXlTY3JvbGxpbmdTZXR0aW5nOworICAgIGdfb2JqZWN0X2dldChtX3NldHRpbmdzLCAiZ3Rr LW92ZXJsYXktc2Nyb2xsaW5nIiwgJm92ZXJsYXlTY3JvbGxpbmdTZXR0aW5nLCBudWxscHRyKTsK KyAgICByZXR1cm4gb3ZlcmxheVNjcm9sbGluZ1NldHRpbmcgPyB0cnVlIDogZmFsc2U7Cit9CisK IHZvaWQgR3RrU2V0dGluZ3NNYW5hZ2VyOjpzZXR0aW5nc0RpZENoYW5nZSgpCiB7CiAgICAgR3Rr U2V0dGluZ3NTdGF0ZSBzdGF0ZTsKQEAgLTE2Miw2ICsxNjksMTAgQEAgdm9pZCBHdGtTZXR0aW5n c01hbmFnZXI6OnNldHRpbmdzRGlkQ2hhbmdlKCkKICAgICBpZiAobV9zZXR0aW5nc1N0YXRlLnBy aW1hcnlCdXR0b25XYXJwc1NsaWRlciAhPSBwcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIpCiAgICAg ICAgIG1fc2V0dGluZ3NTdGF0ZS5wcmltYXJ5QnV0dG9uV2FycHNTbGlkZXIgPSBzdGF0ZS5wcmlt YXJ5QnV0dG9uV2FycHNTbGlkZXIgPSBwcmltYXJ5QnV0dG9uV2FycHNTbGlkZXI7CiAKKyAgICBh dXRvIG92ZXJsYXlTY3JvbGxpbmcgPSB0aGlzLT5vdmVybGF5U2Nyb2xsaW5nKCk7CisgICAgaWYg KG1fc2V0dGluZ3NTdGF0ZS5vdmVybGF5U2Nyb2xsaW5nICE9IG92ZXJsYXlTY3JvbGxpbmcpCisg ICAgICAgIG1fc2V0dGluZ3NTdGF0ZS5vdmVybGF5U2Nyb2xsaW5nID0gc3RhdGUub3ZlcmxheVNj cm9sbGluZyA9IG92ZXJsYXlTY3JvbGxpbmc7CisKICAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29s IDogV2ViUHJvY2Vzc1Bvb2w6OmFsbFByb2Nlc3NQb29scygpKQogICAgICAgICBwcm9jZXNzUG9v bC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpHdGtTZXR0aW5nc01hbmFnZXJQcm94eTo6 U2V0dGluZ3NEaWRDaGFuZ2Uoc3RhdGUpKTsKIH0KQEAgLTE4Myw2ICsxOTQsNyBAQCBHdGtTZXR0 aW5nc01hbmFnZXI6Okd0a1NldHRpbmdzTWFuYWdlcigpCiAgICAgbV9zZXR0aW5nc1N0YXRlLmN1 cnNvckJsaW5rID0gY3Vyc29yQmxpbmsoKTsKICAgICBtX3NldHRpbmdzU3RhdGUuY3Vyc29yQmxp bmtUaW1lID0gY3Vyc29yQmxpbmtUaW1lKCk7CiAgICAgbV9zZXR0aW5nc1N0YXRlLnByaW1hcnlC dXR0b25XYXJwc1NsaWRlciA9IHByaW1hcnlCdXR0b25XYXJwc1NsaWRlcigpOworICAgIG1fc2V0 dGluZ3NTdGF0ZS5vdmVybGF5U2Nyb2xsaW5nID0gb3ZlcmxheVNjcm9sbGluZygpOwogCiAgICAg Z19zaWduYWxfY29ubmVjdF9zd2FwcGVkKG1fc2V0dGluZ3MsICJub3RpZnk6Omd0ay10aGVtZS1u YW1lIiwgR19DQUxMQkFDSyhzZXR0aW5nc0NoYW5nZWRDYWxsYmFjayksIHRoaXMpOwogICAgIGdf c2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3NldHRpbmdzLCAibm90aWZ5OjpndGstZm9udC1uYW1l IiwgR19DQUxMQkFDSyhzZXR0aW5nc0NoYW5nZWRDYWxsYmFjayksIHRoaXMpOwpAQCAtMTk0LDYg KzIwNiw3IEBAIEd0a1NldHRpbmdzTWFuYWdlcjo6R3RrU2V0dGluZ3NNYW5hZ2VyKCkKICAgICBn X3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLWN1cnNvci1i bGluayIsIEdfQ0FMTEJBQ0soc2V0dGluZ3NDaGFuZ2VkQ2FsbGJhY2spLCB0aGlzKTsKICAgICBn X3NpZ25hbF9jb25uZWN0X3N3YXBwZWQobV9zZXR0aW5ncywgIm5vdGlmeTo6Z3RrLWN1cnNvci1i bGluay10aW1lIiwgR19DQUxMQkFDSyhzZXR0aW5nc0NoYW5nZWRDYWxsYmFjayksIHRoaXMpOwog ICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3NldHRpbmdzLCAibm90aWZ5OjpndGstcHJp bWFyeS1idXR0b24td2FycHMtc2xpZGVyIiwgR19DQUxMQkFDSyhzZXR0aW5nc0NoYW5nZWRDYWxs YmFjayksIHRoaXMpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChtX3NldHRpbmdzLCAi bm90aWZ5OjpndGstb3ZlcmxheS1zY3JvbGxpbmciLCBHX0NBTExCQUNLKHNldHRpbmdzQ2hhbmdl ZENhbGxiYWNrKSwgdGhpcyk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5oIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL0d0a1NldHRpbmdzTWFuYWdlci5oCmluZGV4IGZiNDRh OTcyZWZiMzc2OWVkZDI5MjE3MzIzMzBlZmU2ZTNiMGM4YzQuLmNmOWU4ZWJjMjM1M2VkMGRmZDU2 NjNlM2Y5YmQ4NWRiMjlhZjcxYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2d0ay9HdGtTZXR0aW5nc01hbmFnZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9n dGsvR3RrU2V0dGluZ3NNYW5hZ2VyLmgKQEAgLTUzLDYgKzUzLDcgQEAgcHJpdmF0ZToKICAgICBi b29sIGN1cnNvckJsaW5rKCkgY29uc3Q7CiAgICAgaW50IGN1cnNvckJsaW5rVGltZSgpIGNvbnN0 OwogICAgIGJvb2wgcHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyKCkgY29uc3Q7CisgICAgYm9vbCBv dmVybGF5U2Nyb2xsaW5nKCkgY29uc3Q7CiAKICAgICBHdGtTZXR0aW5ncyogbV9zZXR0aW5nczsK ICAgICBHdGtTZXR0aW5nc1N0YXRlIG1fc2V0dGluZ3NTdGF0ZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9ndGsvR3RrU2V0dGluZ3NNYW5hZ2VyUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXJQcm94eS5jcHAKaW5k ZXggY2NlOWQzN2NjZjdmNjQxZjI5M2Y1OGY1Zjc1ZjgwNDk0MjkzOTYxMy4uMDliZmY5MjQ0N2Nj ZDJmNThhM2NiMzU1OTIyYzkzMjlkODQzZjNiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL2d0ay9HdGtTZXR0aW5nc01hbmFnZXJQcm94eS5jcHAKQEAgLTg1LDYg Kzg1LDkgQEAgdm9pZCBHdGtTZXR0aW5nc01hbmFnZXJQcm94eTo6YXBwbHlTZXR0aW5ncyhHdGtT ZXR0aW5nc1N0YXRlJiYgc3RhdGUpCiAKICAgICBpZiAoc3RhdGUucHJpbWFyeUJ1dHRvbldhcnBz U2xpZGVyKQogICAgICAgICBnX29iamVjdF9zZXQobV9zZXR0aW5ncywgImd0ay1wcmltYXJ5LWJ1 dHRvbi13YXJwcy1zbGlkZXIiLCAqc3RhdGUucHJpbWFyeUJ1dHRvbldhcnBzU2xpZGVyLCBudWxs cHRyKTsKKworICAgIGlmIChzdGF0ZS5vdmVybGF5U2Nyb2xsaW5nKQorICAgICAgICBnX29iamVj dF9zZXQobV9zZXR0aW5ncywgImd0ay1vdmVybGF5LXNjcm9sbGluZyIsICpzdGF0ZS5vdmVybGF5 U2Nyb2xsaW5nLCBudWxscHRyKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0Cg==