93804 2012-08-13 01:40:20 -0700 [GTK] Implementation of atk_editable_text_insert_text ignores 'length' parameter 2012-08-13 02:43:20 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 mario mario cgarcia oldest_to_newest 693451 0 mario 2012-08-13 01:40:20 -0700 I just realized that the implementation of atk_editable_text_insert_text() in WebKitAccessibleInterfaceEditableText.cpp is wrong, as it's ignoring the 'length' parameter, causing the full string passed is always inserted in the text field. 693454 1 157941 mario 2012-08-13 01:46:31 -0700 Created attachment 157941 Patch proposal Attaching a simple patch to fix this issue 693464 2 157941 cgarcia 2012-08-13 02:08:15 -0700 Comment on attachment 157941 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=157941&action=review > Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp:78 > + if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string).substring(0, length), false, 0)) I'm not sure this is always correct, according to the ATK api docs, length is the size in bytes, so maybe we should get the substring before converting the string from utf8 to utf16. You could do something like: if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(CString(string, length)).data(), false, 0)) 693469 3 157944 mario 2012-08-13 02:16:19 -0700 Created attachment 157944 Patch proposal I think Carlos had a point here. Attaching a new patch (tested) 693472 4 157944 mrobinson 2012-08-13 02:20:07 -0700 Comment on attachment 157944 Patch proposal View in context: https://bugs.webkit.org/attachment.cgi?id=157944&action=review > Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp:78 > - if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0)) > + if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(CString(string, length).data()), false, 0)) Now might also be a good time to return early if the string is null, as the comment above suggests. It's always a good idea to be distrustful of data from outside the library. 693477 5 cgarcia 2012-08-13 02:25:36 -0700 (In reply to comment #4) > (From update of attachment 157944 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=157944&action=review > > > Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp:78 > > - if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0)) > > + if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(CString(string, length).data()), false, 0)) > > Now might also be a good time to return early if the string is null, as the comment above suggests. It's always a good idea to be distrustful of data from outside the library. I agree it would be good to fix the FIXME, but probably as a separate bug, since it's a different issue. 693488 6 mario 2012-08-13 02:37:32 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 157944 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=157944&action=review > > > > > Source/WebCore/accessibility/gtk/WebKitAccessibleInterfaceEditableText.cpp:78 > > > - if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(string), false, 0)) > > > + if (document->frame()->editor()->insertTextWithoutSendingTextEvent(String::fromUTF8(CString(string, length).data()), false, 0)) > > > > Now might also be a good time to return early if the string is null, as the comment above suggests. It's always a good idea to be distrustful of data from outside the library. > > I agree it would be good to fix the FIXME, but probably as a separate bug, since it's a different issue. As it's just an early return, I'd go for it now, not in a separate bug. I'll do it when landing 693490 7 mario 2012-08-13 02:43:20 -0700 Committed r125403: <http://trac.webkit.org/changeset/125403> 157941 2012-08-13 01:46:31 -0700 2012-08-13 02:16:00 -0700 Patch proposal bug-93804-20120813104555.patch text/plain 3972 mario U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MzkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWQzMDMyYTk1ZDhiZjNi Y2RhMTcwYTA0MDJiNmIwMGIyZTZkOGRhNy4uZTJmZGQ2N2JiNWZjYjBhY2MxMzUyNjk1NWJlYzY2 MzQyZDY4NzE1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTEzICBNYXJp byBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBJ bXBsZW1lbnRhdGlvbiBvZiBhdGtfZWRpdGFibGVfdGV4dF9pbnNlcnRfdGV4dCBpZ25vcmVzICds ZW5ndGgnIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM4MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVc2UgdGhlICdsZW5ndGgnIHBhcmFtZXRlciB0byBpbnNlcnQgYSBzdWJzdHJpbmcg b2YgdGhlIGZ1bGwKKyAgICAgICAgc3RyaW5nIHBhc3NlZCB0byB0aGlzIG1ldGhvZCBmcm9tIEF0 a0VkaXRhYmxlVGV4dCBpbnRlcmZhY2UuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9X ZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlRWRpdGFibGVUZXh0LmNwcDoKKyAgICAgICAgKHdlYmtp dEFjY2Vzc2libGVFZGl0YWJsZVRleHRJbnNlcnRUZXh0KTogRG9uJ3QgaWdub3JlICdsZW5ndGgn LgorCiAyMDEyLTA4LTEwICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBTdXBwb3J0IGNyZWF0aW5nIEZpbGUgb2JqZWN0IGZyb20gRmlsZVN5c3RlbSBVUkwg Zm9yIGZpbGVzIGluIEZpbGVTeXN0ZW0gQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggMjY4YTlkZjlk YWY2MWRkYTdjNzQ2ZDQ4YmU5OGU3ZjYyNzE5YWU0ZC4uMmVhMWQ5MjZkM2U5NzBkMzQzY2Q3YmEy YmQyMTgzNDJmZjgzNGVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEy LTA4LTEzICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAg ICAgICBbR1RLXSBJbXBsZW1lbnRhdGlvbiBvZiBhdGtfZWRpdGFibGVfdGV4dF9pbnNlcnRfdGV4 dCBpZ25vcmVzICdsZW5ndGgnIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM4MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgdW5pdCB0ZXN0cyB0byBhbHNvIGNoZWNrIGluc2Vy dGluZyBhIHBhcnRpYWwgc3RyaW5nLgorCisgICAgICAgICogdGVzdHMvdGVzdGF0ay5jOgorICAg ICAgICAodGVzdFdlYmtpdEF0a1RleHRDaGFuZ2VkTm90aWZpY2F0aW9ucyk6IFVwZGF0ZSB0ZXN0 LgorCiAyMDEyLTA4LTEwICBBbGljZSBDaGVuZyAgPGFsaWNlX2NoZW5nQGFwcGxlLmNvbT4KIAog ICAgICAgICBQYXJ0IDEgb2Y6IEV4dGVuZCAtd2Via2l0LXVzZXItc2VsZWN0IHdpdGggYSBuZXcg dmFsdWUgImFsbCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3Rr L1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VFZGl0YWJsZVRleHQuY3BwIGIvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUVkaXRhYmxlVGV4 dC5jcHAKaW5kZXggNjc3MzQ0MGY0Mzg0ZDg2ZmI5ZWJkZjJiNTk2MjQ4N2ExNmM0MjYxMy4uNDFi NjQwM2RjNzU1ZTY5MDk5MTMyMjE3ODBjYmI2NDUyYzM4YzI4NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0QWNjZXNzaWJsZUludGVyZmFjZUVkaXRh YmxlVGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvV2ViS2l0 QWNjZXNzaWJsZUludGVyZmFjZUVkaXRhYmxlVGV4dC5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgc3Rh dGljIHZvaWQgd2Via2l0QWNjZXNzaWJsZUVkaXRhYmxlVGV4dEluc2VydFRleHQoQXRrRWRpdGFi bGVUZXh0KiB0ZXh0LCBjb25zdAogICAgIGNvcmVPYmplY3QtPnNldFNlbGVjdGVkVmlzaWJsZVBv c2l0aW9uUmFuZ2UoY29yZU9iamVjdC0+dmlzaWJsZVBvc2l0aW9uUmFuZ2VGb3JSYW5nZShQbGFp blRleHRSYW5nZSgqcG9zaXRpb24sIDApKSk7CiAgICAgY29yZU9iamVjdC0+c2V0Rm9jdXNlZCh0 cnVlKTsKICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIHNldCBwb3NpdGlvbiB0byB0aGUgYWN0dWFs IGluc2VydGVkIHRleHQgbGVuZ3RoLCB3aGljaCBtYXkgYmUgbGVzcyB0aGFuIHRoYXQgcmVxdWVz dGVkLgotICAgIGlmIChkb2N1bWVudC0+ZnJhbWUoKS0+ZWRpdG9yKCktPmluc2VydFRleHRXaXRo b3V0U2VuZGluZ1RleHRFdmVudChTdHJpbmc6OmZyb21VVEY4KHN0cmluZyksIGZhbHNlLCAwKSkK KyAgICBpZiAoZG9jdW1lbnQtPmZyYW1lKCktPmVkaXRvcigpLT5pbnNlcnRUZXh0V2l0aG91dFNl bmRpbmdUZXh0RXZlbnQoU3RyaW5nOjpmcm9tVVRGOChzdHJpbmcpLnN1YnN0cmluZygwLCBsZW5n dGgpLCBmYWxzZSwgMCkpCiAgICAgICAgICpwb3NpdGlvbiArPSBsZW5ndGg7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYyBiL1NvdXJjZS9XZWJLaXQv Z3RrL3Rlc3RzL3Rlc3RhdGsuYwppbmRleCBjYzUxYmU4MDQwMzc4OTkxNGNmZjBmZjBkMjY1NDEz ZDg2NWM4NjVkLi41MDMxMDkxYTQxMGJkM2NiNWZjM2NlZDkxOGM3NTFmNzdmYmE1NzBiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKKysrIGIvU291cmNlL1dl YktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCkBAIC0xNzYxLDcgKzE3NjEsNyBAQCBzdGF0aWMgdm9p ZCB0ZXN0V2Via2l0QXRrVGV4dENoYW5nZWROb3RpZmljYXRpb25zKCkKICAgICBnX2ZyZWUodGV4 dCk7CiAKICAgICBwb3MgPSA0OwotICAgIGF0a19lZGl0YWJsZV90ZXh0X2luc2VydF90ZXh0KEFU S19FRElUQUJMRV9URVhUKHRleHRFbnRyeSksICJxdXggcXV1eCIsIDgsICZwb3MpOworICAgIGF0 a19lZGl0YWJsZV90ZXh0X2luc2VydF90ZXh0KEFUS19FRElUQUJMRV9URVhUKHRleHRFbnRyeSks ICJxdXggcXV1eCB0b2JlaWdub3JlZCIsIDgsICZwb3MpOwogICAgIHRleHQgPSBhdGtfdGV4dF9n ZXRfdGV4dChBVEtfVEVYVCh0ZXh0RW50cnkpLCAwLCAtMSk7CiAgICAgZ19hc3NlcnRfY21wc3Ry KHRleHQsID09LCAiZm9vIHF1eCBxdXV4IGJheiIpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0 Q2hhbmdlZFJlc3VsdCwgPT0sICJ8MXw0fDh8J3F1eCBxdXV4J3wiKTsKQEAgLTE3OTQsNyArMTc5 NCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RXZWJraXRBdGtUZXh0Q2hhbmdlZE5vdGlmaWNhdGlvbnMo KQogICAgIGdfZnJlZSh0ZXh0KTsKIAogICAgIHBvcyA9IDM7Ci0gICAgYXRrX2VkaXRhYmxlX3Rl eHRfaW5zZXJ0X3RleHQoQVRLX0VESVRBQkxFX1RFWFQocGFzc3dvcmRFbnRyeSksICJxdXgiLCAz LCAmcG9zKTsKKyAgICBhdGtfZWRpdGFibGVfdGV4dF9pbnNlcnRfdGV4dChBVEtfRURJVEFCTEVf VEVYVChwYXNzd29yZEVudHJ5KSwgInF1eCB0b2JlaWdub3JlZCIsIDMsICZwb3MpOwogICAgIGdf YXNzZXJ0X2NtcHN0cih0ZXh0Q2hhbmdlZFJlc3VsdCwgPT0sICJ8MXwzfDN8J1wzNDJcMjAwXDI0 MlwzNDJcMjAwXDI0MlwzNDJcMjAwXDI0Mid8Iik7CiAKICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0 X3RleHQoQVRLX1RFWFQocGFzc3dvcmRFbnRyeSksIDAsIC0xKTsK 157944 2012-08-13 02:16:19 -0700 2012-08-13 02:20:07 -0700 Patch proposal bug-93804-20120813111543.patch text/plain 3967 mario U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1Mzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGVkMWM4ODkzZWQ2MDU0 OTk0ZTg5MjUyNmEyZDRmZTk5MzIxOGEzMC4uNjAwZTYyZjg1YWQ1NDAyMGU4NTg2ODMyYWNmYWFi ZjFmOTgyYjdiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA4LTEzICBNYXJp byBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBJ bXBsZW1lbnRhdGlvbiBvZiBhdGtfZWRpdGFibGVfdGV4dF9pbnNlcnRfdGV4dCBpZ25vcmVzICds ZW5ndGgnIHBhcmFtZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM4MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVc2UgdGhlICdsZW5ndGgnIHBhcmFtZXRlciB0byBpbnNlcnQgYSBzdWJzdHJpbmcg b2YgdGhlIGZ1bGwKKyAgICAgICAgc3RyaW5nIHBhc3NlZCB0byB0aGlzIG1ldGhvZCBmcm9tIEF0 a0VkaXRhYmxlVGV4dCBpbnRlcmZhY2UuCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9X ZWJLaXRBY2Nlc3NpYmxlSW50ZXJmYWNlRWRpdGFibGVUZXh0LmNwcDoKKyAgICAgICAgKHdlYmtp dEFjY2Vzc2libGVFZGl0YWJsZVRleHRJbnNlcnRUZXh0KTogRG9uJ3QgaWdub3JlICdsZW5ndGgn LgorCiAyMDEyLTA4LTEzICBTaGlueWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4K IAogICAgICAgICBDYW5ub3Qgc2VsZWN0IHRoZSBBdXRob3JTaGFkb3dET00gaW5uZXIgZWxlbWVu dCBvZiBhbiBpbWcgZWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IDI2OGE5ZGY5ZGFmNjFkZGE3 Yzc0NmQ0OGJlOThlN2Y2MjcxOWFlNGQuLjJlYTFkOTI2ZDNlOTcwZDM0M2NkN2JhMmJkMjE4MzQy ZmY4MzRlZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wOC0xMyAg TWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dU S10gSW1wbGVtZW50YXRpb24gb2YgYXRrX2VkaXRhYmxlX3RleHRfaW5zZXJ0X3RleHQgaWdub3Jl cyAnbGVuZ3RoJyBwYXJhbWV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkzODA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVXBkYXRlIHVuaXQgdGVzdHMgdG8gYWxzbyBjaGVjayBpbnNlcnRpbmcgYSBw YXJ0aWFsIHN0cmluZy4KKworICAgICAgICAqIHRlc3RzL3Rlc3RhdGsuYzoKKyAgICAgICAgKHRl c3RXZWJraXRBdGtUZXh0Q2hhbmdlZE5vdGlmaWNhdGlvbnMpOiBVcGRhdGUgdGVzdC4KKwogMjAx Mi0wOC0xMCAgQWxpY2UgQ2hlbmcgIDxhbGljZV9jaGVuZ0BhcHBsZS5jb20+CiAKICAgICAgICAg UGFydCAxIG9mOiBFeHRlbmQgLXdlYmtpdC11c2VyLXNlbGVjdCB3aXRoIGEgbmV3IHZhbHVlICJh bGwiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9XZWJLaXRB Y2Nlc3NpYmxlSW50ZXJmYWNlRWRpdGFibGVUZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VFZGl0YWJsZVRleHQuY3BwCmlu ZGV4IDY3NzM0NDBmNDM4NGQ4NmZiOWViZGYyYjU5NjI0ODdhMTZjNDI2MTMuLjkxOGNmMjZhYzMw M2NlNWJjODM5OWFhMjZlZmEyZDk4OTJhMDkxYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2libGVJbnRlcmZhY2VFZGl0YWJsZVRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL1dlYktpdEFjY2Vzc2li bGVJbnRlcmZhY2VFZGl0YWJsZVRleHQuY3BwCkBAIC03NSw3ICs3NSw3IEBAIHN0YXRpYyB2b2lk IHdlYmtpdEFjY2Vzc2libGVFZGl0YWJsZVRleHRJbnNlcnRUZXh0KEF0a0VkaXRhYmxlVGV4dCog dGV4dCwgY29uc3QKICAgICBjb3JlT2JqZWN0LT5zZXRTZWxlY3RlZFZpc2libGVQb3NpdGlvblJh bmdlKGNvcmVPYmplY3QtPnZpc2libGVQb3NpdGlvblJhbmdlRm9yUmFuZ2UoUGxhaW5UZXh0UmFu Z2UoKnBvc2l0aW9uLCAwKSkpOwogICAgIGNvcmVPYmplY3QtPnNldEZvY3VzZWQodHJ1ZSk7CiAg ICAgLy8gRklYTUU6IFdlIHNob3VsZCBzZXQgcG9zaXRpb24gdG8gdGhlIGFjdHVhbCBpbnNlcnRl ZCB0ZXh0IGxlbmd0aCwgd2hpY2ggbWF5IGJlIGxlc3MgdGhhbiB0aGF0IHJlcXVlc3RlZC4KLSAg ICBpZiAoZG9jdW1lbnQtPmZyYW1lKCktPmVkaXRvcigpLT5pbnNlcnRUZXh0V2l0aG91dFNlbmRp bmdUZXh0RXZlbnQoU3RyaW5nOjpmcm9tVVRGOChzdHJpbmcpLCBmYWxzZSwgMCkpCisgICAgaWYg KGRvY3VtZW50LT5mcmFtZSgpLT5lZGl0b3IoKS0+aW5zZXJ0VGV4dFdpdGhvdXRTZW5kaW5nVGV4 dEV2ZW50KFN0cmluZzo6ZnJvbVVURjgoQ1N0cmluZyhzdHJpbmcsIGxlbmd0aCkuZGF0YSgpKSwg ZmFsc2UsIDApKQogICAgICAgICAqcG9zaXRpb24gKz0gbGVuZ3RoOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgYi9Tb3VyY2UvV2ViS2l0L2d0ay90 ZXN0cy90ZXN0YXRrLmMKaW5kZXggY2M1MWJlODA0MDM3ODk5MTRjZmYwZmYwZDI2NTQxM2Q4NjVj ODY1ZC4uNTAzMTA5MWE0MTBiZDNjYjVmYzNjZWQ5MThjNzUxZjc3ZmJhNTcwYiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCisrKyBiL1NvdXJjZS9XZWJLaXQv Z3RrL3Rlc3RzL3Rlc3RhdGsuYwpAQCAtMTc2MSw3ICsxNzYxLDcgQEAgc3RhdGljIHZvaWQgdGVz dFdlYmtpdEF0a1RleHRDaGFuZ2VkTm90aWZpY2F0aW9ucygpCiAgICAgZ19mcmVlKHRleHQpOwog CiAgICAgcG9zID0gNDsKLSAgICBhdGtfZWRpdGFibGVfdGV4dF9pbnNlcnRfdGV4dChBVEtfRURJ VEFCTEVfVEVYVCh0ZXh0RW50cnkpLCAicXV4IHF1dXgiLCA4LCAmcG9zKTsKKyAgICBhdGtfZWRp dGFibGVfdGV4dF9pbnNlcnRfdGV4dChBVEtfRURJVEFCTEVfVEVYVCh0ZXh0RW50cnkpLCAicXV4 IHF1dXggdG9iZWlnbm9yZWQiLCA4LCAmcG9zKTsKICAgICB0ZXh0ID0gYXRrX3RleHRfZ2V0X3Rl eHQoQVRLX1RFWFQodGV4dEVudHJ5KSwgMCwgLTEpOwogICAgIGdfYXNzZXJ0X2NtcHN0cih0ZXh0 LCA9PSwgImZvbyBxdXggcXV1eCBiYXoiKTsKICAgICBnX2Fzc2VydF9jbXBzdHIodGV4dENoYW5n ZWRSZXN1bHQsID09LCAifDF8NHw4fCdxdXggcXV1eCd8Iik7CkBAIC0xNzk0LDcgKzE3OTQsNyBA QCBzdGF0aWMgdm9pZCB0ZXN0V2Via2l0QXRrVGV4dENoYW5nZWROb3RpZmljYXRpb25zKCkKICAg ICBnX2ZyZWUodGV4dCk7CiAKICAgICBwb3MgPSAzOwotICAgIGF0a19lZGl0YWJsZV90ZXh0X2lu c2VydF90ZXh0KEFUS19FRElUQUJMRV9URVhUKHBhc3N3b3JkRW50cnkpLCAicXV4IiwgMywgJnBv cyk7CisgICAgYXRrX2VkaXRhYmxlX3RleHRfaW5zZXJ0X3RleHQoQVRLX0VESVRBQkxFX1RFWFQo cGFzc3dvcmRFbnRyeSksICJxdXggdG9iZWlnbm9yZWQiLCAzLCAmcG9zKTsKICAgICBnX2Fzc2Vy dF9jbXBzdHIodGV4dENoYW5nZWRSZXN1bHQsID09LCAifDF8M3wzfCdcMzQyXDIwMFwyNDJcMzQy XDIwMFwyNDJcMzQyXDIwMFwyNDInfCIpOwogCiAgICAgdGV4dCA9IGF0a190ZXh0X2dldF90ZXh0 KEFUS19URVhUKHBhc3N3b3JkRW50cnkpLCAwLCAtMSk7Cg==