41457 2010-07-01 05:15:22 -0700 [Qt] Dragging within webkit with a drag created via Javascript ends up misinterpreting the data 2010-07-12 08:18:16 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 andy.shaw webkit-qt-unassigned commit-queue kling oldest_to_newest 245262 0 60222 andy.shaw 2010-07-01 05:15:22 -0700 Created attachment 60222 Example HTML reproducing the problem Dragging within webkit with a drag created via Javascript ends up misinterpreting the data, in the example attached if you drag from the drag area to the drop area then you will see that the data looks like it has been converted incorrectly. 245263 1 60223 andy.shaw 2010-07-01 05:16:05 -0700 Created attachment 60223 Propsoed patch 245325 2 kling 2010-07-01 07:05:39 -0700 Confirmed on ToT + current 4.7. We only treat "text/plain" as UTF-16 text right now. 245343 3 60247 kling 2010-07-01 07:43:09 -0700 Created attachment 60247 Proposed patch (trunk) 247551 4 60247 kling 2010-07-07 07:39:11 -0700 Comment on attachment 60247 Proposed patch (trunk) r- after discussion with Simon. ClipboardQt needs more robustness in both getData() and setData() if we're to support arbitrary mimetypes. New patch coming in a bit. 249842 5 61231 kling 2010-07-12 08:01:02 -0700 Created attachment 61231 Proposed patch v2 249847 6 61231 commit-queue 2010-07-12 08:18:11 -0700 Comment on attachment 61231 Proposed patch v2 Clearing flags on attachment: 61231 Committed r63089: <http://trac.webkit.org/changeset/63089> 249848 7 commit-queue 2010-07-12 08:18:16 -0700 All reviewed patches have been landed. Closing bug. 60222 2010-07-01 05:15:22 -0700 2010-07-01 05:15:22 -0700 Example HTML reproducing the problem bug_dragdrop_json.html text/html 2561 andy.shaw PCFkb2N0eXBlIGh0bWw+DQo8aHRtbD4NCjxoZWFkPg0KICAgIDx0aXRsZT5TcG9vbiBEcmFnIERy b3AgVGVzdDwvdGl0bGU+DQoNCiAgICA8IS0tIE1ldGEgSW5mbyAtLT4NCiAgICA8bWV0YSBodHRw LWVxdWl2PSJDb250ZW50LVR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCIg Lz4NCiAgICA8bWV0YSBuYW1lPSJkZXNjcmlwdGlvbiIgY29udGVudD0iIiAvPg0KICAgIDxtZXRh IG5hbWU9ImtleXdvcmRzIiBjb250ZW50PSIiIC8+DQoNCiAgICA8IS0tIEZhdkljb24gLS0+DQoN CiAgICA8IS0tIEphdmFzY3JpcHRzIC0tPg0KICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0IiBzcmM9Imh0dHA6Ly9hamF4Lmdvb2dsZWFwaXMuY29tL2FqYXgvbGlicy9qcXVlcnkvMS40 L2pxdWVyeS5taW4uanMiPjwvc2NyaXB0Pg0KICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2Ny aXB0Ij4NCiAgICAgIHZhciBjbGVhckRlYnVnID0gZnVuY3Rpb24oKSB7DQogICAgICAgICQoJyNk ZWJ1ZycpLmh0bWwoJycpOw0KICAgICAgfQ0KICAgICAgdmFyIGFkZFRvRGVidWcgPSBmdW5jdGlv bihtc2cpIHsNCiAgICAgICAgJCgnI2RlYnVnJykuYXBwZW5kKCQoJzxwPicgKyBtc2cgKyAnPHA+ JykpDQogICAgICB9DQoNCiAgICAgICQoZnVuY3Rpb24oKSB7DQogICAgICAgICQoJyNkcmFnJylb MF0uYWRkRXZlbnRMaXN0ZW5lcignZHJhZ3N0YXJ0JywgZnVuY3Rpb24oZXZlbnQpIHsNCiAgICAg ICAgICB2YXIganNvbiA9IFt7J2hlbGxvJzond29ybGQnfV07DQogICAgICAgICAgZXZlbnQuZGF0 YVRyYW5zZmVyLnNldERhdGEoImFwcGxpY2F0aW9uL2pzb24iLCBKU09OLnN0cmluZ2lmeShqc29u KSk7DQogICAgICAgIH0sIGZhbHNlKTsNCiAgICAgICAgDQogICAgICAgICQoJyNkcm9wJylbMF0u YWRkRXZlbnRMaXN0ZW5lcignZHJhZ2VudGVyJywgZnVuY3Rpb24oZXZlbnQpIHsNCiAgICAgICAg ICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOw0KICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlv bigpOw0KICAgICAgICB9LCBmYWxzZSk7DQoNCiAgICAgICAgJCgnI2Ryb3AnKVswXS5hZGRFdmVu dExpc3RlbmVyKCdkcmFnb3ZlcicsIGZ1bmN0aW9uKGV2ZW50KSB7DQogICAgICAgICAgZXZlbnQu cHJldmVudERlZmF1bHQoKTsNCiAgICAgICAgICBldmVudC5zdG9wUHJvcGFnYXRpb24oKTsNCiAg ICAgICAgICB9LCBmYWxzZSk7DQoNCiAgICAgICAgJCgnI2Ryb3AnKVswXS5hZGRFdmVudExpc3Rl bmVyKCdkcmFnbGVhdmUnLCBmdW5jdGlvbihldmVudCkgew0KICAgICAgICAgIGV2ZW50LnByZXZl bnREZWZhdWx0KCk7DQogICAgICAgICAgZXZlbnQuc3RvcFByb3BhZ2F0aW9uKCk7DQogICAgICAg ICAgfSwgZmFsc2UpOw0KDQogICAgICAgICQoJyNkcm9wJylbMF0uYWRkRXZlbnRMaXN0ZW5lcign ZHJvcCcsIGZ1bmN0aW9uKGV2ZW50KSB7DQogICAgICAgICAgdmFyIGRhdGEgPSBldmVudC5kYXRh VHJhbnNmZXIuZ2V0RGF0YSgnYXBwbGljYXRpb24vanNvbicpOw0KICAgICAgICAgIGFkZFRvRGVi dWcoIkRyb3AgJ2FwcGxpY2F0aW9uL2pzb24nIik7DQogICAgICAgICAgYWRkVG9EZWJ1ZygiZGF0 YSAtLT4gIiArIGRhdGEpOw0KICAgICAgICAgIGFkZFRvRGVidWcoImRhdGEuc3BsaXQoJycpIC0t PiAiICsgSlNPTi5zdHJpbmdpZnkoZGF0YS5zcGxpdCgnJykpKTsNCiAgICAgICAgICBldmVudC5w cmV2ZW50RGVmYXVsdCgpOw0KICAgICAgICAgIGV2ZW50LnN0b3BQcm9wYWdhdGlvbigpOw0KICAg ICAgICB9LCBmYWxzZSk7DQogICAgICB9KTsNCiAgICA8L3NjcmlwdD4NCg0KICAgIDxzdHlsZT4N CiAgICAgIGJvZHkgeyANCiAgICAgICAgaGVpZ2h0OiAxMDAlOw0KICAgICAgICB3aWR0aDogMTAw JTsNCiAgICAgICAgYmFja2dyb3VuZDogZ3JheTsNCiAgICAgIH0NCiAgICAgIGRpdiNkcm9wIHsN CiAgICAgICAgZGlzcGxheTogYmxvY2s7DQogICAgICAgIG1hcmdpbjogMCBhdXRvOw0KICAgICAg ICBoZWlnaHQ6IDIwMHB4Ow0KICAgICAgICBwYWRkaW5nOiAxMHB4Ow0KICAgICAgICBib3JkZXI6 IG9yYW5nZSA1cHggZG90dGVkOw0KICAgICAgICBib3JkZXItcmFkaXVzOiAxMHB4Ow0KICAgICAg fQ0KICAgICAgZGl2I2RyYWcgew0KICAgICAgICBkaXNwbGF5OiBibG9jazsNCiAgICAgICAgbWFy Z2luOiAxMHB4IDAgMCAwOw0KICAgICAgICBoZWlnaHQ6IDUwcHg7DQogICAgICAgIHdpZHRoOiAy MDBweDsNCiAgICAgICAgcGFkZGluZzogMTBweDsNCiAgICAgICAgYm9yZGVyOiBvcmFuZ2UgNXB4 IGRvdHRlZDsNCiAgICAgICAgYm9yZGVyLXJhZGl1czogMTBweDsNCiAgICAgIH0NCiAgICA8L3N0 eWxlPg0KPC9oZWFkPg0KPGJvZHk+DQogIDxkaXYgaWQ9ImRyb3AiPkRyb3BwYWJsZSBBcmVhPC9k aXY+DQoNCiAgPGRpdiBkcmFnZ2FibGU9InRydWUiIGlkPSJkcmFnIj5EcmFnZ2FibGUgd2l0aCAn YXBwbGljYXRvaW4vanNvbicgZGF0YTogPGNvZGU+W3snaGVsbG8nOid3b3JsZCd9XTwvY29kZT48 L2Rpdj4NCg0KICA8ZGl2IGlkPSJkZWJ1ZyI+PC9kaXY+DQoNCjwvYm9keT4NCjwvaHRtbD4= 60223 2010-07-01 05:16:05 -0700 2010-07-01 05:18:06 -0700 Propsoed patch patch.diff text/plain 1288 andy.shaw LS0tIGEvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0 LmNwcA0KKysrIGIvc3JjLzNyZHBhcnR5L3dlYmtpdC9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBi b2FyZFF0LmNwcA0KQEAgLTEzMSw5ICsxMzEsMTAgQEAgU3RyaW5nIENsaXBib2FyZFF0OjpnZXRE YXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYgc3VjY2VzcykgY29uc3QNCiAgICAgfQ0KDQog ICAgIEFTU0VSVChtX3JlYWRhYmxlRGF0YSk7DQotICAgIFFCeXRlQXJyYXkgZGF0YSA9IG1fcmVh ZGFibGVEYXRhLT5kYXRhKFFTdHJpbmcodHlwZSkpOw0KKyAgICBRVGV4dENvZGVjICpjb2RlYyA9 IFFUZXh0Q29kZWM6OmNvZGVjRm9yVXRmVGV4dChtX3JlYWRhYmxlRGF0YS0+ZGF0YShRU3RyaW5n KHR5cGUpKSwgUVRleHRDb2RlYzo6Y29kZWNGb3JOYW1lKCJVVEYtOCIpKTsNCisgICAgUVN0cmlu ZyBkYXRhID0gY29kZWMtPnRvVW5pY29kZShtX3JlYWRhYmxlRGF0YS0+ZGF0YShRU3RyaW5nKHR5 cGUpKSk7DQogICAgIHN1Y2Nlc3MgPSAhZGF0YS5pc0VtcHR5KCk7DQotICAgIHJldHVybiBTdHJp bmcoZGF0YS5kYXRhKCksIGRhdGEuc2l6ZSgpKTsNCisgICAgcmV0dXJuIFN0cmluZyhkYXRhKTsN CiB9DQoNCiBib29sIENsaXBib2FyZFF0OjpzZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29u c3QgU3RyaW5nJiBkYXRhKQ0KQEAgLTE0Myw5ICsxNDQsOCBAQCBib29sIENsaXBib2FyZFF0Ojpz ZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQ0KDQogICAgIGlm ICghbV93cml0YWJsZURhdGEpDQogICAgICAgICBtX3dyaXRhYmxlRGF0YSA9IG5ldyBRTWltZURh dGE7DQotICAgIFFCeXRlQXJyYXkgYXJyYXkocmVpbnRlcnByZXRfY2FzdDxjb25zdCBjaGFyKj4o ZGF0YS5jaGFyYWN0ZXJzKCkpLA0KLSAgICAgICAgICAgICAgICAgICAgIGRhdGEubGVuZ3RoKCkq Mik7DQotICAgIG1fd3JpdGFibGVEYXRhLT5zZXREYXRhKFFTdHJpbmcodHlwZSksIGFycmF5KTsN CisgICAgUVRleHRDb2RlYyAqY29kZWMgPSBRVGV4dENvZGVjOjpjb2RlY0Zvck5hbWUoIlVURi0x NiIpOw0KKyAgICBtX3dyaXRhYmxlRGF0YS0+c2V0RGF0YShRU3RyaW5nKHR5cGUpLCBjb2RlYy0+ ZnJvbVVuaWNvZGUoUVN0cmluZyhkYXRhKSkpOw0KICNpZm5kZWYgUVRfTk9fQ0xJUEJPQVJEDQog ICAgIGlmICghaXNGb3JEcmFnZ2luZygpKQ0KICAgICAgICAgUUFwcGxpY2F0aW9uOjpjbGlwYm9h cmQoKS0+c2V0TWltZURhdGEobV93cml0YWJsZURhdGEpOw== 60247 2010-07-01 07:43:09 -0700 2010-07-12 08:01:02 -0700 Proposed patch (trunk) bug-41457.diff text/plain 1380 kling ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MWFhNTE2Zi4uYjAwOGY4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wNy0wMSAgQW5kcmVhcyBLbGlu ZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRHJhZ2dpbmcgd2l0aGluIHdlYmtpdCB3aXRoIGEg ZHJhZyBjcmVhdGVkIHZpYSBKYXZhc2NyaXB0IGVuZHMgdXAgbWlzaW50ZXJwcmV0aW5nIHRoZSBk YXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTQ1 NworCisgICAgICAgIFRyZWF0IG5vbi1zcGVjaWFsLWNhc2VkIG1pbWUtdHlwZXMgYXMgVW5pY29k ZSBzdHJpbmdzIGluIENsaXBib2FyZFF0J3MgZ2V0RGF0YSgpCisgICAgICAgIEZpeGVzIGNvcnJ1 cHRpb24gd2hlbiByZXRyaWV2aW5nIGRhdGEgdGhhdCB3YXMgc2V0IHdpdGggYW55dGhpbmcgb3Ro ZXIgdGhhbiB0ZXh0L3BsYWluCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRRdDo6Z2V0RGF0YSk6CisKIDIwMTAtMDct MDEgIEFudHRpIEtvaXZpc3RvICA8a29pdmlzdG9AaWtpLmZpPgogCiAgICAgICAgIFJldmVydCBh Y2NpZGVudGFsIGNvbW1pdC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJv YXJkUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAKaW5kZXggZjQ3 OGU2NC4uYjVmYWNiZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRR dC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9DbGlwYm9hcmRRdC5jcHAKQEAgLTE0Myw3 ICsxNDMsNyBAQCBTdHJpbmcgQ2xpcGJvYXJkUXQ6OmdldERhdGEoY29uc3QgU3RyaW5nJiB0eXBl LCBib29sJiBzdWNjZXNzKSBjb25zdAogICAgIEFTU0VSVChtX3JlYWRhYmxlRGF0YSk7CiAgICAg UUJ5dGVBcnJheSBkYXRhID0gbV9yZWFkYWJsZURhdGEtPmRhdGEoUVN0cmluZyh0eXBlKSk7CiAg ICAgc3VjY2VzcyA9ICFkYXRhLmlzRW1wdHkoKTsKLSAgICByZXR1cm4gU3RyaW5nKGRhdGEuY29u c3REYXRhKCksIGRhdGEuc2l6ZSgpKTsKKyAgICByZXR1cm4gU3RyaW5nKHJlaW50ZXJwcmV0X2Nh c3Q8Y29uc3QgVUNoYXIqPihkYXRhLmNvbnN0RGF0YSgpKSwgZGF0YS5zaXplKCkgLyAyKTsKIH0K IAogYm9vbCBDbGlwYm9hcmRRdDo6c2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGNvbnN0IFN0 cmluZyYgZGF0YSkK 61231 2010-07-12 08:01:02 -0700 2010-07-12 08:18:11 -0700 Proposed patch v2 bug-41457-v2.diff text/plain 5978 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiMjZmMzlmLi41YTQ2MWJjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDct MTIgIEFuZHJlYXMgS2xpbmcgIDxhbmRyZWFzLmtsaW5nQG5va2lhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIERyYWdnaW5nIHdpdGhp biB3ZWJraXQgd2l0aCBhIGRyYWcgY3JlYXRlZCB2aWEgSmF2YXNjcmlwdCBlbmRzIHVwIG1pc2lu dGVycHJldGluZyB0aGUgZGF0YQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDE0NTcKKworICAgICAgICBSZWJhc2VsaW5lIHRlc3Qgbm93IHRoYXQgUXQg ZG9lc24ndCBjb3JydXB0IG5vbi1icmVha2luZyBzcGFjZXMgb24gY2xpcGJvYXJkIHJvdW5kdHJp cC4KKworICAgICAgICAqIHBsYXRmb3JtL3F0L2VkaXRpbmcvcGFzdGVib2FyZC9vbnBhc3RlLXRl eHQtaHRtbC1leHBlY3RlZC50eHQ6CisKIDIwMTAtMDctMTIgIEZyYW7Dp29pcyBTYXVzc2V0ICA8 c2F1c3NldEBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBD aHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9lZGl0aW5n L3Bhc3RlYm9hcmQvb25wYXN0ZS10ZXh0LWh0bWwtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQvZWRpdGluZy9wYXN0ZWJvYXJkL29ucGFzdGUtdGV4dC1odG1sLWV4cGVjdGVk LnR4dAppbmRleCA3ZDE3MTNkLi4xY2Q3NzQ2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9lZGl0aW5nL3Bhc3RlYm9hcmQvb25wYXN0ZS10ZXh0LWh0bWwtZXhwZWN0ZWQudHh0 CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2VkaXRpbmcvcGFzdGVib2FyZC9vbnBhc3Rl LXRleHQtaHRtbC1leHBlY3RlZC50eHQKQEAgLTEsNSArMSw1IEBACiBDT05TT0xFIE1FU1NBR0U6 IGxpbmUgMjE6IHRleHQvcGxhaW46IFRoaXMgdGVzdCB2ZXJpZmllcyB0aGF0IHdlIGNhbiBnZXQg dGV4dC9odG1sIGZyb20gdGhlIGNsaXBib2FyZCBkdXJpbmcgYW4gb25wYXN0ZSBldmVudC4gCi1D T05TT0xFIE1FU1NBR0U6IGxpbmUgMjM6IHRleHQvaHRtbDogPGh0bWw+PGhlYWQ+PG1ldGEgaHR0 cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgi IC8+PC9oZWFkPjxib2R5PjxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFuIiBzdHlsZT0iYm9y ZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsgIGZvbnQtc3R5bGU6 IG5vcm1hbDsgZm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBub3JtYWw7IGxldHRl ci1zcGFjaW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhhbnM6IDI7IHRleHQt YWxpZ246IGF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3JtOiBub25lOyB3aGl0 ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4OyAtd2Via2l0LWJv cmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXItdmVydGljYWwtc3Bh Y2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0OiBub25lOyAtd2Vi a2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJva2Utd2lkdGg6IDBw eDsgZm9udC1zaXplOiBtZWRpdW07ICI+VGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQgd2UgY2FuIGdl dCB0ZXh0L2h0bWwgZnJvbSB0aGUgY2xpcGJvYXJkIGR1cmluZyBhbiBvbnBhc3RlIGV2ZW50Ljxz cGFuIGNsYXNzPSJBcHBsZS1jb252ZXJ0ZWQtc3BhY2UiPsOCwqA8L3NwYW4+PC9zcGFuPjwvYm9k eT48L2h0bWw+CitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMjM6IHRleHQvaHRtbDogPGh0bWw+PGhl YWQ+PG1ldGEgaHR0cC1lcXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNo YXJzZXQ9dXRmLTgiIC8+PC9oZWFkPjxib2R5PjxzcGFuIGNsYXNzPSJBcHBsZS1zdHlsZS1zcGFu IiBzdHlsZT0iYm9yZGVyLWNvbGxhcHNlOiBzZXBhcmF0ZTsgY29sb3I6IHJnYigwLCAwLCAwKTsg IGZvbnQtc3R5bGU6IG5vcm1hbDsgZm9udC12YXJpYW50OiBub3JtYWw7IGZvbnQtd2VpZ2h0OiBu b3JtYWw7IGxldHRlci1zcGFjaW5nOiBub3JtYWw7IGxpbmUtaGVpZ2h0OiBub3JtYWw7IG9ycGhh bnM6IDI7IHRleHQtYWxpZ246IGF1dG87IHRleHQtaW5kZW50OiAwcHg7IHRleHQtdHJhbnNmb3Jt OiBub25lOyB3aGl0ZS1zcGFjZTogbm9ybWFsOyB3aWRvd3M6IDI7IHdvcmQtc3BhY2luZzogMHB4 OyAtd2Via2l0LWJvcmRlci1ob3Jpem9udGFsLXNwYWNpbmc6IDBweDsgLXdlYmtpdC1ib3JkZXIt dmVydGljYWwtc3BhY2luZzogMHB4OyAtd2Via2l0LXRleHQtZGVjb3JhdGlvbnMtaW4tZWZmZWN0 OiBub25lOyAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6IGF1dG87IC13ZWJraXQtdGV4dC1zdHJv a2Utd2lkdGg6IDBweDsgZm9udC1zaXplOiBtZWRpdW07ICI+VGhpcyB0ZXN0IHZlcmlmaWVzIHRo YXQgd2UgY2FuIGdldCB0ZXh0L2h0bWwgZnJvbSB0aGUgY2xpcGJvYXJkIGR1cmluZyBhbiBvbnBh c3RlIGV2ZW50LjxzcGFuIGNsYXNzPSJBcHBsZS1jb252ZXJ0ZWQtc3BhY2UiPsKgPC9zcGFuPjwv c3Bhbj48L2JvZHk+PC9odG1sPgogVGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQgd2UgY2FuIGdldCB0 ZXh0L2h0bWwgZnJvbSB0aGUgY2xpcGJvYXJkIGR1cmluZyBhbiBvbnBhc3RlIGV2ZW50LiBUaGlz IHRlc3QgcmVxdWlyZXMgRFJULgogUGFzdGUgY29udGVudCBpbiB0aGlzIGRpdi5UaGlzIHRlc3Qg dmVyaWZpZXMgdGhhdCB3ZSBjYW4gZ2V0IHRleHQvaHRtbCBmcm9tIHRoZSBjbGlwYm9hcmQgZHVy aW5nIGFuIG9ucGFzdGUgZXZlbnQuwqAKIFBBU1MKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdl TG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDU1M2FiYS4uZTcwNGZhNSAxMDA2NDQKLS0t IGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MCBAQAorMjAxMC0wNy0xMiAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0g RHJhZ2dpbmcgd2l0aGluIHdlYmtpdCB3aXRoIGEgZHJhZyBjcmVhdGVkIHZpYSBKYXZhc2NyaXB0 IGVuZHMgdXAgbWlzaW50ZXJwcmV0aW5nIHRoZSBkYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MTQ1NworCisgICAgICAgIFRyZWF0IG5vbi1zcGVj aWFsLWNhc2VkIG1pbWUtdHlwZXMgYXMgVW5pY29kZSBzdHJpbmdzIGluIENsaXBib2FyZFF0J3Mg Z2V0RGF0YSgpCisgICAgICAgIEZpeGVzIGNvcnJ1cHRpb24gd2hlbiByZXRyaWV2aW5nIGRhdGEg dGhhdCB3YXMgc2V0IHdpdGggYW55dGhpbmcgb3RoZXIgdGhhbiB0ZXh0L3BsYWluCisKKyAgICAg ICAgQWxzbyB1c2UgUU1pbWVEYXRhOjpzZXRIdG1sKCkgd2hlbiBhcHBsaWNhYmxlIHRvIGJlIGNv bnNpc3RlbnQgd2l0aCBQYXN0ZWJvYXJkUXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9DbGlw Ym9hcmRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0h0bWxNaW1lVHlwZSk6CisgICAgICAg IChXZWJDb3JlOjpDbGlwYm9hcmRRdDo6Z2V0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlw Ym9hcmRRdDo6c2V0RGF0YSk6CisKIDIwMTAtMDctMTIgIEZyYW7Dp29pcyBTYXVzc2V0ICA8c2F1 c3NldEBnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJp c3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNw cCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCmluZGV4IGY0NzhlNjQuLjdk MjIzNDkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCkBAIC01MCw2ICs1MCw3IEBA CiAjaW5jbHVkZSA8UUxpc3Q+CiAjaW5jbHVkZSA8UU1pbWVEYXRhPgogI2luY2x1ZGUgPFFTdHJp bmdMaXN0PgorI2luY2x1ZGUgPFFUZXh0Q29kZWM+CiAjaW5jbHVkZSA8UVVybD4KICNpbmNsdWRl IDxxZGVidWcuaD4KIApAQCAtNjIsNiArNjMsMTEgQEAgc3RhdGljIGJvb2wgaXNUZXh0TWltZVR5 cGUoY29uc3QgU3RyaW5nJiB0eXBlKQogICAgIHJldHVybiB0eXBlID09ICJ0ZXh0L3BsYWluIiB8 fCB0eXBlLnN0YXJ0c1dpdGgoInRleHQvcGxhaW47Iik7CiB9CiAKK3N0YXRpYyBib29sIGlzSHRt bE1pbWVUeXBlKGNvbnN0IFN0cmluZyYgdHlwZSkKK3sKKyAgICByZXR1cm4gdHlwZSA9PSAidGV4 dC9odG1sIiB8fCB0eXBlLnN0YXJ0c1dpdGgoInRleHQvaHRtbDsiKTsKK30KKwogQ2xpcGJvYXJk UXQ6OkNsaXBib2FyZFF0KENsaXBib2FyZEFjY2Vzc1BvbGljeSBwb2xpY3ksIGNvbnN0IFFNaW1l RGF0YSogcmVhZGFibGVDbGlwYm9hcmQpCiAgICAgOiBDbGlwYm9hcmQocG9saWN5LCB0cnVlKQog ICAgICwgbV9yZWFkYWJsZURhdGEocmVhZGFibGVDbGlwYm9hcmQpCkBAIC0xMzUsMTUgKzE0MSwy MSBAQCBTdHJpbmcgQ2xpcGJvYXJkUXQ6OmdldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBib29s JiBzdWNjZXNzKSBjb25zdAogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAgICAgfQogCisgICAg aWYgKGlzSHRtbE1pbWVUeXBlKHR5cGUpICYmIG1fcmVhZGFibGVEYXRhLT5oYXNIdG1sKCkpIHsK KyAgICAgICAgc3VjY2VzcyA9IHRydWU7CisgICAgICAgIHJldHVybiBtX3JlYWRhYmxlRGF0YS0+ aHRtbCgpOworICAgIH0KKwogICAgIGlmIChpc1RleHRNaW1lVHlwZSh0eXBlKSAmJiBtX3JlYWRh YmxlRGF0YS0+aGFzVGV4dCgpKSB7CiAgICAgICAgIHN1Y2Nlc3MgPSB0cnVlOwogICAgICAgICBy ZXR1cm4gbV9yZWFkYWJsZURhdGEtPnRleHQoKTsKICAgICB9CiAKICAgICBBU1NFUlQobV9yZWFk YWJsZURhdGEpOwotICAgIFFCeXRlQXJyYXkgZGF0YSA9IG1fcmVhZGFibGVEYXRhLT5kYXRhKFFT dHJpbmcodHlwZSkpOworICAgIFFCeXRlQXJyYXkgcmF3RGF0YSA9IG1fcmVhZGFibGVEYXRhLT5k YXRhKHR5cGUpOworICAgIFFTdHJpbmcgZGF0YSA9IFFUZXh0Q29kZWM6OmNvZGVjRm9yTmFtZSgi VVRGLTE2IiktPnRvVW5pY29kZShyYXdEYXRhKTsKICAgICBzdWNjZXNzID0gIWRhdGEuaXNFbXB0 eSgpOwotICAgIHJldHVybiBTdHJpbmcoZGF0YS5jb25zdERhdGEoKSwgZGF0YS5zaXplKCkpOwor ICAgIHJldHVybiBkYXRhOwogfQogCiBib29sIENsaXBib2FyZFF0OjpzZXREYXRhKGNvbnN0IFN0 cmluZyYgdHlwZSwgY29uc3QgU3RyaW5nJiBkYXRhKQpAQCAtMTU2LDYgKzE2OCw4IEBAIGJvb2wg Q2xpcGJvYXJkUXQ6OnNldERhdGEoY29uc3QgU3RyaW5nJiB0eXBlLCBjb25zdCBTdHJpbmcmIGRh dGEpCiAKICAgICBpZiAoaXNUZXh0TWltZVR5cGUodHlwZSkpCiAgICAgICAgIG1fd3JpdGFibGVE YXRhLT5zZXRUZXh0KFFTdHJpbmcoZGF0YSkpOworICAgIGVsc2UgaWYgKGlzSHRtbE1pbWVUeXBl KHR5cGUpKQorICAgICAgICBtX3dyaXRhYmxlRGF0YS0+c2V0SHRtbChRU3RyaW5nKGRhdGEpKTsK ICAgICBlbHNlIHsKICAgICAgICAgUUJ5dGVBcnJheSBhcnJheShyZWludGVycHJldF9jYXN0PGNv bnN0IGNoYXIqPihkYXRhLmNoYXJhY3RlcnMoKSksIGRhdGEubGVuZ3RoKCkgKiAyKTsKICAgICAg ICAgbV93cml0YWJsZURhdGEtPnNldERhdGEoUVN0cmluZyh0eXBlKSwgYXJyYXkpOwo=