181920 2018-01-21 20:44:33 -0800 Turning off custom pasteboard data doesn't actually turn it off in WK2 2018-01-21 22:41:07 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 181616 1 rniwa rniwa darin koivisto sam wenson_hsieh oldest_to_newest 1391540 0 rniwa 2018-01-21 20:44:33 -0800 We have a bug that turning off custom pasteboard data in WK2 doesn’t actually turn it off because defaultCustomPasteboardDataEnabled() returns false in UIProcess, and WebPreferenceStore ends up not updating the preferences after https://trac.webkit.org/changeset/226156. We should simply replace this crazy global settings by a regular runtime enabled flag. 1391541 1 rniwa 2018-01-21 20:45:22 -0800 <rdar://problem/36686429> 1391542 2 331893 rniwa 2018-01-21 20:49:55 -0800 Created attachment 331893 Fixes the bug 1391548 3 rniwa 2018-01-21 22:39:26 -0800 Thanks for the review! 1391550 4 rniwa 2018-01-21 22:41:07 -0800 Committed r227282: <https://trac.webkit.org/changeset/227282> 331893 2018-01-21 20:49:55 -0800 2018-01-21 22:37:37 -0800 Fixes the bug bug-181920-20180121204952.patch text/plain 20178 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzI4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDE4LTAxLTIxICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFR1cm5pbmcgb2ZmIGN1c3RvbSBw YXN0ZWJvYXJkIGRhdGEgZG9lc24ndCBhY3R1YWxseSB0dXJuIGl0IG9mZiBpbiBXSzIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MTkyMAorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMzY2ODY0Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZWQgdGhlIGdsb2JhbCBzZXR0aW5ncyBmb3IgY3Vz dG9tIHBhc3RlYm9hcmQgZGF0YSBieSByZWd1bGFyIHJ1bnRpbWUgZW5hYmxlZCBmbGFncy4KKwor ICAgICAgICAqIGRvbS9EYXRhVHJhbnNmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGF0YVRy YW5zZmVyOjpnZXREYXRhRm9ySXRlbSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVHJh bnNmZXI6OnNob3VsZFN1cHByZXNzR2V0QW5kU2V0RGF0YVRvQXZvaWRFeHBvc2luZ0ZpbGVQYXRo cyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhVHJhbnNmZXI6OnNldERhdGFGcm9tSXRl bUxpc3QpOgorICAgICAgICAoV2ViQ29yZTo6RGF0YVRyYW5zZmVyOjp0eXBlcyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpEYXRhVHJhbnNmZXI6OmNvbW1pdFRvUGFzdGVib2FyZCk6CisgICAg ICAgICogZG9tL0RhdGFUcmFuc2Zlckl0ZW1MaXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNo b3VsZEV4cG9zZVR5cGVJbkl0ZW1MaXN0KToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVEYXRhVHJhbnNmZXJGb3JDbGlwYm9hcmRFdmVudCk6 CisgICAgICAgICogZWRpdGluZy9jb2NvYS9XZWJDb250ZW50UmVhZGVyQ29jb2EubW06CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVGcmFnbWVudEFuZEFkZFJlc291cmNlcyk6CisgICAgICAgIChX ZWJDb3JlOjpXZWJDb250ZW50UmVhZGVyOjpyZWFkV2ViQXJjaGl2ZSk6CisgICAgICAgICogcGFn ZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVj YXRlZEdsb2JhbFNldHRpbmdzOjpkZWZhdWx0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKTog RGVsZXRlZC4KKyAgICAgICAgKiBwYWdlL0RlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oOgorICAg ICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzZXRDdXN0b21QYXN0ZWJv YXJkRGF0YUVuYWJsZWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6RGVwcmVjYXRlZEds b2JhbFNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQpOiBEZWxldGVkLgorICAg ICAgICAqIHBhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oOgorICAgICAgICAoV2ViQ29yZTo6 UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2V0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKToK KyAgICAgICAgKFdlYkNvcmU6OlJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OmN1c3RvbVBhc3RlYm9h cmREYXRhRW5hYmxlZCBjb25zdCk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbFNldHRpbmdz LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OkJhY2t1cDo6QmFja3Vw KToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OkJhY2t1cDo6cmVzdG9yZVRv KToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNldEN1c3RvbVBhc3RlYm9h cmREYXRhRW5hYmxlZCk6CisKIDIwMTgtMDEtMTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmVsZWFzZSBhc3NlcnRpb24gaW4gY2FuRXhlY3V0ZVNjcmlwdCB3 aGVuIGV4ZWN1dGluZyBzY3JpcHRzIGR1cmluZyBwYWdlIGNhY2hlIHJlc3RvcmUKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXIuY3BwCShyZXZpc2lvbiAyMjcyODApCisrKyBTb3VyY2Uv V2ViQ29yZS9kb20vRGF0YVRyYW5zZmVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNyArMzAs NiBAQAogI2luY2x1ZGUgIkNhY2hlZEltYWdlQ2xpZW50LmgiCiAjaW5jbHVkZSAiRGF0YVRyYW5z ZmVySXRlbS5oIgogI2luY2x1ZGUgIkRhdGFUcmFuc2Zlckl0ZW1MaXN0LmgiCi0jaW5jbHVkZSAi RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRGcmFnbWVudC5o IgogI2luY2x1ZGUgIkRyYWdEYXRhLmgiCiAjaW5jbHVkZSAiRWRpdG9yLmgiCkBAIC00MSw2ICs0 MCw3IEBACiAjaW5jbHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgogI2luY2x1ZGUgIkltYWdlLmgi CiAjaW5jbHVkZSAiUGFzdGVib2FyZC5oIgorI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVy ZXMuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5oIgogI2luY2x1ZGUgIlN0YXRpY1Bhc3RlYm9hcmQu aCIKICNpbmNsdWRlICJVUkxQYXJzZXIuaCIKQEAgLTE1Nyw3ICsxNTcsNyBAQCBTdHJpbmcgRGF0 YVRyYW5zZmVyOjpnZXREYXRhRm9ySXRlbShEb2N1CiAgICAgICAgIHJldHVybiB7IH07CiAgICAg fQogCi0gICAgaWYgKCFEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmRE YXRhRW5hYmxlZCgpKQorICAgIGlmICghUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVh dHVyZXMoKS5jdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSkKICAgICAgICAgcmV0dXJuIG1f cGFzdGVib2FyZC0+cmVhZFN0cmluZyhsb3dlcmNhc2VUeXBlKTsKIAogICAgIC8vIFN0YXRpY1Bh c3RlYm9hcmQgaXMgb25seSB1c2VkIHRvIHN0YWdlIGRhdGEgd3JpdHRlbiBieSB3ZWJzaXRlcyBi ZWZvcmUgYmVpbmcgY29tbWl0dGVkIHRvIHRoZSBzeXN0ZW0gcGFzdGVib2FyZC4KQEAgLTE4OCw3 ICsxODgsNyBAQCBTdHJpbmcgRGF0YVRyYW5zZmVyOjpnZXREYXRhKERvY3VtZW50JiBkCiAKIGJv b2wgRGF0YVRyYW5zZmVyOjpzaG91bGRTdXBwcmVzc0dldEFuZFNldERhdGFUb0F2b2lkRXhwb3Np bmdGaWxlUGF0aHMoKSBjb25zdAogewotICAgIGlmICghZm9yRmlsZURyYWcoKSAmJiAhRGVwcmVj YXRlZEdsb2JhbFNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSkKKyAgICBp ZiAoIWZvckZpbGVEcmFnKCkgJiYgIVJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1 cmVzKCkuY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpCiAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICByZXR1cm4gbV9wYXN0ZWJvYXJkLT5jb250YWluc0ZpbGVzKCk7CiB9CkBAIC0yMTIs NyArMjEyLDcgQEAgdm9pZCBEYXRhVHJhbnNmZXI6OnNldERhdGFGcm9tSXRlbUxpc3QoYwogICAg IEFTU0VSVChjYW5Xcml0ZURhdGEoKSk7CiAgICAgUkVMRUFTRV9BU1NFUlQoaXM8U3RhdGljUGFz dGVib2FyZD4oKm1fcGFzdGVib2FyZCkpOwogCi0gICAgaWYgKCFEZXByZWNhdGVkR2xvYmFsU2V0 dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpKSB7CisgICAgaWYgKCFSdW50aW1l RW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmN1c3RvbVBhc3RlYm9hcmREYXRhRW5h YmxlZCgpKSB7CiAgICAgICAgIG1fcGFzdGVib2FyZC0+d3JpdGVTdHJpbmcodHlwZSwgZGF0YSk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0yNzQsNyArMjc0LDcgQEAgVmVjdG9yPFN0cmlu Zz4gRGF0YVRyYW5zZmVyOjp0eXBlcyhBZGRGaQogICAgIGlmICghY2FuUmVhZFR5cGVzKCkpCiAg ICAgICAgIHJldHVybiB7IH07CiAgICAgCi0gICAgaWYgKCFEZXByZWNhdGVkR2xvYmFsU2V0dGlu Z3M6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpKSB7CisgICAgaWYgKCFSdW50aW1lRW5h YmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxl ZCgpKSB7CiAgICAgICAgIGF1dG8gdHlwZXMgPSBtX3Bhc3RlYm9hcmQtPnR5cGVzRm9yTGVnYWN5 VW5zYWZlQmluZGluZ3MoKTsKICAgICAgICAgQVNTRVJUKCF0eXBlcy5jb250YWlucygiRmlsZXMi KSk7CiAgICAgICAgIGlmIChtX3Bhc3RlYm9hcmQtPmNvbnRhaW5zRmlsZXMoKSAmJiBhZGRGaWxl c1R5cGUgPT0gQWRkRmlsZXNUeXBlOjpZZXMpCkBAIC0zODIsNyArMzgyLDcgQEAgdm9pZCBEYXRh VHJhbnNmZXI6OmNvbW1pdFRvUGFzdGVib2FyZChQYQogewogICAgIEFTU0VSVChpczxTdGF0aWNQ YXN0ZWJvYXJkPigqbV9wYXN0ZWJvYXJkKSAmJiAhaXM8U3RhdGljUGFzdGVib2FyZD4obmF0aXZl UGFzdGVib2FyZCkpOwogICAgIFBhc3RlYm9hcmRDdXN0b21EYXRhIGN1c3RvbURhdGEgPSBkb3du Y2FzdDxTdGF0aWNQYXN0ZWJvYXJkPigqbV9wYXN0ZWJvYXJkKS50YWtlQ3VzdG9tRGF0YSgpOwot ICAgIGlmIChEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5h YmxlZCgpKSB7CisgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVz KCkuY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsKICAgICAgICAgY3VzdG9tRGF0YS5v cmlnaW4gPSBtX29yaWdpbklkZW50aWZpZXI7CiAgICAgICAgIG5hdGl2ZVBhc3RlYm9hcmQud3Jp dGVDdXN0b21EYXRhKGN1c3RvbURhdGEpOwogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9kb20vRGF0YVRyYW5zZmVySXRlbUxpc3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXJJdGVtTGlzdC5jcHAJKHJldmlzaW9uIDIyNzI4MCkK KysrIFNvdXJjZS9XZWJDb3JlL2RvbS9EYXRhVHJhbnNmZXJJdGVtTGlzdC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI3LDkgKzI3LDkgQEAKICNpbmNsdWRlICJEYXRhVHJhbnNmZXJJdGVtTGlzdC5o IgogCiAjaW5jbHVkZSAiRGF0YVRyYW5zZmVySXRlbS5oIgotI2luY2x1ZGUgIkRlcHJlY2F0ZWRH bG9iYWxTZXR0aW5ncy5oIgogI2luY2x1ZGUgIkZpbGVMaXN0LmgiCiAjaW5jbHVkZSAiUGFzdGVi b2FyZC5oIgorI2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJT ZXR0aW5ncy5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01Niw3ICs1Niw3IEBAIFJlZlB0 cjxEYXRhVHJhbnNmZXJJdGVtPiBEYXRhVHJhbnNmZXJJdGUKIAogc3RhdGljIGJvb2wgc2hvdWxk RXhwb3NlVHlwZUluSXRlbUxpc3QoY29uc3QgU3RyaW5nJiB0eXBlKQogewotICAgIHJldHVybiBE ZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpIHx8 IFBhc3RlYm9hcmQ6OmlzU2FmZVR5cGVGb3JET01Ub1JlYWRBbmRXcml0ZSh0eXBlKTsKKyAgICBy ZXR1cm4gUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5jdXN0b21QYXN0 ZWJvYXJkRGF0YUVuYWJsZWQoKSB8fCBQYXN0ZWJvYXJkOjppc1NhZmVUeXBlRm9yRE9NVG9SZWFk QW5kV3JpdGUodHlwZSk7CiB9CiAKIEV4Y2VwdGlvbk9yPFJlZlB0cjxEYXRhVHJhbnNmZXJJdGVt Pj4gRGF0YVRyYW5zZmVySXRlbUxpc3Q6OmFkZChjb25zdCBTdHJpbmcmIGRhdGEsIGNvbnN0IFN0 cmluZyYgdHlwZSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAJKHJldmlzaW9uIDIy NzI4MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzgsNyArMzgsNiBAQAogI2luY2x1ZGUgIkNyZWF0ZUxpbmtDb21tYW5kLmgiCiAjaW5j bHVkZSAiRGF0YVRyYW5zZmVyLmgiCiAjaW5jbHVkZSAiRGVsZXRlU2VsZWN0aW9uQ29tbWFuZC5o IgotI2luY2x1ZGUgIkRlcHJlY2F0ZWRHbG9iYWxTZXR0aW5ncy5oIgogI2luY2x1ZGUgIkRpY3Rh dGlvbkFsdGVybmF0aXZlLmgiCiAjaW5jbHVkZSAiRGljdGF0aW9uQ29tbWFuZC5oIgogI2luY2x1 ZGUgIkRvY3VtZW50RnJhZ21lbnQuaCIKQEAgLTgzLDYgKzgyLDcgQEAKICNpbmNsdWRlICJSZW5k ZXJlZFBvc2l0aW9uLmgiCiAjaW5jbHVkZSAiUmVwbGFjZVJhbmdlV2l0aFRleHRDb21tYW5kLmgi CiAjaW5jbHVkZSAiUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuaCIKKyNpbmNsdWRlICJSdW50aW1l RW5hYmxlZEZlYXR1cmVzLmgiCiAjaW5jbHVkZSAiU2V0dGluZ3MuaCIKICNpbmNsdWRlICJTaGFk b3dSb290LmgiCiAjaW5jbHVkZSAiU2ltcGxpZnlNYXJrdXBDb21tYW5kLmgiCkBAIC0zNjAsNyAr MzYwLDcgQEAgc3RhdGljIFJlZjxEYXRhVHJhbnNmZXI+IGNyZWF0ZURhdGFUcmFucwogICAgIGNh c2UgQ2xpcGJvYXJkRXZlbnRLaW5kOjpDdXQ6CiAgICAgICAgIHJldHVybiBEYXRhVHJhbnNmZXI6 OmNyZWF0ZUZvckNvcHlBbmRQYXN0ZShkb2N1bWVudCwgRGF0YVRyYW5zZmVyOjpTdG9yZU1vZGU6 OlJlYWRXcml0ZSwgc3RkOjptYWtlX3VuaXF1ZTxTdGF0aWNQYXN0ZWJvYXJkPigpKTsKICAgICBj YXNlIENsaXBib2FyZEV2ZW50S2luZDo6UGFzdGVBc1BsYWluVGV4dDoKLSAgICAgICAgaWYgKERl cHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Y3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsK KyAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuY3Vz dG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsKICAgICAgICAgICAgIGF1dG8gcGxhaW5UZXh0 VHlwZSA9IEFTQ0lJTGl0ZXJhbCgidGV4dC9wbGFpbiIpOwogICAgICAgICAgICAgYXV0byBwbGFp blRleHQgPSBQYXN0ZWJvYXJkOjpjcmVhdGVGb3JDb3B5QW5kUGFzdGUoKS0+cmVhZFN0cmluZyhw bGFpblRleHRUeXBlKTsKICAgICAgICAgICAgIGF1dG8gcGFzdGVib2FyZCA9IHN0ZDo6bWFrZV91 bmlxdWU8U3RhdGljUGFzdGVib2FyZD4oKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcv Y29jb2EvV2ViQ29udGVudFJlYWRlckNvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL2VkaXRpbmcvY29jb2EvV2ViQ29udGVudFJlYWRlckNvY29hLm1tCShyZXZpc2lvbiAyMjcy ODApCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2NvY29hL1dlYkNvbnRlbnRSZWFkZXJDb2Nv YS5tbQkod29ya2luZyBjb3B5KQpAQCAtMzEsNyArMzEsNiBAQAogI2ltcG9ydCAiQmxvYlVSTC5o IgogI2ltcG9ydCAiQ2FjaGVkUmVzb3VyY2VMb2FkZXIuaCIKICNpbXBvcnQgIkRPTVVSTC5oIgot I2ltcG9ydCAiRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmgiCiAjaW1wb3J0ICJEb2N1bWVudC5o IgogI2ltcG9ydCAiRG9jdW1lbnRGcmFnbWVudC5oIgogI2ltcG9ydCAiRG9jdW1lbnRMb2FkZXIu aCIKQEAgLTMyNiw3ICszMjUsNyBAQCBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3JlYXRlRnJh Z21lbnRBCiAgICAgaWYgKCFmcmFnbWVudEFuZFJlc291cmNlcy5mcmFnbWVudCkKICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAKLSAgICBpZiAoIURlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Y3Vz dG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsKKyAgICBpZiAoIVJ1bnRpbWVFbmFibGVkRmVh dHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkuY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpIHsK ICAgICAgICAgaWYgKERvY3VtZW50TG9hZGVyKiBsb2FkZXIgPSBmcmFtZS5sb2FkZXIoKS5kb2N1 bWVudExvYWRlcigpKSB7CiAgICAgICAgICAgICBmb3IgKGF1dG8mIHJlc291cmNlIDogZnJhZ21l bnRBbmRSZXNvdXJjZXMucmVzb3VyY2VzKQogICAgICAgICAgICAgICAgIGxvYWRlci0+YWRkQXJj aGl2ZVJlc291cmNlKHJlc291cmNlLmNvcHlSZWYoKSk7CkBAIC00NTcsNyArNDU2LDcgQEAgYm9v bCBXZWJDb250ZW50UmVhZGVyOjpyZWFkV2ViQXJjaGl2ZShTaAogICAgIGlmICghcmVzdWx0KQog ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgaWYgKCFEZXByZWNhdGVkR2xvYmFsU2V0 dGluZ3M6OmN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpKSB7CisgICAgaWYgKCFSdW50aW1l RW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLmN1c3RvbVBhc3RlYm9hcmREYXRhRW5h YmxlZCgpKSB7CiAgICAgICAgIGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3VwKCpm cmFtZS5kb2N1bWVudCgpLCByZXN1bHQtPm1hcmt1cCwgcmVzdWx0LT5tYWluUmVzb3VyY2UtPnVy bCgpLCBEaXNhbGxvd1NjcmlwdGluZ0FuZFBsdWdpbkNvbnRlbnQpOwogICAgICAgICBpZiAoRG9j dW1lbnRMb2FkZXIqIGxvYWRlciA9IGZyYW1lLmxvYWRlcigpLmRvY3VtZW50TG9hZGVyKCkpCiAg ICAgICAgICAgICBsb2FkZXItPmFkZEFsbEFyY2hpdmVSZXNvdXJjZXMocmVzdWx0LT5hcmNoaXZl LmdldCgpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2JhbFNldHRp bmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL0RlcHJlY2F0ZWRHbG9i YWxTZXR0aW5ncy5jcHAJKHJldmlzaW9uIDIyNzI4MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2Uv RGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzksMTAgKzM5 LDYgQEAKICNlbmRpZgogI2VuZGlmCiAKLSNpZiBQTEFURk9STShDT0NPQSkKLSNpbmNsdWRlIDx3 dGYvc3BpL2Rhcndpbi9keWxkU1BJLmg+Ci0jZW5kaWYKLQogbmFtZXNwYWNlIFdlYkNvcmUgewog CiAjaWYgVVNFKEFWRk9VTkRBVElPTikKQEAgLTgyLDIyICs3OCw2IEBAIGJvb2wgRGVwcmVjYXRl ZEdsb2JhbFNldHRpbmdzOjpnQVZLaXRFbmEKIGJvb2wgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdz OjpnU2hvdWxkT3B0T3V0T2ZOZXR3b3JrU3RhdGVPYnNlcnZhdGlvbiA9IGZhbHNlOwogI2VuZGlm CiBib29sIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6Z01hbmFnZUF1ZGlvU2Vzc2lvbiA9IGZh bHNlOwotYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmdDdXN0b21QYXN0ZWJvYXJkRGF0 YUVuYWJsZWQgPSBmYWxzZTsKLQotYm9vbCBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmRlZmF1 bHRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKQotewotICAgIGlmICghaXNJbldlYlByb2Nl c3MoKSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotI2lmIFBMQVRGT1JNKElPUykgJiYgX19JUEhP TkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA+PSAxMTAzMDAKLSAgICByZXR1cm4gSU9TQXBwbGlj YXRpb246OmlzTW9iaWxlU2FmYXJpKCkgfHwgZHlsZF9nZXRfcHJvZ3JhbV9zZGtfdmVyc2lvbigp ID49IERZTERfSU9TX1ZFUlNJT05fMTFfMzsKLSNlbGlmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNf T1NfWF9WRVJTSU9OX01BWF9BTExPV0VEID49IDEwMTMwMAotICAgIHJldHVybiBNYWNBcHBsaWNh dGlvbjo6aXNTYWZhcmkoKSB8fCBkeWxkX2dldF9wcm9ncmFtX3Nka192ZXJzaW9uKCkgPiBEWUxE X01BQ09TWF9WRVJTSU9OXzEwXzEzOwotI2VsaWYgUExBVEZPUk0oTUFDKQotICAgIHJldHVybiBN YWNBcHBsaWNhdGlvbjo6aXNTYWZhcmkoKTsKLSNlbHNlCi0gICAgcmV0dXJuIGZhbHNlOwotI2Vu ZGlmCi19CiAKICNpZiBQTEFURk9STShXSU4pCiB2b2lkIERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5n czo6c2V0U2hvdWxkVXNlSGlnaFJlc29sdXRpb25UaW1lcnMoYm9vbCBzaG91bGRVc2VIaWdoUmVz b2x1dGlvblRpbWVycykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRGVwcmVjYXRlZEdsb2Jh bFNldHRpbmdzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9EZXByZWNhdGVk R2xvYmFsU2V0dGluZ3MuaAkocmV2aXNpb24gMjI3MjgwKQorKysgU291cmNlL1dlYkNvcmUvcGFn ZS9EZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MuaAkod29ya2luZyBjb3B5KQpAQCAtMTA4LDEwICsx MDgsNiBAQCBwdWJsaWM6CiAgICAgc3RhdGljIHZvaWQgc2V0U2hvdWxkTWFuYWdlQXVkaW9TZXNz aW9uQ2F0ZWdvcnkoYm9vbCBmbGFnKSB7IGdNYW5hZ2VBdWRpb1Nlc3Npb24gPSBmbGFnOyB9CiAg ICAgc3RhdGljIGJvb2wgc2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkoKSB7IHJldHVy biBnTWFuYWdlQXVkaW9TZXNzaW9uOyB9CiAjZW5kaWYKLQotICAgIHN0YXRpYyB2b2lkIHNldEN1 c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChib29sIGVuYWJsZWQpIHsgZ0N1c3RvbVBhc3RlYm9h cmREYXRhRW5hYmxlZCA9IGVuYWJsZWQ7IH0KLSAgICBzdGF0aWMgYm9vbCBjdXN0b21QYXN0ZWJv YXJkRGF0YUVuYWJsZWQoKSB7IHJldHVybiBnQ3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkOyB9 Ci0gICAgV0VCQ09SRV9FWFBPUlQgc3RhdGljIGJvb2wgZGVmYXVsdEN1c3RvbVBhc3RlYm9hcmRE YXRhRW5hYmxlZCgpOwogICAgIAogI2lmIEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgc3RhdGlj IGJvb2wgbW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZCgpOwpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGFnZS9SdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgJKHJldmlzaW9uIDIyNzI4MCkKKysrIFNv dXJjZS9XZWJDb3JlL3BhZ2UvUnVudGltZUVuYWJsZWRGZWF0dXJlcy5oCSh3b3JraW5nIGNvcHkp CkBAIC04Miw2ICs4Miw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldERhdGFUcmFuc2Zlckl0ZW1z RW5hYmxlZChib29sIGFyZUVuYWJsZWQpIHsgbV9hcmVEYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQg PSBhcmVFbmFibGVkOyB9CiAgICAgYm9vbCBkYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQoKSBjb25z dCB7IHJldHVybiBtX2FyZURhdGFUcmFuc2Zlckl0ZW1zRW5hYmxlZDsgfQogCisgICAgdm9pZCBz ZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoYm9vbCBpc0VuYWJsZWQpIHsgbV9pc0N1c3Rv bVBhc3RlYm9hcmREYXRhRW5hYmxlZCA9IGlzRW5hYmxlZDsgfQorICAgIGJvb2wgY3VzdG9tUGFz dGVib2FyZERhdGFFbmFibGVkKCkgY29uc3QgeyByZXR1cm4gbV9pc0N1c3RvbVBhc3RlYm9hcmRE YXRhRW5hYmxlZDsgfQorCiAjaWYgRU5BQkxFKEFUVEFDSE1FTlRfRUxFTUVOVCkKICAgICB2b2lk IHNldEF0dGFjaG1lbnRFbGVtZW50RW5hYmxlZChib29sIGFyZUVuYWJsZWQpIHsgbV9pc0F0dGFj aG1lbnRFbGVtZW50RW5hYmxlZCA9IGFyZUVuYWJsZWQ7IH0KICAgICBib29sIGF0dGFjaG1lbnRF bGVtZW50RW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNBdHRhY2htZW50RWxlbWVudEVuYWJs ZWQ7IH0KQEAgLTI2Miw2ICsyNjUsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc01lbnVJdGVt RWxlbWVudEVuYWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9pc0RpcmVjdG9yeVVwbG9hZEVu YWJsZWQgeyBmYWxzZSB9OwogICAgIGJvb2wgbV9hcmVEYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWQg eyBmYWxzZSB9OworICAgIGJvb2wgbV9pc0N1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCB7IGZh bHNlIH07CiAgICAgYm9vbCBtX2lucHV0RXZlbnRzRW5hYmxlZCB7IHRydWUgfTsKIAogI2lmIEVO QUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0lu dGVybmFsU2V0dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Rlc3Rpbmcv SW50ZXJuYWxTZXR0aW5ncy5jcHAJKHJldmlzaW9uIDIyNzI4MCkKKysrIFNvdXJjZS9XZWJDb3Jl L3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSw3ICsx MTksNyBAQCBJbnRlcm5hbFNldHRpbmdzOjpCYWNrdXA6OkJhY2t1cChTZXR0aW5nCiAjaWYgVVNF KEFVRElPX1NFU1NJT04pCiAgICAgLCBtX3Nob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5 KERlcHJlY2F0ZWRHbG9iYWxTZXR0aW5nczo6c2hvdWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdv cnkoKSkKICNlbmRpZgotICAgICwgbV9jdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoRGVwcmVj YXRlZEdsb2JhbFNldHRpbmdzOjpjdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoKSkKKyAgICAs IG1fY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNo YXJlZEZlYXR1cmVzKCkuY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkpCiB7CiB9CiAKQEAg LTIxNiwxMSArMjE2LDExIEBAIHZvaWQgSW50ZXJuYWxTZXR0aW5nczo6QmFja3VwOjpyZXN0b3Jl VG8KICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6 OnNoYXJlZEZlYXR1cmVzKCkuc2V0U2NyZWVuQ2FwdHVyZUVuYWJsZWQobV9zZXRTY3JlZW5DYXB0 dXJlRW5hYmxlZCk7CiAjZW5kaWYKKyAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRG ZWF0dXJlcygpLnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChtX2N1c3RvbVBhc3RlYm9h cmREYXRhRW5hYmxlZCk7CiAKICNpZiBVU0UoQVVESU9fU0VTU0lPTikKICAgICBEZXByZWNhdGVk R2xvYmFsU2V0dGluZ3M6OnNldFNob3VsZE1hbmFnZUF1ZGlvU2Vzc2lvbkNhdGVnb3J5KG1fc2hv dWxkTWFuYWdlQXVkaW9TZXNzaW9uQ2F0ZWdvcnkpOwogI2VuZGlmCi0gICAgRGVwcmVjYXRlZEds b2JhbFNldHRpbmdzOjpzZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQobV9jdXN0b21QYXN0 ZWJvYXJkRGF0YUVuYWJsZWQpOwogfQogCiBjbGFzcyBJbnRlcm5hbFNldHRpbmdzV3JhcHBlciA6 IHB1YmxpYyBTdXBwbGVtZW50PFBhZ2U+IHsKQEAgLTg3OSw3ICs4NzksNyBAQCBFeGNlcHRpb25P cjx2b2lkPiBJbnRlcm5hbFNldHRpbmdzOjpzZXRTCiAKIEV4Y2VwdGlvbk9yPHZvaWQ+IEludGVy bmFsU2V0dGluZ3M6OnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChib29sIGVuYWJsZWQp CiB7Ci0gICAgRGVwcmVjYXRlZEdsb2JhbFNldHRpbmdzOjpzZXRDdXN0b21QYXN0ZWJvYXJkRGF0 YUVuYWJsZWQoZW5hYmxlZCk7CisgICAgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVh dHVyZXMoKS5zZXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQoZW5hYmxlZCk7CiAgICAgcmV0 dXJuIHsgfTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNzI4MSkKKysrIFNvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTgtMDEt MjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHVybmluZyBv ZmYgY3VzdG9tIHBhc3RlYm9hcmQgZGF0YSBkb2Vzbid0IGFjdHVhbGx5IHR1cm4gaXQgb2ZmIGlu IFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgx OTIwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjY4NjQyOT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlZCB0aGUgY29kZSB0byBkZWNpZGUg d2hlbiB0byBlbmFibGUgY3VzdG9tIHBhc3RlYm9hcmQgZGF0YSBmcm9tIFdlYkNvcmUKKyAgICAg ICAgc2luY2Ugd2UgbmV2ZXIgZW5hYmxlIHRoaXMgZmVhdHVyZSBpbiBXZWJLaXQxLgorCisgICAg ICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWw6CisgICAgICAgICogU2hhcmVkL1dlYlBy ZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHA6CisgICAgICAgIChkZWZhdWx0Q3VzdG9tUGFzdGVi b2FyZERhdGFFbmFibGVkKTogQWRkZWQuCisgICAgICAgICogU2hhcmVkL1dlYlByZWZlcmVuY2Vz RGVmYXVsdFZhbHVlcy5oOgorCiAyMDE4LTAxLTIxICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNp ZWhAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhIG5ldyBmZWF0dXJlIGZsYWcgZm9yIEVYVFJB X1pPT01fTU9ERSBhbmQgcmVpbnRyb2R1Y2UgQWRkaXRpb25hbEZlYXR1cmVEZWZpbmVzLmgKSW5k ZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzLnlhbWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAkocmV2aXNpb24gMjI3 MjgwKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXMueWFtbAkod29ya2lu ZyBjb3B5KQpAQCAtNzc5LDEwICs3NzksMTAgQEAgRGF0YVRyYW5zZmVySXRlbXNFbmFibGVkOgog CiBDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWQ6CiAgIHR5cGU6IGJvb2wKLSAgZGVmYXVsdFZh bHVlOiBXZWJDb3JlOjpEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3M6OmRlZmF1bHRDdXN0b21QYXN0 ZWJvYXJkRGF0YUVuYWJsZWQoKQorICBkZWZhdWx0VmFsdWU6IGRlZmF1bHRDdXN0b21QYXN0ZWJv YXJkRGF0YUVuYWJsZWQoKQogICBodW1hblJlYWRhYmxlTmFtZTogIkN1c3RvbSBwYXRlYm9hcmQg ZGF0YSIKICAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIGN1c3RvbSBjbGlwYm9h cmQgdHlwZXMgYW5kIGJldHRlciBzZWN1cml0eSBtb2RlbCBmb3IgY2xpcGJvYXJkIEFQSS4iCi0g IHdlYmNvcmVCaW5kaW5nOiBEZXByZWNhdGVkR2xvYmFsU2V0dGluZ3MKKyAgd2ViY29yZUJpbmRp bmc6IFJ1bnRpbWVFbmFibGVkRmVhdHVyZXMKIAogV2ViVlJFbmFibGVkOgogICB0eXBlOiBib29s CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYlByZWZlcmVuY2VzRGVm YXVsdFZhbHVlcy5jcHAJKHJldmlzaW9uIDIyNzI4MCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVk L1dlYlByZWZlcmVuY2VzRGVmYXVsdFZhbHVlcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1LDYg KzI1LDExIEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNl c0RlZmF1bHRWYWx1ZXMuaCIKKyNpbXBvcnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9uQ2hl Y2tzLmg+CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyNpbmNsdWRlIDx3dGYvc3BpL2Rhcndpbi9k eWxkU1BJLmg+CisjZW5kaWYKIAogI2lmIFBMQVRGT1JNKElPUykKICNpbmNsdWRlICJWZXJzaW9u Q2hlY2tzLmgiCkBAIC0zOCwzICs0MywxNyBAQCBib29sIGRlZmF1bHRQYXNzaXZlVG91Y2hMaXN0 ZW5lcnNBc0RlZmF1CiAgICAgcmV0dXJuIHRydWU7CiAjZW5kaWYKIH0KKworYm9vbCBkZWZhdWx0 Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCkKK3sKKyNpZiBQTEFURk9STShJT1MpICYmIF9f SVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTEwMzAwCisgICAgcmV0dXJuIFdlYkNv cmU6OklPU0FwcGxpY2F0aW9uOjppc01vYmlsZVNhZmFyaSgpIHx8IGR5bGRfZ2V0X3Byb2dyYW1f c2RrX3ZlcnNpb24oKSA+PSBEWUxEX0lPU19WRVJTSU9OXzExXzM7CisjZWxpZiBQTEFURk9STShN QUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NQVhfQUxMT1dFRCA+PSAxMDEzMDAKKyAgICByZXR1 cm4gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzU2FmYXJpKCkgfHwgZHlsZF9nZXRfcHJvZ3Jh bV9zZGtfdmVyc2lvbigpID4gRFlMRF9NQUNPU1hfVkVSU0lPTl8xMF8xMzsKKyNlbGlmIFBMQVRG T1JNKE1BQykKKyAgICByZXR1cm4gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzU2FmYXJpKCk7 CisjZWxzZQorICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgorfQorCkluZGV4OiBTb3VyY2UvV2Vi S2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmF1bHRWYWx1ZXMuaAkocmV2aXNp b24gMjI3MjgwKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZhdWx0 VmFsdWVzLmgJKHdvcmtpbmcgY29weSkKQEAgLTE4NiwzICsxODYsNCBAQAogI2VuZGlmCiAKIGJv b2wgZGVmYXVsdFBhc3NpdmVUb3VjaExpc3RlbmVyc0FzRGVmYXVsdE9uRG9jdW1lbnQoKTsKK2Jv b2wgZGVmYXVsdEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZCgpOwpJbmRleDogU291cmNlL1dl YktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMjI3MjgwKQorKysgU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDEt MjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHVybmluZyBv ZmYgY3VzdG9tIHBhc3RlYm9hcmQgZGF0YSBkb2Vzbid0IGFjdHVhbGx5IHR1cm4gaXQgb2ZmIGlu IFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgx OTIwCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjY4NjQyOT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbHdheXMgZGlzYWJsZSBjdXN0b20gcGFz dGVib2FyZCBkYXRhIGluIFdlYktpdDEuIFNlZSByMjI2MTU2IGZvciBkZXRhaWxzLgorCisgICAg ICAgICogV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbToKKyAgICAgICAgKCtbV2ViUHJlZmVyZW5j ZXMgaW5pdGlhbGl6ZV0pOgorICAgICAgICAqIFdlYlZpZXcvV2ViVmlldy5tbToKKyAgICAgICAg KC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0pOgorCiAyMDE4LTAxLTIwICBBbmR5IEVz dGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXBwbGUgUGF5XSBTdG9wIGVhZ2Vy bHkgbG9hZGluZyBQYXNzS2l0LmZyYW1ld29yawpJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlcy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCShyZXZpc2lvbiAyMjcyODApCisr KyBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC02MjIsNyArNjIyLDcgQEAgKyAodm9pZClpbml0aWFsaXplCiAgICAgICAg IFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZRVNdLCBXZWJLaXRTaGFkb3dET01FbmFibGVkUHJl ZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIFdlYktp dEN1c3RvbUVsZW1lbnRzRW5hYmxlZFByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBu dW1iZXJXaXRoQm9vbDpZRVNdLCBXZWJLaXREYXRhVHJhbnNmZXJJdGVtc0VuYWJsZWRQcmVmZXJl bmNlS2V5LAotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6RGVwcmVjYXRlZEdsb2Jh bFNldHRpbmdzOjpkZWZhdWx0Q3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkKCldLCBXZWJLaXRD dXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWRQcmVmZXJlbmNlS2V5LAorICAgICAgICBbTlNOdW1i ZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCBXZWJLaXRDdXN0b21QYXN0ZWJvYXJkRGF0YUVuYWJsZWRQ cmVmZXJlbmNlS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgV2Vi S2l0TW9kZXJuTWVkaWFDb250cm9sc0VuYWJsZWRQcmVmZXJlbmNlS2V5LAogI2lmIEVOQUJMRShX RUJHTDIpCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sIFdlYktpdFdlYkdM MkVuYWJsZWRQcmVmZXJlbmNlS2V5LApJbmRleDogU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2Vi Vmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dl YlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMjI3MjgwKQorKysgU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOTk0LDYgKzI5OTQs NyBAQCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuCiAgICAgUnVudGlt ZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5zZXRTaGFkb3dET01FbmFibGVkKFtw cmVmZXJlbmNlcyBzaGFkb3dET01FbmFibGVkXSk7CiAgICAgUnVudGltZUVuYWJsZWRGZWF0dXJl czo6c2hhcmVkRmVhdHVyZXMoKS5zZXRDdXN0b21FbGVtZW50c0VuYWJsZWQoW3ByZWZlcmVuY2Vz IGN1c3RvbUVsZW1lbnRzRW5hYmxlZF0pOwogICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNo YXJlZEZlYXR1cmVzKCkuc2V0RGF0YVRyYW5zZmVySXRlbXNFbmFibGVkKFtwcmVmZXJlbmNlcyBk YXRhVHJhbnNmZXJJdGVtc0VuYWJsZWRdKTsKKyAgICBSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpz aGFyZWRGZWF0dXJlcygpLnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChbcHJlZmVyZW5j ZXMgY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkXSk7CiAKICNpZiBFTkFCTEUoQVRUQUNITUVO VF9FTEVNRU5UKQogICAgIFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCku c2V0QXR0YWNobWVudEVsZW1lbnRFbmFibGVkKFtwcmVmZXJlbmNlcyBhdHRhY2htZW50RWxlbWVu dEVuYWJsZWRdKTsKQEAgLTMwNzMsOCArMzA3NCw2IEBAIC0gKHZvaWQpX3ByZWZlcmVuY2VzQ2hh bmdlZDooV2ViUHJlZmVyZW4KICAgICBbV0FLVmlldyBfc2V0SW50ZXJwb2xhdGlvblF1YWxpdHk6 W3ByZWZlcmVuY2VzIF9pbnRlcnBvbGF0aW9uUXVhbGl0eV1dOwogI2VuZGlmCiAKLSAgICBEZXBy ZWNhdGVkR2xvYmFsU2V0dGluZ3M6OnNldEN1c3RvbVBhc3RlYm9hcmREYXRhRW5hYmxlZChbcHJl ZmVyZW5jZXMgY3VzdG9tUGFzdGVib2FyZERhdGFFbmFibGVkXSk7Ci0KICNpZiBFTkFCTEUoTEVH QUNZX0VOQ1JZUFRFRF9NRURJQSkKICAgICBzZXR0aW5ncy5zZXRNZWRpYUtleXNTdG9yYWdlRGly ZWN0b3J5KFtwcmVmZXJlbmNlcyBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5XSk7CiAjZW5kaWYK