197443 2019-04-30 16:33:51 -0700 Safe browsing warning should update colors when a user switches between light and dark appearance 2019-05-02 10:38:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren thorton timothy oldest_to_newest 1531757 0 achristensen 2019-04-30 16:33:51 -0700 Safe browsing warning should update colors when a user switches between light and dark appearance 1531758 1 368626 achristensen 2019-04-30 16:34:18 -0700 Created attachment 368626 Patch 1531768 2 368630 achristensen 2019-04-30 16:42:11 -0700 Created attachment 368630 Patch 1531787 3 368630 thorton 2019-04-30 17:09:28 -0700 Comment on attachment 368630 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=368630&action=review > Source/WebKit/UIProcess/Cocoa/WKSafeBrowsingWarning.mm:200 > This should be inside a PLATFORM(MAC) 1531803 4 368634 achristensen 2019-04-30 17:34:51 -0700 Created attachment 368634 Patch 1532131 5 368731 achristensen 2019-05-01 16:24:56 -0700 Created attachment 368731 Patch 1532334 6 achristensen 2019-05-02 10:38:19 -0700 http://trac.webkit.org/r244875 368626 2019-04-30 16:34:18 -0700 2019-04-30 16:42:10 -0700 Patch bug-197443-20190430163418.patch text/plain 9673 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQ4MTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE5LTA0LTMwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2FmZSBicm93c2lu ZyB3YXJuaW5nIHNob3VsZCB1cGRhdGUgY29sb3JzIHdoZW4gYSB1c2VyIHN3aXRjaGVzIGJldHdl ZW4gbGlnaHQgYW5kIGRhcmsgYXBwZWFyYW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTg4 MzkxNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFJlc291cmNlcy9TYWZlQnJvd3NpbmcueGNhc3NldHMvV0tTYWZlQnJvd3NpbmdXYXJuaW5nQm94 QmFja2dyb3VuZC5jb2xvcnNldDogQWRkZWQuCisgICAgICAgICogUmVzb3VyY2VzL1NhZmVCcm93 c2luZy54Y2Fzc2V0cy9XS1NhZmVCcm93c2luZ1dhcm5pbmdCb3hCYWNrZ3JvdW5kLmNvbG9yc2V0 L0NvbnRlbnRzLmpzb246IEFkZGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9XS1NhZmVC cm93c2luZ1dhcm5pbmcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3Np bmdXYXJuaW5nLm1tOgorICAgICAgICAoY29sb3JGb3JJdGVtKToKKyAgICAgICAgKC1bV0tTYWZl QnJvd3NpbmdFeGNsYW1hdGlvblBvaW50IHZpZXdEaWRDaGFuZ2VFZmZlY3RpdmVBcHBlYXJhbmNl XSk6CisgICAgICAgICgtW1dLU2FmZUJyb3dzaW5nQm94IHNldFNhZmVCcm93c2luZ0JhY2tncm91 bmRDb2xvcjpdKToKKyAgICAgICAgKC1bV0tTYWZlQnJvd3NpbmdCb3ggdXBkYXRlTGF5ZXJdKToK KyAgICAgICAgKC1bV0tTYWZlQnJvd3NpbmdXYXJuaW5nIGluaXRXaXRoRnJhbWU6c2FmZUJyb3dz aW5nV2FybmluZzpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bV0tTYWZlQnJvd3Np bmdXYXJuaW5nIGFkZENvbnRlbnRdKToKKyAgICAgICAgKC1bV0tTYWZlQnJvd3NpbmdXYXJuaW5n IHNob3dEZXRhaWxzQ2xpY2tlZF0pOgorICAgICAgICAoc2V0QmFja2dyb3VuZCk6IERlbGV0ZWQu CisKIDIwMTktMDQtMzAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAg ICBSZWdyZXNzaW9uKFBTT04pIFVSTCBzY2hlbWUgaGFuZGxlcnMgY2FuIG5vIGxvbmdlciByZXNw b25kIGFzeW5jaHJvbm91c2x5CkluZGV4OiBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYWZlQnJv d3NpbmcueGNhc3NldHMvV0tTYWZlQnJvd3NpbmdXYXJuaW5nQm94QmFja2dyb3VuZC5jb2xvcnNl dC9Db250ZW50cy5qc29uCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1Nh ZmVCcm93c2luZy54Y2Fzc2V0cy9XS1NhZmVCcm93c2luZ1dhcm5pbmdCb3hCYWNrZ3JvdW5kLmNv bG9yc2V0L0NvbnRlbnRzLmpzb24JKG5vbmV4aXN0ZW50KQorKysgU291cmNlL1dlYktpdC9SZXNv dXJjZXMvU2FmZUJyb3dzaW5nLnhjYXNzZXRzL1dLU2FmZUJyb3dzaW5nV2FybmluZ0JveEJhY2tn cm91bmQuY29sb3JzZXQvQ29udGVudHMuanNvbgkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDM4 IEBACit7CisgICJpbmZvIiA6IHsKKyAgICAidmVyc2lvbiIgOiAxLAorICAgICJhdXRob3IiIDog Inhjb2RlIgorICB9LAorICAiY29sb3JzIiA6IFsKKyAgICB7CisgICAgICAiaWRpb20iIDogInVu aXZlcnNhbCIsCisgICAgICAiY29sb3IiIDogeworICAgICAgICAiY29sb3Itc3BhY2UiIDogInNy Z2IiLAorICAgICAgICAiY29tcG9uZW50cyIgOiB7CisgICAgICAgICAgInJlZCIgOiAiMC45MjUi LAorICAgICAgICAgICJhbHBoYSIgOiAiMS4wMDAiLAorICAgICAgICAgICJibHVlIiA6ICIwLjky NSIsCisgICAgICAgICAgImdyZWVuIiA6ICIwLjkyNSIKKyAgICAgICAgfQorICAgICAgfQorICAg IH0sCisgICAgeworICAgICAgImlkaW9tIiA6ICJ1bml2ZXJzYWwiLAorICAgICAgImFwcGVhcmFu Y2VzIiA6IFsKKyAgICAgICAgeworICAgICAgICAgICJhcHBlYXJhbmNlIiA6ICJsdW1pbm9zaXR5 IiwKKyAgICAgICAgICAidmFsdWUiIDogImRhcmsiCisgICAgICAgIH0KKyAgICAgIF0sCisgICAg ICAiY29sb3IiIDogeworICAgICAgICAiY29sb3Itc3BhY2UiIDogInNyZ2IiLAorICAgICAgICAi Y29tcG9uZW50cyIgOiB7CisgICAgICAgICAgInJlZCIgOiAiMC4xOTYiLAorICAgICAgICAgICJh bHBoYSIgOiAiMS4wMDAiLAorICAgICAgICAgICJibHVlIiA6ICIwLjE5NiIsCisgICAgICAgICAg ImdyZWVuIiA6ICIwLjE5NiIKKyAgICAgICAgfQorICAgICAgfQorICAgIH0KKyAgXQorfQpJbmRl eDogU291cmNlL1dlYktpdC9SZXNvdXJjZXMvU2FmZUJyb3dzaW5nLnhjYXNzZXRzL1dLU2FmZUJy b3dzaW5nV2FybmluZ0JveEJhY2tncm91bmQuY29sb3JzZXQvQ29udGVudHMuanNvbgo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1Jlc291cmNlcy9TYWZlQnJvd3NpbmcueGNhc3NldHMvV0tT YWZlQnJvd3NpbmdXYXJuaW5nQm94QmFja2dyb3VuZC5jb2xvcnNldC9Db250ZW50cy5qc29uCShu b25leGlzdGVudCkKKysrIFNvdXJjZS9XZWJLaXQvUmVzb3VyY2VzL1NhZmVCcm93c2luZy54Y2Fz c2V0cy9XS1NhZmVCcm93c2luZ1dhcm5pbmdCb3hCYWNrZ3JvdW5kLmNvbG9yc2V0L0NvbnRlbnRz Lmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzOCBAQAoreworICAiaW5mbyIgOiB7Cisg ICAgInZlcnNpb24iIDogMSwKKyAgICAiYXV0aG9yIiA6ICJ4Y29kZSIKKyAgfSwKKyAgImNvbG9y cyIgOiBbCisgICAgeworICAgICAgImlkaW9tIiA6ICJ1bml2ZXJzYWwiLAorICAgICAgImNvbG9y IiA6IHsKKyAgICAgICAgImNvbG9yLXNwYWNlIiA6ICJzcmdiIiwKKyAgICAgICAgImNvbXBvbmVu dHMiIDogeworICAgICAgICAgICJyZWQiIDogIjAuOTI1IiwKKyAgICAgICAgICAiYWxwaGEiIDog IjEuMDAwIiwKKyAgICAgICAgICAiYmx1ZSIgOiAiMC45MjUiLAorICAgICAgICAgICJncmVlbiIg OiAiMC45MjUiCisgICAgICAgIH0KKyAgICAgIH0KKyAgICB9LAorICAgIHsKKyAgICAgICJpZGlv bSIgOiAidW5pdmVyc2FsIiwKKyAgICAgICJhcHBlYXJhbmNlcyIgOiBbCisgICAgICAgIHsKKyAg ICAgICAgICAiYXBwZWFyYW5jZSIgOiAibHVtaW5vc2l0eSIsCisgICAgICAgICAgInZhbHVlIiA6 ICJkYXJrIgorICAgICAgICB9CisgICAgICBdLAorICAgICAgImNvbG9yIiA6IHsKKyAgICAgICAg ImNvbG9yLXNwYWNlIiA6ICJzcmdiIiwKKyAgICAgICAgImNvbXBvbmVudHMiIDogeworICAgICAg ICAgICJyZWQiIDogIjAuMTk2IiwKKyAgICAgICAgICAiYWxwaGEiIDogIjEuMDAwIiwKKyAgICAg ICAgICAiYmx1ZSIgOiAiMC4xOTYiLAorICAgICAgICAgICJncmVlbiIgOiAiMC4xOTYiCisgICAg ICAgIH0KKyAgICAgIH0KKyAgICB9CisgIF0KK30KSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5oCShyZXZpc2lvbiAy NDQ3NTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1NhZmVCcm93c2luZ1dh cm5pbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsMTggKzQ1LDMzIEBAIE9CSkNfQ0xBU1MgV0tT YWZlQnJvd3NpbmdUZXh0VmlldzsKICNpZiBQTEFURk9STShNQUMpCiB1c2luZyBWaWV3VHlwZSA9 IE5TVmlldzsKIHVzaW5nIFJlY3RUeXBlID0gTlNSZWN0OwotQGludGVyZmFjZSBXS1NhZmVCcm93 c2luZ1dhcm5pbmcgOiBOU1ZpZXc8TlNUZXh0Vmlld0RlbGVnYXRlPgordXNpbmcgQ29sb3JUeXBl ID0gTlNDb2xvcjsKICNlbHNlCiB1c2luZyBWaWV3VHlwZSA9IFVJVmlldzsKIHVzaW5nIFJlY3RU eXBlID0gQ0dSZWN0OwotQGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcgOiBVSVNjcm9s bFZpZXc8VUlUZXh0Vmlld0RlbGVnYXRlPgordXNpbmcgQ29sb3JUeXBlID0gVUlDb2xvcjsKKyNl bmRpZgorCitAaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nQm94IDogVmlld1R5cGUgeworQHBhY2th Z2UKKyNpZiBQTEFURk9STShNQUMpCisgICAgUmV0YWluUHRyPENvbG9yVHlwZT4gX2JhY2tncm91 bmRDb2xvcjsKKyNlbmRpZgorfQorLSAodm9pZClzZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29s b3I6KENvbG9yVHlwZSAqKWNvbG9yOworQGVuZAorCisjaWYgUExBVEZPUk0oTUFDKQorQGludGVy ZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcgOiBXS1NhZmVCcm93c2luZ0JveDxOU1RleHRWaWV3 RGVsZWdhdGU+CisjZWxzZQorQGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcgOiBXS1Nh ZmVCcm93c2luZ0JveDxVSVRleHRWaWV3RGVsZWdhdGU+CiAjZW5kaWYKIHsKIEBwYWNrYWdlCiAg ICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWYXJpYW50PFdlYktpdDo6Q29udGludWVVbnNhZmVM b2FkLCBVUkw+JiYpPiBfY29tcGxldGlvbkhhbmRsZXI7CiAgICAgUmVmUHRyPGNvbnN0IFdlYktp dDo6U2FmZUJyb3dzaW5nV2FybmluZz4gX3dhcm5pbmc7CiAgICAgV2Vha09iakNQdHI8V0tTYWZl QnJvd3NpbmdUZXh0Vmlldz4gX2RldGFpbHM7Ci0gICAgV2Vha09iakNQdHI8Vmlld1R5cGU+IF9i b3g7CisgICAgV2Vha09iakNQdHI8V0tTYWZlQnJvd3NpbmdCb3g+IF9ib3g7CiAjaWYgUExBVEZP Uk0oV0FUQ0hPUykKICAgICBXZWFrT2JqQ1B0cjxVSVJlc3BvbmRlcj4gX3ByZXZpb3VzRmlyc3RS ZXNwb25kZXI7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dL U2FmZUJyb3dzaW5nV2FybmluZy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9XS1NhZmVCcm93c2luZ1dhcm5pbmcubW0JKHJldmlzaW9uIDI0NDc1OSkKKysr IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbQko d29ya2luZyBjb3B5KQpAQCAtNTAsMTQgKzUwLDEyIEBAIGNvbnN0ZXhwciBDR0Zsb2F0IG1heFdp ZHRoID0gNjc1OwogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCi11c2luZyBDb2xvclR5cGUg PSBOU0NvbG9yOwogdXNpbmcgRm9udFR5cGUgPSBOU0ZvbnQ7CiB1c2luZyBUZXh0Vmlld1R5cGUg PSBOU1RleHRWaWV3OwogdXNpbmcgQnV0dG9uVHlwZSA9IE5TQnV0dG9uOwogdXNpbmcgQWxpZ25t ZW50VHlwZSA9IE5TTGF5b3V0QXR0cmlidXRlOwogdXNpbmcgU2l6ZVR5cGUgPSBOU1NpemU7CiAj ZWxzZQotdXNpbmcgQ29sb3JUeXBlID0gVUlDb2xvcjsKIHVzaW5nIEZvbnRUeXBlID0gVUlGb250 OwogdXNpbmcgVGV4dFZpZXdUeXBlID0gVUlUZXh0VmlldzsKIHVzaW5nIEJ1dHRvblR5cGUgPSBV SUJ1dHRvbjsKQEAgLTEyMyw3ICsxMjEsNyBAQCBzdGF0aWMgQ29sb3JUeXBlICpjb2xvckZvckl0 ZW0oV2FybmluZ0l0CiAgICAgY2FzZSBXYXJuaW5nSXRlbTo6QmFja2dyb3VuZDoKICAgICAgICAg cmV0dXJuIGNvbG9yTmFtZWQoQCJXS1NhZmVCcm93c2luZ1dhcm5pbmdCYWNrZ3JvdW5kIik7CiAg ICAgY2FzZSBXYXJuaW5nSXRlbTo6Qm94QmFja2dyb3VuZDoKLSAgICAgICAgcmV0dXJuIFtOU0Nv bG9yIHdpbmRvd0JhY2tncm91bmRDb2xvcl07CisgICAgICAgIHJldHVybiBjb2xvck5hbWVkKEAi V0tTYWZlQnJvd3NpbmdXYXJuaW5nQm94QmFja2dyb3VuZCIpOwogICAgIGNhc2UgV2FybmluZ0l0 ZW06OlRpdGxlVGV4dDoKICAgICBjYXNlIFdhcm5pbmdJdGVtOjpFeGNsYW1hdGlvblBvaW50Ogog ICAgICAgICByZXR1cm4gY29sb3JOYW1lZChAIldLU2FmZUJyb3dzaW5nV2FybmluZ1RpdGxlIik7 CkBAIC0yMDAsNiArMTk4LDExIEBAIC0gKHZvaWQpZHJhd1JlY3Q6KFJlY3RUeXBlKXJlY3QKICAg ICBbZXhjbGFtYXRpb25Qb2ludCBmaWxsXTsKIH0KIAorLSAodm9pZCl2aWV3RGlkQ2hhbmdlRWZm ZWN0aXZlQXBwZWFyYW5jZQoreworICAgIFtzZWxmIHNldE5lZWRzRGlzcGxheTpZRVNdOworfQor CiAtIChOU1NpemUpaW50cmluc2ljQ29udGVudFNpemUKIHsKICAgICByZXR1cm4geyBleGNsYW1h dGlvblBvaW50U2l6ZSwgZXhjbGFtYXRpb25Qb2ludFNpemUgfTsKQEAgLTI1NCwxNiArMjU3LDI3 IEBAIHN0YXRpYyBWaWV3VHlwZSAqbWFrZUxhYmVsKE5TQXR0cmlidXRlZFMKICNlbmRpZgogfQog Ci1zdGF0aWMgdm9pZCBzZXRCYWNrZ3JvdW5kKFZpZXdUeXBlICp2aWV3LCBDb2xvclR5cGUgKmNv bG9yKQorQGltcGxlbWVudGF0aW9uIFdLU2FmZUJyb3dzaW5nQm94CisKKy0gKHZvaWQpc2V0U2Fm ZUJyb3dzaW5nQmFja2dyb3VuZENvbG9yOihDb2xvclR5cGUgKiljb2xvcgogewogI2lmIFBMQVRG T1JNKE1BQykKLSAgICB2aWV3LndhbnRzTGF5ZXIgPSBZRVM7Ci0gICAgdmlldy5sYXllci5iYWNr Z3JvdW5kQ29sb3IgPSBjb2xvci5DR0NvbG9yOworICAgIF9iYWNrZ3JvdW5kQ29sb3IgPSBjb2xv cjsKKyAgICBzZWxmLndhbnRzTGF5ZXIgPSBZRVM7CiAjZWxzZQotICAgIHZpZXcuYmFja2dyb3Vu ZENvbG9yID0gY29sb3I7CisgICAgc2VsZi5iYWNrZ3JvdW5kQ29sb3IgPSBjb2xvcjsKICNlbmRp ZgogfQogCisjaWYgUExBVEZPUk0oTUFDKQorLSAodm9pZCl1cGRhdGVMYXllcgoreworICAgIHNl bGYubGF5ZXIuYmFja2dyb3VuZENvbG9yID0gW19iYWNrZ3JvdW5kQ29sb3IgQ0dDb2xvcl07Cit9 CisjZW5kaWYKKworQGVuZAorCiBAaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nVGV4dFZpZXcgOiBU ZXh0Vmlld1R5cGUgewogQHBhY2thZ2UKICAgICBXZWFrT2JqQ1B0cjxXS1NhZmVCcm93c2luZ1dh cm5pbmc+IF93YXJuaW5nOwpAQCAtMjg3LDcgKzMwMSw3IEBAIC0gKGluc3RhbmNldHlwZSlpbml0 V2l0aEZyYW1lOihSZWN0VHlwZSkKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShy ZXN1bHQpKTsKICAgICB9OwogICAgIF93YXJuaW5nID0gbWFrZVJlZih3YXJuaW5nKTsKLSAgICBz ZXRCYWNrZ3JvdW5kKHNlbGYsIGNvbG9yRm9ySXRlbShXYXJuaW5nSXRlbTo6QmFja2dyb3VuZCwg c2VsZikpOworICAgIFtzZWxmIHNldFNhZmVCcm93c2luZ0JhY2tncm91bmRDb2xvcjpjb2xvckZv ckl0ZW0oV2FybmluZ0l0ZW06OkJhY2tncm91bmQsIHNlbGYpXTsKICNpZiBQTEFURk9STShNQUMp CiAgICAgW3NlbGYgYWRkQ29udGVudF07CiAjZW5kaWYKQEAgLTMxNyw5ICszMzEsOSBAQCAtICh2 b2lkKWFkZENvbnRlbnQKICAgICB9XSBhdXRvcmVsZWFzZV0pOwogICAgIGF1dG8gc2hvd0RldGFp bHMgPSBtYWtlQnV0dG9uKFdhcm5pbmdJdGVtOjpTaG93RGV0YWlsc0J1dHRvbiwgc2VsZiwgQHNl bGVjdG9yKHNob3dEZXRhaWxzQ2xpY2tlZCkpOwogICAgIGF1dG8gZ29CYWNrID0gbWFrZUJ1dHRv bihXYXJuaW5nSXRlbTo6R29CYWNrQnV0dG9uLCBzZWxmLCBAc2VsZWN0b3IoZ29CYWNrQ2xpY2tl ZCkpOwotICAgIGF1dG8gYm94ID0gW1tWaWV3VHlwZSBuZXddIGF1dG9yZWxlYXNlXTsKKyAgICBh dXRvIGJveCA9IFtbV0tTYWZlQnJvd3NpbmdCb3ggbmV3XSBhdXRvcmVsZWFzZV07CiAgICAgX2Jv eCA9IGJveDsKLSAgICBzZXRCYWNrZ3JvdW5kKGJveCwgY29sb3JGb3JJdGVtKFdhcm5pbmdJdGVt OjpCb3hCYWNrZ3JvdW5kLCBzZWxmKSk7CisgICAgW2JveCBzZXRTYWZlQnJvd3NpbmdCYWNrZ3Jv dW5kQ29sb3I6Y29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKV07 CiAgICAgYm94LmxheWVyLmNvcm5lclJhZGl1cyA9IGJveENvcm5lclJhZGl1czsKIAogICAgIGZv ciAoVmlld1R5cGUgKnZpZXcgaW4gQFtleGNsYW1hdGlvblBvaW50LCB0aXRsZSwgd2FybmluZywg Z29CYWNrLCBzaG93RGV0YWlsc10pIHsKQEAgLTM5Miw3ICs0MDYsNyBAQCAtICh2b2lkKWFkZENv bnRlbnQKIAogLSAodm9pZClzaG93RGV0YWlsc0NsaWNrZWQKIHsKLSAgICBWaWV3VHlwZSAqYm94 ID0gX2JveC5nZXQoKS5nZXQoKTsKKyAgICBXS1NhZmVCcm93c2luZ0JveCAqYm94ID0gX2JveC5n ZXQoKS5nZXQoKTsKICAgICBCdXR0b25UeXBlICpzaG93RGV0YWlscyA9IGJveC5zdWJ2aWV3cy5s YXN0T2JqZWN0OwogICAgIFtzaG93RGV0YWlscyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKIApAQCAt NDAwLDggKzQxNCw4IEBAIC0gKHZvaWQpc2hvd0RldGFpbHNDbGlja2VkCiAgICAgW3RleHQgYWRk QXR0cmlidXRlczpAeyBOU0ZvbnRBdHRyaWJ1dGVOYW1lOmZvbnRPZlNpemUoV2FybmluZ1RleHRT aXplOjpCb2R5KSB9IHJhbmdlOk5TTWFrZVJhbmdlKDAsIHRleHQubGVuZ3RoKV07CiAgICAgV0tT YWZlQnJvd3NpbmdUZXh0VmlldyAqZGV0YWlscyA9IFtbW1dLU2FmZUJyb3dzaW5nVGV4dFZpZXcg YWxsb2NdIGluaXRXaXRoQXR0cmlidXRlZFN0cmluZzp0ZXh0IGZvcldhcm5pbmc6c2VsZl0gYXV0 b3JlbGVhc2VdOwogICAgIF9kZXRhaWxzID0gZGV0YWlsczsKLSAgICBWaWV3VHlwZSAqYm90dG9t ID0gW1tWaWV3VHlwZSBuZXddIGF1dG9yZWxlYXNlXTsKLSAgICBzZXRCYWNrZ3JvdW5kKGJvdHRv bSwgY29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKSk7CisgICAg V0tTYWZlQnJvd3NpbmdCb3ggKmJvdHRvbSA9IFtbV0tTYWZlQnJvd3NpbmdCb3ggbmV3XSBhdXRv cmVsZWFzZV07CisgICAgW2JvdHRvbSBzZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29sb3I6Y29s b3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKV07CiAgICAgYm90dG9t LmxheWVyLmNvcm5lclJhZGl1cyA9IGJveENvcm5lclJhZGl1czsKIAogI2lmIEhBVkUoU0FGRV9C Uk9XU0lORykKQEAgLTQxNiw4ICs0MzAsOCBAQCAtICh2b2lkKXNob3dEZXRhaWxzQ2xpY2tlZAog I2VuZGlmCiAjZW5kaWYKIAotICAgIFZpZXdUeXBlICpsaW5lID0gW1tWaWV3VHlwZSBuZXddIGF1 dG9yZWxlYXNlXTsKLSAgICBzZXRCYWNrZ3JvdW5kKGxpbmUsIFtDb2xvclR5cGUgbGlnaHRHcmF5 Q29sb3JdKTsKKyAgICBXS1NhZmVCcm93c2luZ0JveCAqbGluZSA9IFtbV0tTYWZlQnJvd3NpbmdC b3ggbmV3XSBhdXRvcmVsZWFzZV07CisgICAgW2xpbmUgc2V0U2FmZUJyb3dzaW5nQmFja2dyb3Vu ZENvbG9yOltDb2xvclR5cGUgbGlnaHRHcmF5Q29sb3JdXTsKICAgICBmb3IgKFZpZXdUeXBlICp2 aWV3IGluIEBbZGV0YWlscywgYm90dG9tLCBsaW5lXSkKICAgICAgICAgdmlldy50cmFuc2xhdGVz QXV0b3Jlc2l6aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwogCg== 368630 2019-04-30 16:42:11 -0700 2019-04-30 17:34:48 -0700 Patch bug-197443-20190430164211.patch text/plain 7065 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQ4MTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA0LTMwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2FmZSBicm93c2lu ZyB3YXJuaW5nIHNob3VsZCB1cGRhdGUgY29sb3JzIHdoZW4gYSB1c2VyIHN3aXRjaGVzIGJldHdl ZW4gbGlnaHQgYW5kIGRhcmsgYXBwZWFyYW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTg4 MzkxNz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX ZSBkcmF3IHRoZSBXS1NhZmVCcm93c2luZ0V4Y2xhbWF0aW9uUG9pbnQgb3Vyc2VsdmVzLCBzbyB3 ZSBuZWVkIHRvIGNhbGwgc2V0TmVlZHNEaXNwbGF5IHdoZW4gdmlld0RpZENoYW5nZUVmZmVjdGl2 ZUFwcGVhcmFuY2UgaXMgY2FsbGVkLgorICAgICAgICBJbnN0ZWFkIG9mIHNldHRpbmcgTlNWaWV3 LmxheWVyLmJhY2tncm91bmRDb2xvciB3ZSBuZWVkIHRvIG1ha2UgYW4gTlNWaWV3IHN1YmNsYXNz IEkgY2FsbCBXS1NhZmVCcm93c2luZ0JveCBhbmQgd2UgbmVlZCB0byBzZXQgaXRzIGxheWVyJ3MK KyAgICAgICAgYmFja2dyb3VuZENvbG9yIGluIHVwZGF0ZUxheWVyLCBvdGhlcndpc2UgdGhlIENH Q29sb3IgaXNuJ3QgdXBkYXRlZCBmcm9tIHRoZSBOU0NvbG9yLgorCisgICAgICAgICogVUlQcm9j ZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9D b2NvYS9XS1NhZmVCcm93c2luZ1dhcm5pbmcubW06CisgICAgICAgIChjb2xvckZvckl0ZW0pOgor ICAgICAgICAoLVtXS1NhZmVCcm93c2luZ0V4Y2xhbWF0aW9uUG9pbnQgdmlld0RpZENoYW5nZUVm ZmVjdGl2ZUFwcGVhcmFuY2VdKToKKyAgICAgICAgKC1bV0tTYWZlQnJvd3NpbmdCb3ggc2V0U2Fm ZUJyb3dzaW5nQmFja2dyb3VuZENvbG9yOl0pOgorICAgICAgICAoLVtXS1NhZmVCcm93c2luZ0Jv eCB1cGRhdGVMYXllcl0pOgorICAgICAgICAoLVtXS1NhZmVCcm93c2luZ1dhcm5pbmcgaW5pdFdp dGhGcmFtZTpzYWZlQnJvd3NpbmdXYXJuaW5nOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAg ICAoLVtXS1NhZmVCcm93c2luZ1dhcm5pbmcgYWRkQ29udGVudF0pOgorICAgICAgICAoLVtXS1Nh ZmVCcm93c2luZ1dhcm5pbmcgc2hvd0RldGFpbHNDbGlja2VkXSk6CisgICAgICAgIChzZXRCYWNr Z3JvdW5kKTogRGVsZXRlZC4KKwogMjAxOS0wNC0zMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgogCiAgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgVVJMIHNjaGVtZSBoYW5kbGVycyBj YW4gbm8gbG9uZ2VyIHJlc3BvbmQgYXN5bmNocm9ub3VzbHkKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5oCShyZXZp c2lvbiAyNDQ3NTkpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1NhZmVCcm93 c2luZ1dhcm5pbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsMTggKzQ1LDMzIEBAIE9CSkNfQ0xB U1MgV0tTYWZlQnJvd3NpbmdUZXh0VmlldzsKICNpZiBQTEFURk9STShNQUMpCiB1c2luZyBWaWV3 VHlwZSA9IE5TVmlldzsKIHVzaW5nIFJlY3RUeXBlID0gTlNSZWN0OwotQGludGVyZmFjZSBXS1Nh ZmVCcm93c2luZ1dhcm5pbmcgOiBOU1ZpZXc8TlNUZXh0Vmlld0RlbGVnYXRlPgordXNpbmcgQ29s b3JUeXBlID0gTlNDb2xvcjsKICNlbHNlCiB1c2luZyBWaWV3VHlwZSA9IFVJVmlldzsKIHVzaW5n IFJlY3RUeXBlID0gQ0dSZWN0OwotQGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcgOiBV SVNjcm9sbFZpZXc8VUlUZXh0Vmlld0RlbGVnYXRlPgordXNpbmcgQ29sb3JUeXBlID0gVUlDb2xv cjsKKyNlbmRpZgorCitAaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nQm94IDogVmlld1R5cGUgewor QHBhY2thZ2UKKyNpZiBQTEFURk9STShNQUMpCisgICAgUmV0YWluUHRyPENvbG9yVHlwZT4gX2Jh Y2tncm91bmRDb2xvcjsKKyNlbmRpZgorfQorLSAodm9pZClzZXRTYWZlQnJvd3NpbmdCYWNrZ3Jv dW5kQ29sb3I6KENvbG9yVHlwZSAqKWNvbG9yOworQGVuZAorCisjaWYgUExBVEZPUk0oTUFDKQor QGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcgOiBXS1NhZmVCcm93c2luZ0JveDxOU1Rl eHRWaWV3RGVsZWdhdGU+CisjZWxzZQorQGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1dhcm5pbmcg OiBXS1NhZmVCcm93c2luZ0JveDxVSVRleHRWaWV3RGVsZWdhdGU+CiAjZW5kaWYKIHsKIEBwYWNr YWdlCiAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWYXJpYW50PFdlYktpdDo6Q29udGludWVV bnNhZmVMb2FkLCBVUkw+JiYpPiBfY29tcGxldGlvbkhhbmRsZXI7CiAgICAgUmVmUHRyPGNvbnN0 IFdlYktpdDo6U2FmZUJyb3dzaW5nV2FybmluZz4gX3dhcm5pbmc7CiAgICAgV2Vha09iakNQdHI8 V0tTYWZlQnJvd3NpbmdUZXh0Vmlldz4gX2RldGFpbHM7Ci0gICAgV2Vha09iakNQdHI8Vmlld1R5 cGU+IF9ib3g7CisgICAgV2Vha09iakNQdHI8V0tTYWZlQnJvd3NpbmdCb3g+IF9ib3g7CiAjaWYg UExBVEZPUk0oV0FUQ0hPUykKICAgICBXZWFrT2JqQ1B0cjxVSVJlc3BvbmRlcj4gX3ByZXZpb3Vz Rmlyc3RSZXNwb25kZXI7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Nv Y29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9Db2NvYS9XS1NhZmVCcm93c2luZ1dhcm5pbmcubW0JKHJldmlzaW9uIDI0NDc1 OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2Fybmlu Zy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTAsMTQgKzUwLDEyIEBAIGNvbnN0ZXhwciBDR0Zsb2F0 IG1heFdpZHRoID0gNjc1OwogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMpCi11c2luZyBDb2xv clR5cGUgPSBOU0NvbG9yOwogdXNpbmcgRm9udFR5cGUgPSBOU0ZvbnQ7CiB1c2luZyBUZXh0Vmll d1R5cGUgPSBOU1RleHRWaWV3OwogdXNpbmcgQnV0dG9uVHlwZSA9IE5TQnV0dG9uOwogdXNpbmcg QWxpZ25tZW50VHlwZSA9IE5TTGF5b3V0QXR0cmlidXRlOwogdXNpbmcgU2l6ZVR5cGUgPSBOU1Np emU7CiAjZWxzZQotdXNpbmcgQ29sb3JUeXBlID0gVUlDb2xvcjsKIHVzaW5nIEZvbnRUeXBlID0g VUlGb250OwogdXNpbmcgVGV4dFZpZXdUeXBlID0gVUlUZXh0VmlldzsKIHVzaW5nIEJ1dHRvblR5 cGUgPSBVSUJ1dHRvbjsKQEAgLTIwMCw2ICsxOTgsMTEgQEAgLSAodm9pZClkcmF3UmVjdDooUmVj dFR5cGUpcmVjdAogICAgIFtleGNsYW1hdGlvblBvaW50IGZpbGxdOwogfQogCistICh2b2lkKXZp ZXdEaWRDaGFuZ2VFZmZlY3RpdmVBcHBlYXJhbmNlCit7CisgICAgW3NlbGYgc2V0TmVlZHNEaXNw bGF5OllFU107Cit9CisKIC0gKE5TU2l6ZSlpbnRyaW5zaWNDb250ZW50U2l6ZQogewogICAgIHJl dHVybiB7IGV4Y2xhbWF0aW9uUG9pbnRTaXplLCBleGNsYW1hdGlvblBvaW50U2l6ZSB9OwpAQCAt MjU0LDE2ICsyNTcsMjcgQEAgc3RhdGljIFZpZXdUeXBlICptYWtlTGFiZWwoTlNBdHRyaWJ1dGVk UwogI2VuZGlmCiB9CiAKLXN0YXRpYyB2b2lkIHNldEJhY2tncm91bmQoVmlld1R5cGUgKnZpZXcs IENvbG9yVHlwZSAqY29sb3IpCitAaW1wbGVtZW50YXRpb24gV0tTYWZlQnJvd3NpbmdCb3gKKwor LSAodm9pZClzZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29sb3I6KENvbG9yVHlwZSAqKWNvbG9y CiB7CiAjaWYgUExBVEZPUk0oTUFDKQotICAgIHZpZXcud2FudHNMYXllciA9IFlFUzsKLSAgICB2 aWV3LmxheWVyLmJhY2tncm91bmRDb2xvciA9IGNvbG9yLkNHQ29sb3I7CisgICAgX2JhY2tncm91 bmRDb2xvciA9IGNvbG9yOworICAgIHNlbGYud2FudHNMYXllciA9IFlFUzsKICNlbHNlCi0gICAg dmlldy5iYWNrZ3JvdW5kQ29sb3IgPSBjb2xvcjsKKyAgICBzZWxmLmJhY2tncm91bmRDb2xvciA9 IGNvbG9yOwogI2VuZGlmCiB9CiAKKyNpZiBQTEFURk9STShNQUMpCistICh2b2lkKXVwZGF0ZUxh eWVyCit7CisgICAgc2VsZi5sYXllci5iYWNrZ3JvdW5kQ29sb3IgPSBbX2JhY2tncm91bmRDb2xv ciBDR0NvbG9yXTsKK30KKyNlbmRpZgorCitAZW5kCisKIEBpbnRlcmZhY2UgV0tTYWZlQnJvd3Np bmdUZXh0VmlldyA6IFRleHRWaWV3VHlwZSB7CiBAcGFja2FnZQogICAgIFdlYWtPYmpDUHRyPFdL U2FmZUJyb3dzaW5nV2FybmluZz4gX3dhcm5pbmc7CkBAIC0yODcsNyArMzAxLDcgQEAgLSAoaW5z dGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KFJlY3RUeXBlKQogICAgICAgICBjb21wbGV0aW9uSGFu ZGxlcihXVEZNb3ZlKHJlc3VsdCkpOwogICAgIH07CiAgICAgX3dhcm5pbmcgPSBtYWtlUmVmKHdh cm5pbmcpOwotICAgIHNldEJhY2tncm91bmQoc2VsZiwgY29sb3JGb3JJdGVtKFdhcm5pbmdJdGVt OjpCYWNrZ3JvdW5kLCBzZWxmKSk7CisgICAgW3NlbGYgc2V0U2FmZUJyb3dzaW5nQmFja2dyb3Vu ZENvbG9yOmNvbG9yRm9ySXRlbShXYXJuaW5nSXRlbTo6QmFja2dyb3VuZCwgc2VsZildOwogI2lm IFBMQVRGT1JNKE1BQykKICAgICBbc2VsZiBhZGRDb250ZW50XTsKICNlbmRpZgpAQCAtMzE3LDkg KzMzMSw5IEBAIC0gKHZvaWQpYWRkQ29udGVudAogICAgIH1dIGF1dG9yZWxlYXNlXSk7CiAgICAg YXV0byBzaG93RGV0YWlscyA9IG1ha2VCdXR0b24oV2FybmluZ0l0ZW06OlNob3dEZXRhaWxzQnV0 dG9uLCBzZWxmLCBAc2VsZWN0b3Ioc2hvd0RldGFpbHNDbGlja2VkKSk7CiAgICAgYXV0byBnb0Jh Y2sgPSBtYWtlQnV0dG9uKFdhcm5pbmdJdGVtOjpHb0JhY2tCdXR0b24sIHNlbGYsIEBzZWxlY3Rv cihnb0JhY2tDbGlja2VkKSk7Ci0gICAgYXV0byBib3ggPSBbW1ZpZXdUeXBlIG5ld10gYXV0b3Jl bGVhc2VdOworICAgIGF1dG8gYm94ID0gW1tXS1NhZmVCcm93c2luZ0JveCBuZXddIGF1dG9yZWxl YXNlXTsKICAgICBfYm94ID0gYm94OwotICAgIHNldEJhY2tncm91bmQoYm94LCBjb2xvckZvckl0 ZW0oV2FybmluZ0l0ZW06OkJveEJhY2tncm91bmQsIHNlbGYpKTsKKyAgICBbYm94IHNldFNhZmVC cm93c2luZ0JhY2tncm91bmRDb2xvcjpjb2xvckZvckl0ZW0oV2FybmluZ0l0ZW06OkJveEJhY2tn cm91bmQsIHNlbGYpXTsKICAgICBib3gubGF5ZXIuY29ybmVyUmFkaXVzID0gYm94Q29ybmVyUmFk aXVzOwogCiAgICAgZm9yIChWaWV3VHlwZSAqdmlldyBpbiBAW2V4Y2xhbWF0aW9uUG9pbnQsIHRp dGxlLCB3YXJuaW5nLCBnb0JhY2ssIHNob3dEZXRhaWxzXSkgewpAQCAtMzkyLDcgKzQwNiw3IEBA IC0gKHZvaWQpYWRkQ29udGVudAogCiAtICh2b2lkKXNob3dEZXRhaWxzQ2xpY2tlZAogewotICAg IFZpZXdUeXBlICpib3ggPSBfYm94LmdldCgpLmdldCgpOworICAgIFdLU2FmZUJyb3dzaW5nQm94 ICpib3ggPSBfYm94LmdldCgpLmdldCgpOwogICAgIEJ1dHRvblR5cGUgKnNob3dEZXRhaWxzID0g Ym94LnN1YnZpZXdzLmxhc3RPYmplY3Q7CiAgICAgW3Nob3dEZXRhaWxzIHJlbW92ZUZyb21TdXBl cnZpZXddOwogCkBAIC00MDAsOCArNDE0LDggQEAgLSAodm9pZClzaG93RGV0YWlsc0NsaWNrZWQK ICAgICBbdGV4dCBhZGRBdHRyaWJ1dGVzOkB7IE5TRm9udEF0dHJpYnV0ZU5hbWU6Zm9udE9mU2l6 ZShXYXJuaW5nVGV4dFNpemU6OkJvZHkpIH0gcmFuZ2U6TlNNYWtlUmFuZ2UoMCwgdGV4dC5sZW5n dGgpXTsKICAgICBXS1NhZmVCcm93c2luZ1RleHRWaWV3ICpkZXRhaWxzID0gW1tbV0tTYWZlQnJv d3NpbmdUZXh0VmlldyBhbGxvY10gaW5pdFdpdGhBdHRyaWJ1dGVkU3RyaW5nOnRleHQgZm9yV2Fy bmluZzpzZWxmXSBhdXRvcmVsZWFzZV07CiAgICAgX2RldGFpbHMgPSBkZXRhaWxzOwotICAgIFZp ZXdUeXBlICpib3R0b20gPSBbW1ZpZXdUeXBlIG5ld10gYXV0b3JlbGVhc2VdOwotICAgIHNldEJh Y2tncm91bmQoYm90dG9tLCBjb2xvckZvckl0ZW0oV2FybmluZ0l0ZW06OkJveEJhY2tncm91bmQs IHNlbGYpKTsKKyAgICBXS1NhZmVCcm93c2luZ0JveCAqYm90dG9tID0gW1tXS1NhZmVCcm93c2lu Z0JveCBuZXddIGF1dG9yZWxlYXNlXTsKKyAgICBbYm90dG9tIHNldFNhZmVCcm93c2luZ0JhY2tn cm91bmRDb2xvcjpjb2xvckZvckl0ZW0oV2FybmluZ0l0ZW06OkJveEJhY2tncm91bmQsIHNlbGYp XTsKICAgICBib3R0b20ubGF5ZXIuY29ybmVyUmFkaXVzID0gYm94Q29ybmVyUmFkaXVzOwogCiAj aWYgSEFWRShTQUZFX0JST1dTSU5HKQpAQCAtNDE2LDggKzQzMCw4IEBAIC0gKHZvaWQpc2hvd0Rl dGFpbHNDbGlja2VkCiAjZW5kaWYKICNlbmRpZgogCi0gICAgVmlld1R5cGUgKmxpbmUgPSBbW1Zp ZXdUeXBlIG5ld10gYXV0b3JlbGVhc2VdOwotICAgIHNldEJhY2tncm91bmQobGluZSwgW0NvbG9y VHlwZSBsaWdodEdyYXlDb2xvcl0pOworICAgIFdLU2FmZUJyb3dzaW5nQm94ICpsaW5lID0gW1tX S1NhZmVCcm93c2luZ0JveCBuZXddIGF1dG9yZWxlYXNlXTsKKyAgICBbbGluZSBzZXRTYWZlQnJv d3NpbmdCYWNrZ3JvdW5kQ29sb3I6W0NvbG9yVHlwZSBsaWdodEdyYXlDb2xvcl1dOwogICAgIGZv ciAoVmlld1R5cGUgKnZpZXcgaW4gQFtkZXRhaWxzLCBib3R0b20sIGxpbmVdKQogICAgICAgICB2 aWV3LnRyYW5zbGF0ZXNBdXRvcmVzaXppbmdNYXNrSW50b0NvbnN0cmFpbnRzID0gTk87CiAK 368634 2019-04-30 17:34:51 -0700 2019-05-01 16:24:54 -0700 Patch bug-197443-20190430173450.patch text/plain 7088 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQ4MTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA0LTMwICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2FmZSBicm93c2lu ZyB3YXJuaW5nIHNob3VsZCB1cGRhdGUgY29sb3JzIHdoZW4gYSB1c2VyIHN3aXRjaGVzIGJldHdl ZW4gbGlnaHQgYW5kIGRhcmsgYXBwZWFyYW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTg4 MzkxNz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFdlIGRy YXcgdGhlIFdLU2FmZUJyb3dzaW5nRXhjbGFtYXRpb25Qb2ludCBvdXJzZWx2ZXMsIHNvIHdlIG5l ZWQgdG8gY2FsbCBzZXROZWVkc0Rpc3BsYXkgd2hlbiB2aWV3RGlkQ2hhbmdlRWZmZWN0aXZlQXBw ZWFyYW5jZSBpcyBjYWxsZWQuCisgICAgICAgIEluc3RlYWQgb2Ygc2V0dGluZyBOU1ZpZXcubGF5 ZXIuYmFja2dyb3VuZENvbG9yIHdlIG5lZWQgdG8gbWFrZSBhbiBOU1ZpZXcgc3ViY2xhc3MgSSBj YWxsIFdLU2FmZUJyb3dzaW5nQm94IGFuZCB3ZSBuZWVkIHRvIHNldCBpdHMgbGF5ZXIncworICAg ICAgICBiYWNrZ3JvdW5kQ29sb3IgaW4gdXBkYXRlTGF5ZXIsIG90aGVyd2lzZSB0aGUgQ0dDb2xv ciBpc24ndCB1cGRhdGVkIGZyb20gdGhlIE5TQ29sb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbToKKyAgICAgICAgKGNvbG9yRm9ySXRlbSk6CisgICAg ICAgICgtW1dLU2FmZUJyb3dzaW5nRXhjbGFtYXRpb25Qb2ludCB2aWV3RGlkQ2hhbmdlRWZmZWN0 aXZlQXBwZWFyYW5jZV0pOgorICAgICAgICAoLVtXS1NhZmVCcm93c2luZ0JveCBzZXRTYWZlQnJv d3NpbmdCYWNrZ3JvdW5kQ29sb3I6XSk6CisgICAgICAgICgtW1dLU2FmZUJyb3dzaW5nQm94IHVw ZGF0ZUxheWVyXSk6CisgICAgICAgICgtW1dLU2FmZUJyb3dzaW5nV2FybmluZyBpbml0V2l0aEZy YW1lOnNhZmVCcm93c2luZ1dhcm5pbmc6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgt W1dLU2FmZUJyb3dzaW5nV2FybmluZyBhZGRDb250ZW50XSk6CisgICAgICAgICgtW1dLU2FmZUJy b3dzaW5nV2FybmluZyBzaG93RGV0YWlsc0NsaWNrZWRdKToKKyAgICAgICAgKHNldEJhY2tncm91 bmQpOiBEZWxldGVkLgorCiAyMDE5LTA0LTMwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgUmVncmVzc2lvbihQU09OKSBVUkwgc2NoZW1lIGhhbmRsZXJzIGNhbiBu byBsb25nZXIgcmVzcG9uZCBhc3luY2hyb25vdXNseQpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmgJKHJldmlzaW9u IDI0NDc1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5n V2FybmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSwxOCArNDUsMzMgQEAgT0JKQ19DTEFTUyBX S1NhZmVCcm93c2luZ1RleHRWaWV3OwogI2lmIFBMQVRGT1JNKE1BQykKIHVzaW5nIFZpZXdUeXBl ID0gTlNWaWV3OwogdXNpbmcgUmVjdFR5cGUgPSBOU1JlY3Q7Ci1AaW50ZXJmYWNlIFdLU2FmZUJy b3dzaW5nV2FybmluZyA6IE5TVmlldzxOU1RleHRWaWV3RGVsZWdhdGU+Cit1c2luZyBDb2xvclR5 cGUgPSBOU0NvbG9yOwogI2Vsc2UKIHVzaW5nIFZpZXdUeXBlID0gVUlWaWV3OwogdXNpbmcgUmVj dFR5cGUgPSBDR1JlY3Q7Ci1AaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nV2FybmluZyA6IFVJU2Ny b2xsVmlldzxVSVRleHRWaWV3RGVsZWdhdGU+Cit1c2luZyBDb2xvclR5cGUgPSBVSUNvbG9yOwor I2VuZGlmCisKK0BpbnRlcmZhY2UgV0tTYWZlQnJvd3NpbmdCb3ggOiBWaWV3VHlwZSB7CitAcGFj a2FnZQorI2lmIFBMQVRGT1JNKE1BQykKKyAgICBSZXRhaW5QdHI8Q29sb3JUeXBlPiBfYmFja2dy b3VuZENvbG9yOworI2VuZGlmCit9CistICh2b2lkKXNldFNhZmVCcm93c2luZ0JhY2tncm91bmRD b2xvcjooQ29sb3JUeXBlICopY29sb3I7CitAZW5kCisKKyNpZiBQTEFURk9STShNQUMpCitAaW50 ZXJmYWNlIFdLU2FmZUJyb3dzaW5nV2FybmluZyA6IFdLU2FmZUJyb3dzaW5nQm94PE5TVGV4dFZp ZXdEZWxlZ2F0ZT4KKyNlbHNlCitAaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nV2FybmluZyA6IFdL U2FmZUJyb3dzaW5nQm94PFVJVGV4dFZpZXdEZWxlZ2F0ZT4KICNlbmRpZgogewogQHBhY2thZ2UK ICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZhcmlhbnQ8V2ViS2l0OjpDb250aW51ZVVuc2Fm ZUxvYWQsIFVSTD4mJik+IF9jb21wbGV0aW9uSGFuZGxlcjsKICAgICBSZWZQdHI8Y29uc3QgV2Vi S2l0OjpTYWZlQnJvd3NpbmdXYXJuaW5nPiBfd2FybmluZzsKICAgICBXZWFrT2JqQ1B0cjxXS1Nh ZmVCcm93c2luZ1RleHRWaWV3PiBfZGV0YWlsczsKLSAgICBXZWFrT2JqQ1B0cjxWaWV3VHlwZT4g X2JveDsKKyAgICBXZWFrT2JqQ1B0cjxXS1NhZmVCcm93c2luZ0JveD4gX2JveDsKICNpZiBQTEFU Rk9STShXQVRDSE9TKQogICAgIFdlYWtPYmpDUHRyPFVJUmVzcG9uZGVyPiBfcHJldmlvdXNGaXJz dFJlc3BvbmRlcjsKICNlbmRpZgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2Ev V0tTYWZlQnJvd3NpbmdXYXJuaW5nLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbQkocmV2aXNpb24gMjQ0NzU5KQor KysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLm1t CSh3b3JraW5nIGNvcHkpCkBAIC01MCwxNCArNTAsMTIgQEAgY29uc3RleHByIENHRmxvYXQgbWF4 V2lkdGggPSA2NzU7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykKLXVzaW5nIENvbG9yVHlw ZSA9IE5TQ29sb3I7CiB1c2luZyBGb250VHlwZSA9IE5TRm9udDsKIHVzaW5nIFRleHRWaWV3VHlw ZSA9IE5TVGV4dFZpZXc7CiB1c2luZyBCdXR0b25UeXBlID0gTlNCdXR0b247CiB1c2luZyBBbGln bm1lbnRUeXBlID0gTlNMYXlvdXRBdHRyaWJ1dGU7CiB1c2luZyBTaXplVHlwZSA9IE5TU2l6ZTsK ICNlbHNlCi11c2luZyBDb2xvclR5cGUgPSBVSUNvbG9yOwogdXNpbmcgRm9udFR5cGUgPSBVSUZv bnQ7CiB1c2luZyBUZXh0Vmlld1R5cGUgPSBVSVRleHRWaWV3OwogdXNpbmcgQnV0dG9uVHlwZSA9 IFVJQnV0dG9uOwpAQCAtMjAwLDYgKzE5OCwxMyBAQCAtICh2b2lkKWRyYXdSZWN0OihSZWN0VHlw ZSlyZWN0CiAgICAgW2V4Y2xhbWF0aW9uUG9pbnQgZmlsbF07CiB9CiAKKyNpZiBQTEFURk9STShN QUMpCistICh2b2lkKXZpZXdEaWRDaGFuZ2VFZmZlY3RpdmVBcHBlYXJhbmNlCit7CisgICAgW3Nl bGYgc2V0TmVlZHNEaXNwbGF5OllFU107Cit9CisjZW5kaWYKKwogLSAoTlNTaXplKWludHJpbnNp Y0NvbnRlbnRTaXplCiB7CiAgICAgcmV0dXJuIHsgZXhjbGFtYXRpb25Qb2ludFNpemUsIGV4Y2xh bWF0aW9uUG9pbnRTaXplIH07CkBAIC0yNTQsMTYgKzI1OSwyNyBAQCBzdGF0aWMgVmlld1R5cGUg Km1ha2VMYWJlbChOU0F0dHJpYnV0ZWRTCiAjZW5kaWYKIH0KIAotc3RhdGljIHZvaWQgc2V0QmFj a2dyb3VuZChWaWV3VHlwZSAqdmlldywgQ29sb3JUeXBlICpjb2xvcikKK0BpbXBsZW1lbnRhdGlv biBXS1NhZmVCcm93c2luZ0JveAorCistICh2b2lkKXNldFNhZmVCcm93c2luZ0JhY2tncm91bmRD b2xvcjooQ29sb3JUeXBlICopY29sb3IKIHsKICNpZiBQTEFURk9STShNQUMpCi0gICAgdmlldy53 YW50c0xheWVyID0gWUVTOwotICAgIHZpZXcubGF5ZXIuYmFja2dyb3VuZENvbG9yID0gY29sb3Iu Q0dDb2xvcjsKKyAgICBfYmFja2dyb3VuZENvbG9yID0gY29sb3I7CisgICAgc2VsZi53YW50c0xh eWVyID0gWUVTOwogI2Vsc2UKLSAgICB2aWV3LmJhY2tncm91bmRDb2xvciA9IGNvbG9yOworICAg IHNlbGYuYmFja2dyb3VuZENvbG9yID0gY29sb3I7CiAjZW5kaWYKIH0KIAorI2lmIFBMQVRGT1JN KE1BQykKKy0gKHZvaWQpdXBkYXRlTGF5ZXIKK3sKKyAgICBzZWxmLmxheWVyLmJhY2tncm91bmRD b2xvciA9IFtfYmFja2dyb3VuZENvbG9yIENHQ29sb3JdOworfQorI2VuZGlmCisKK0BlbmQKKwog QGludGVyZmFjZSBXS1NhZmVCcm93c2luZ1RleHRWaWV3IDogVGV4dFZpZXdUeXBlIHsKIEBwYWNr YWdlCiAgICAgV2Vha09iakNQdHI8V0tTYWZlQnJvd3NpbmdXYXJuaW5nPiBfd2FybmluZzsKQEAg LTI4Nyw3ICszMDMsNyBAQCAtIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhGcmFtZTooUmVjdFR5cGUp CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdURk1vdmUocmVzdWx0KSk7CiAgICAgfTsKICAg ICBfd2FybmluZyA9IG1ha2VSZWYod2FybmluZyk7Ci0gICAgc2V0QmFja2dyb3VuZChzZWxmLCBj b2xvckZvckl0ZW0oV2FybmluZ0l0ZW06OkJhY2tncm91bmQsIHNlbGYpKTsKKyAgICBbc2VsZiBz ZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29sb3I6Y29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpC YWNrZ3JvdW5kLCBzZWxmKV07CiAjaWYgUExBVEZPUk0oTUFDKQogICAgIFtzZWxmIGFkZENvbnRl bnRdOwogI2VuZGlmCkBAIC0zMTcsOSArMzMzLDkgQEAgLSAodm9pZClhZGRDb250ZW50CiAgICAg fV0gYXV0b3JlbGVhc2VdKTsKICAgICBhdXRvIHNob3dEZXRhaWxzID0gbWFrZUJ1dHRvbihXYXJu aW5nSXRlbTo6U2hvd0RldGFpbHNCdXR0b24sIHNlbGYsIEBzZWxlY3RvcihzaG93RGV0YWlsc0Ns aWNrZWQpKTsKICAgICBhdXRvIGdvQmFjayA9IG1ha2VCdXR0b24oV2FybmluZ0l0ZW06OkdvQmFj a0J1dHRvbiwgc2VsZiwgQHNlbGVjdG9yKGdvQmFja0NsaWNrZWQpKTsKLSAgICBhdXRvIGJveCA9 IFtbVmlld1R5cGUgbmV3XSBhdXRvcmVsZWFzZV07CisgICAgYXV0byBib3ggPSBbW1dLU2FmZUJy b3dzaW5nQm94IG5ld10gYXV0b3JlbGVhc2VdOwogICAgIF9ib3ggPSBib3g7Ci0gICAgc2V0QmFj a2dyb3VuZChib3gsIGNvbG9yRm9ySXRlbShXYXJuaW5nSXRlbTo6Qm94QmFja2dyb3VuZCwgc2Vs ZikpOworICAgIFtib3ggc2V0U2FmZUJyb3dzaW5nQmFja2dyb3VuZENvbG9yOmNvbG9yRm9ySXRl bShXYXJuaW5nSXRlbTo6Qm94QmFja2dyb3VuZCwgc2VsZildOwogICAgIGJveC5sYXllci5jb3Ju ZXJSYWRpdXMgPSBib3hDb3JuZXJSYWRpdXM7CiAKICAgICBmb3IgKFZpZXdUeXBlICp2aWV3IGlu IEBbZXhjbGFtYXRpb25Qb2ludCwgdGl0bGUsIHdhcm5pbmcsIGdvQmFjaywgc2hvd0RldGFpbHNd KSB7CkBAIC0zOTIsNyArNDA4LDcgQEAgLSAodm9pZClhZGRDb250ZW50CiAKIC0gKHZvaWQpc2hv d0RldGFpbHNDbGlja2VkCiB7Ci0gICAgVmlld1R5cGUgKmJveCA9IF9ib3guZ2V0KCkuZ2V0KCk7 CisgICAgV0tTYWZlQnJvd3NpbmdCb3ggKmJveCA9IF9ib3guZ2V0KCkuZ2V0KCk7CiAgICAgQnV0 dG9uVHlwZSAqc2hvd0RldGFpbHMgPSBib3guc3Vidmlld3MubGFzdE9iamVjdDsKICAgICBbc2hv d0RldGFpbHMgcmVtb3ZlRnJvbVN1cGVydmlld107CiAKQEAgLTQwMCw4ICs0MTYsOCBAQCAtICh2 b2lkKXNob3dEZXRhaWxzQ2xpY2tlZAogICAgIFt0ZXh0IGFkZEF0dHJpYnV0ZXM6QHsgTlNGb250 QXR0cmlidXRlTmFtZTpmb250T2ZTaXplKFdhcm5pbmdUZXh0U2l6ZTo6Qm9keSkgfSByYW5nZTpO U01ha2VSYW5nZSgwLCB0ZXh0Lmxlbmd0aCldOwogICAgIFdLU2FmZUJyb3dzaW5nVGV4dFZpZXcg KmRldGFpbHMgPSBbW1tXS1NhZmVCcm93c2luZ1RleHRWaWV3IGFsbG9jXSBpbml0V2l0aEF0dHJp YnV0ZWRTdHJpbmc6dGV4dCBmb3JXYXJuaW5nOnNlbGZdIGF1dG9yZWxlYXNlXTsKICAgICBfZGV0 YWlscyA9IGRldGFpbHM7Ci0gICAgVmlld1R5cGUgKmJvdHRvbSA9IFtbVmlld1R5cGUgbmV3XSBh dXRvcmVsZWFzZV07Ci0gICAgc2V0QmFja2dyb3VuZChib3R0b20sIGNvbG9yRm9ySXRlbShXYXJu aW5nSXRlbTo6Qm94QmFja2dyb3VuZCwgc2VsZikpOworICAgIFdLU2FmZUJyb3dzaW5nQm94ICpi b3R0b20gPSBbW1dLU2FmZUJyb3dzaW5nQm94IG5ld10gYXV0b3JlbGVhc2VdOworICAgIFtib3R0 b20gc2V0U2FmZUJyb3dzaW5nQmFja2dyb3VuZENvbG9yOmNvbG9yRm9ySXRlbShXYXJuaW5nSXRl bTo6Qm94QmFja2dyb3VuZCwgc2VsZildOwogICAgIGJvdHRvbS5sYXllci5jb3JuZXJSYWRpdXMg PSBib3hDb3JuZXJSYWRpdXM7CiAKICNpZiBIQVZFKFNBRkVfQlJPV1NJTkcpCkBAIC00MTYsOCAr NDMyLDggQEAgLSAodm9pZClzaG93RGV0YWlsc0NsaWNrZWQKICNlbmRpZgogI2VuZGlmCiAKLSAg ICBWaWV3VHlwZSAqbGluZSA9IFtbVmlld1R5cGUgbmV3XSBhdXRvcmVsZWFzZV07Ci0gICAgc2V0 QmFja2dyb3VuZChsaW5lLCBbQ29sb3JUeXBlIGxpZ2h0R3JheUNvbG9yXSk7CisgICAgV0tTYWZl QnJvd3NpbmdCb3ggKmxpbmUgPSBbW1dLU2FmZUJyb3dzaW5nQm94IG5ld10gYXV0b3JlbGVhc2Vd OworICAgIFtsaW5lIHNldFNhZmVCcm93c2luZ0JhY2tncm91bmRDb2xvcjpbQ29sb3JUeXBlIGxp Z2h0R3JheUNvbG9yXV07CiAgICAgZm9yIChWaWV3VHlwZSAqdmlldyBpbiBAW2RldGFpbHMsIGJv dHRvbSwgbGluZV0pCiAgICAgICAgIHZpZXcudHJhbnNsYXRlc0F1dG9yZXNpemluZ01hc2tJbnRv Q29uc3RyYWludHMgPSBOTzsKIAo= 368731 2019-05-01 16:24:56 -0700 2019-05-01 16:45:28 -0700 Patch bug-197443-20190501162455.patch text/plain 7156 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDQ4MTApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA1LTAxICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgU2FmZSBicm93c2lu ZyB3YXJuaW5nIHNob3VsZCB1cGRhdGUgY29sb3JzIHdoZW4gYSB1c2VyIHN3aXRjaGVzIGJldHdl ZW4gbGlnaHQgYW5kIGRhcmsgYXBwZWFyYW5jZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3NDQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80OTg4 MzkxNz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFdlIGRy YXcgdGhlIFdLU2FmZUJyb3dzaW5nRXhjbGFtYXRpb25Qb2ludCBvdXJzZWx2ZXMsIHNvIHdlIG5l ZWQgdG8gY2FsbCBzZXROZWVkc0Rpc3BsYXkgd2hlbiB2aWV3RGlkQ2hhbmdlRWZmZWN0aXZlQXBw ZWFyYW5jZSBpcyBjYWxsZWQuCisgICAgICAgIEluc3RlYWQgb2Ygc2V0dGluZyBOU1ZpZXcubGF5 ZXIuYmFja2dyb3VuZENvbG9yIHdlIG5lZWQgdG8gbWFrZSBhbiBOU1ZpZXcgc3ViY2xhc3MgSSBj YWxsIFdLU2FmZUJyb3dzaW5nQm94IGFuZCB3ZSBuZWVkIHRvIHNldCBpdHMgbGF5ZXIncworICAg ICAgICBiYWNrZ3JvdW5kQ29sb3IgaW4gdXBkYXRlTGF5ZXIsIG90aGVyd2lzZSB0aGUgQ0dDb2xv ciBpc24ndCB1cGRhdGVkIGZyb20gdGhlIE5TQ29sb3IuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv Q29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29h L1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbToKKyAgICAgICAgKGNvbG9yRm9ySXRlbSk6CisgICAg ICAgICgtW1dLU2FmZUJyb3dzaW5nRXhjbGFtYXRpb25Qb2ludCB2aWV3RGlkQ2hhbmdlRWZmZWN0 aXZlQXBwZWFyYW5jZV0pOgorICAgICAgICAoLVtXS1NhZmVCcm93c2luZ0JveCBzZXRTYWZlQnJv d3NpbmdCYWNrZ3JvdW5kQ29sb3I6XSk6CisgICAgICAgICgtW1dLU2FmZUJyb3dzaW5nQm94IHVw ZGF0ZUxheWVyXSk6CisgICAgICAgICgtW1dLU2FmZUJyb3dzaW5nV2FybmluZyBpbml0V2l0aEZy YW1lOnNhZmVCcm93c2luZ1dhcm5pbmc6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgt W1dLU2FmZUJyb3dzaW5nV2FybmluZyBhZGRDb250ZW50XSk6CisgICAgICAgICgtW1dLU2FmZUJy b3dzaW5nV2FybmluZyBzaG93RGV0YWlsc0NsaWNrZWRdKToKKyAgICAgICAgKHNldEJhY2tncm91 bmQpOiBEZWxldGVkLgorCiAyMDE5LTA0LTMwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5j b20+CiAKICAgICAgICAgUmVncmVzc2lvbihQU09OKSBVUkwgc2NoZW1lIGhhbmRsZXJzIGNhbiBu byBsb25nZXIgcmVzcG9uZCBhc3luY2hyb25vdXNseQpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV0tTYWZlQnJvd3NpbmdXYXJuaW5nLmgJKHJldmlzaW9u IDI0NDc1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5n V2FybmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSwxMCArNDUsMjUgQEAgT0JKQ19DTEFTUyBX S1NhZmVCcm93c2luZ1RleHRWaWV3OwogI2lmIFBMQVRGT1JNKE1BQykKIHVzaW5nIFZpZXdUeXBl ID0gTlNWaWV3OwogdXNpbmcgUmVjdFR5cGUgPSBOU1JlY3Q7Ci1AaW50ZXJmYWNlIFdLU2FmZUJy b3dzaW5nV2FybmluZyA6IE5TVmlldzxOU1RleHRWaWV3RGVsZWdhdGU+Cit1c2luZyBDb2xvclR5 cGUgPSBOU0NvbG9yOwogI2Vsc2UKIHVzaW5nIFZpZXdUeXBlID0gVUlWaWV3OwogdXNpbmcgUmVj dFR5cGUgPSBDR1JlY3Q7Cit1c2luZyBDb2xvclR5cGUgPSBVSUNvbG9yOworI2VuZGlmCisKK0Bp bnRlcmZhY2UgV0tTYWZlQnJvd3NpbmdCb3ggOiBWaWV3VHlwZSB7CitAcGFja2FnZQorI2lmIFBM QVRGT1JNKE1BQykKKyAgICBSZXRhaW5QdHI8Q29sb3JUeXBlPiBfYmFja2dyb3VuZENvbG9yOwor I2VuZGlmCit9CistICh2b2lkKXNldFNhZmVCcm93c2luZ0JhY2tncm91bmRDb2xvcjooQ29sb3JU eXBlICopY29sb3I7CitAZW5kCisKKyNpZiBQTEFURk9STShNQUMpCitAaW50ZXJmYWNlIFdLU2Fm ZUJyb3dzaW5nV2FybmluZyA6IFdLU2FmZUJyb3dzaW5nQm94PE5TVGV4dFZpZXdEZWxlZ2F0ZT4K KyNlbHNlCiBAaW50ZXJmYWNlIFdLU2FmZUJyb3dzaW5nV2FybmluZyA6IFVJU2Nyb2xsVmlldzxV SVRleHRWaWV3RGVsZWdhdGU+CiAjZW5kaWYKIHsKQEAgLTU2LDcgKzcxLDcgQEAgdXNpbmcgUmVj dFR5cGUgPSBDR1JlY3Q7CiAgICAgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWYXJpYW50PFdlYktp dDo6Q29udGludWVVbnNhZmVMb2FkLCBVUkw+JiYpPiBfY29tcGxldGlvbkhhbmRsZXI7CiAgICAg UmVmUHRyPGNvbnN0IFdlYktpdDo6U2FmZUJyb3dzaW5nV2FybmluZz4gX3dhcm5pbmc7CiAgICAg V2Vha09iakNQdHI8V0tTYWZlQnJvd3NpbmdUZXh0Vmlldz4gX2RldGFpbHM7Ci0gICAgV2Vha09i akNQdHI8Vmlld1R5cGU+IF9ib3g7CisgICAgV2Vha09iakNQdHI8V0tTYWZlQnJvd3NpbmdCb3g+ IF9ib3g7CiAjaWYgUExBVEZPUk0oV0FUQ0hPUykKICAgICBXZWFrT2JqQ1B0cjxVSVJlc3BvbmRl cj4gX3ByZXZpb3VzRmlyc3RSZXNwb25kZXI7CiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0NvY29hL1dLU2FmZUJyb3dzaW5nV2FybmluZy5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9XS1NhZmVCcm93c2luZ1dhcm5pbmcubW0JKHJl dmlzaW9uIDI0NDc1OSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dLU2FmZUJy b3dzaW5nV2FybmluZy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTAsMTQgKzUwLDEyIEBAIGNvbnN0 ZXhwciBDR0Zsb2F0IG1heFdpZHRoID0gNjc1OwogI2VuZGlmCiAKICNpZiBQTEFURk9STShNQUMp Ci11c2luZyBDb2xvclR5cGUgPSBOU0NvbG9yOwogdXNpbmcgRm9udFR5cGUgPSBOU0ZvbnQ7CiB1 c2luZyBUZXh0Vmlld1R5cGUgPSBOU1RleHRWaWV3OwogdXNpbmcgQnV0dG9uVHlwZSA9IE5TQnV0 dG9uOwogdXNpbmcgQWxpZ25tZW50VHlwZSA9IE5TTGF5b3V0QXR0cmlidXRlOwogdXNpbmcgU2l6 ZVR5cGUgPSBOU1NpemU7CiAjZWxzZQotdXNpbmcgQ29sb3JUeXBlID0gVUlDb2xvcjsKIHVzaW5n IEZvbnRUeXBlID0gVUlGb250OwogdXNpbmcgVGV4dFZpZXdUeXBlID0gVUlUZXh0VmlldzsKIHVz aW5nIEJ1dHRvblR5cGUgPSBVSUJ1dHRvbjsKQEAgLTIwMCw2ICsxOTgsMTMgQEAgLSAodm9pZClk cmF3UmVjdDooUmVjdFR5cGUpcmVjdAogICAgIFtleGNsYW1hdGlvblBvaW50IGZpbGxdOwogfQog CisjaWYgUExBVEZPUk0oTUFDKQorLSAodm9pZCl2aWV3RGlkQ2hhbmdlRWZmZWN0aXZlQXBwZWFy YW5jZQoreworICAgIFtzZWxmIHNldE5lZWRzRGlzcGxheTpZRVNdOworfQorI2VuZGlmCisKIC0g KE5TU2l6ZSlpbnRyaW5zaWNDb250ZW50U2l6ZQogewogICAgIHJldHVybiB7IGV4Y2xhbWF0aW9u UG9pbnRTaXplLCBleGNsYW1hdGlvblBvaW50U2l6ZSB9OwpAQCAtMjU0LDE2ICsyNTksMjcgQEAg c3RhdGljIFZpZXdUeXBlICptYWtlTGFiZWwoTlNBdHRyaWJ1dGVkUwogI2VuZGlmCiB9CiAKLXN0 YXRpYyB2b2lkIHNldEJhY2tncm91bmQoVmlld1R5cGUgKnZpZXcsIENvbG9yVHlwZSAqY29sb3Ip CitAaW1wbGVtZW50YXRpb24gV0tTYWZlQnJvd3NpbmdCb3gKKworLSAodm9pZClzZXRTYWZlQnJv d3NpbmdCYWNrZ3JvdW5kQ29sb3I6KENvbG9yVHlwZSAqKWNvbG9yCiB7CiAjaWYgUExBVEZPUk0o TUFDKQotICAgIHZpZXcud2FudHNMYXllciA9IFlFUzsKLSAgICB2aWV3LmxheWVyLmJhY2tncm91 bmRDb2xvciA9IGNvbG9yLkNHQ29sb3I7CisgICAgX2JhY2tncm91bmRDb2xvciA9IGNvbG9yOwor ICAgIHNlbGYud2FudHNMYXllciA9IFlFUzsKICNlbHNlCi0gICAgdmlldy5iYWNrZ3JvdW5kQ29s b3IgPSBjb2xvcjsKKyAgICBzZWxmLmJhY2tncm91bmRDb2xvciA9IGNvbG9yOwogI2VuZGlmCiB9 CiAKKyNpZiBQTEFURk9STShNQUMpCistICh2b2lkKXVwZGF0ZUxheWVyCit7CisgICAgc2VsZi5s YXllci5iYWNrZ3JvdW5kQ29sb3IgPSBbX2JhY2tncm91bmRDb2xvciBDR0NvbG9yXTsKK30KKyNl bmRpZgorCitAZW5kCisKIEBpbnRlcmZhY2UgV0tTYWZlQnJvd3NpbmdUZXh0VmlldyA6IFRleHRW aWV3VHlwZSB7CiBAcGFja2FnZQogICAgIFdlYWtPYmpDUHRyPFdLU2FmZUJyb3dzaW5nV2Fybmlu Zz4gX3dhcm5pbmc7CkBAIC0yODcsOSArMzAzLDExIEBAIC0gKGluc3RhbmNldHlwZSlpbml0V2l0 aEZyYW1lOihSZWN0VHlwZSkKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1 bHQpKTsKICAgICB9OwogICAgIF93YXJuaW5nID0gbWFrZVJlZih3YXJuaW5nKTsKLSAgICBzZXRC YWNrZ3JvdW5kKHNlbGYsIGNvbG9yRm9ySXRlbShXYXJuaW5nSXRlbTo6QmFja2dyb3VuZCwgc2Vs ZikpOwogI2lmIFBMQVRGT1JNKE1BQykKKyAgICBbc2VsZiBzZXRTYWZlQnJvd3NpbmdCYWNrZ3Jv dW5kQ29sb3I6Y29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCYWNrZ3JvdW5kLCBzZWxmKV07CiAg ICAgW3NlbGYgYWRkQ29udGVudF07CisjZWxzZQorICAgIFtzZWxmIHNldEJhY2tncm91bmRDb2xv cjpjb2xvckZvckl0ZW0oV2FybmluZ0l0ZW06OkJhY2tncm91bmQsIHNlbGYpXTsKICNlbmRpZgog CiAjaWYgUExBVEZPUk0oV0FUQ0hPUykKQEAgLTMxNyw5ICszMzUsOSBAQCAtICh2b2lkKWFkZENv bnRlbnQKICAgICB9XSBhdXRvcmVsZWFzZV0pOwogICAgIGF1dG8gc2hvd0RldGFpbHMgPSBtYWtl QnV0dG9uKFdhcm5pbmdJdGVtOjpTaG93RGV0YWlsc0J1dHRvbiwgc2VsZiwgQHNlbGVjdG9yKHNo b3dEZXRhaWxzQ2xpY2tlZCkpOwogICAgIGF1dG8gZ29CYWNrID0gbWFrZUJ1dHRvbihXYXJuaW5n SXRlbTo6R29CYWNrQnV0dG9uLCBzZWxmLCBAc2VsZWN0b3IoZ29CYWNrQ2xpY2tlZCkpOwotICAg IGF1dG8gYm94ID0gW1tWaWV3VHlwZSBuZXddIGF1dG9yZWxlYXNlXTsKKyAgICBhdXRvIGJveCA9 IFtbV0tTYWZlQnJvd3NpbmdCb3ggbmV3XSBhdXRvcmVsZWFzZV07CiAgICAgX2JveCA9IGJveDsK LSAgICBzZXRCYWNrZ3JvdW5kKGJveCwgY29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNr Z3JvdW5kLCBzZWxmKSk7CisgICAgW2JveCBzZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29sb3I6 Y29sb3JGb3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKV07CiAgICAgYm94 LmxheWVyLmNvcm5lclJhZGl1cyA9IGJveENvcm5lclJhZGl1czsKIAogICAgIGZvciAoVmlld1R5 cGUgKnZpZXcgaW4gQFtleGNsYW1hdGlvblBvaW50LCB0aXRsZSwgd2FybmluZywgZ29CYWNrLCBz aG93RGV0YWlsc10pIHsKQEAgLTM5Miw3ICs0MTAsNyBAQCAtICh2b2lkKWFkZENvbnRlbnQKIAog LSAodm9pZClzaG93RGV0YWlsc0NsaWNrZWQKIHsKLSAgICBWaWV3VHlwZSAqYm94ID0gX2JveC5n ZXQoKS5nZXQoKTsKKyAgICBXS1NhZmVCcm93c2luZ0JveCAqYm94ID0gX2JveC5nZXQoKS5nZXQo KTsKICAgICBCdXR0b25UeXBlICpzaG93RGV0YWlscyA9IGJveC5zdWJ2aWV3cy5sYXN0T2JqZWN0 OwogICAgIFtzaG93RGV0YWlscyByZW1vdmVGcm9tU3VwZXJ2aWV3XTsKIApAQCAtNDAwLDggKzQx OCw4IEBAIC0gKHZvaWQpc2hvd0RldGFpbHNDbGlja2VkCiAgICAgW3RleHQgYWRkQXR0cmlidXRl czpAeyBOU0ZvbnRBdHRyaWJ1dGVOYW1lOmZvbnRPZlNpemUoV2FybmluZ1RleHRTaXplOjpCb2R5 KSB9IHJhbmdlOk5TTWFrZVJhbmdlKDAsIHRleHQubGVuZ3RoKV07CiAgICAgV0tTYWZlQnJvd3Np bmdUZXh0VmlldyAqZGV0YWlscyA9IFtbW1dLU2FmZUJyb3dzaW5nVGV4dFZpZXcgYWxsb2NdIGlu aXRXaXRoQXR0cmlidXRlZFN0cmluZzp0ZXh0IGZvcldhcm5pbmc6c2VsZl0gYXV0b3JlbGVhc2Vd OwogICAgIF9kZXRhaWxzID0gZGV0YWlsczsKLSAgICBWaWV3VHlwZSAqYm90dG9tID0gW1tWaWV3 VHlwZSBuZXddIGF1dG9yZWxlYXNlXTsKLSAgICBzZXRCYWNrZ3JvdW5kKGJvdHRvbSwgY29sb3JG b3JJdGVtKFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKSk7CisgICAgV0tTYWZlQnJv d3NpbmdCb3ggKmJvdHRvbSA9IFtbV0tTYWZlQnJvd3NpbmdCb3ggbmV3XSBhdXRvcmVsZWFzZV07 CisgICAgW2JvdHRvbSBzZXRTYWZlQnJvd3NpbmdCYWNrZ3JvdW5kQ29sb3I6Y29sb3JGb3JJdGVt KFdhcm5pbmdJdGVtOjpCb3hCYWNrZ3JvdW5kLCBzZWxmKV07CiAgICAgYm90dG9tLmxheWVyLmNv cm5lclJhZGl1cyA9IGJveENvcm5lclJhZGl1czsKIAogI2lmIEhBVkUoU0FGRV9CUk9XU0lORykK QEAgLTQxNiw4ICs0MzQsOCBAQCAtICh2b2lkKXNob3dEZXRhaWxzQ2xpY2tlZAogI2VuZGlmCiAj ZW5kaWYKIAotICAgIFZpZXdUeXBlICpsaW5lID0gW1tWaWV3VHlwZSBuZXddIGF1dG9yZWxlYXNl XTsKLSAgICBzZXRCYWNrZ3JvdW5kKGxpbmUsIFtDb2xvclR5cGUgbGlnaHRHcmF5Q29sb3JdKTsK KyAgICBXS1NhZmVCcm93c2luZ0JveCAqbGluZSA9IFtbV0tTYWZlQnJvd3NpbmdCb3ggbmV3XSBh dXRvcmVsZWFzZV07CisgICAgW2xpbmUgc2V0U2FmZUJyb3dzaW5nQmFja2dyb3VuZENvbG9yOltD b2xvclR5cGUgbGlnaHRHcmF5Q29sb3JdXTsKICAgICBmb3IgKFZpZXdUeXBlICp2aWV3IGluIEBb ZGV0YWlscywgYm90dG9tLCBsaW5lXSkKICAgICAgICAgdmlldy50cmFuc2xhdGVzQXV0b3Jlc2l6 aW5nTWFza0ludG9Db25zdHJhaW50cyA9IE5POwogCg==