53453 2011-01-31 14:41:09 -0800 [Gtk] atk_text_get_selection/atk_text_set_selection fails for list items 2011-02-18 02:38:27 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 25531 1 mario webkit-unassigned abarth apinheiro eric jdiggs webkit.review.bot oldest_to_newest 342823 0 mario 2011-01-31 14:41:09 -0800 Due to the same reason behind bug 53388 and bug 53436, the actual behaviour with atk_text_get_selection and atk_text_set_selection when applied to list items is not the expected one, hence needs fixing. Steps to reproduce: 1. Open the test case attached to bug 53388 (attachment 80582 [details]) in Epiphany. 2. Select all the text right after the 'First' word (' item'), in the first list item. 3. Using Accerciser, attempt to get and set the selection within that list item, and check that the actual results, by: A. Selecting the corresponding object in Accerciser's tree of accessible objects B1. Typing 'acc.queryText().setSelection(0, 0, 5)' Expected outcome: False (as you shouldn't be able to select inside the item's marker) Actual outcome: True B2. Typing 'acc.queryText().setSelection(0, 3, 8)' Expected outcome: True (+ you'll see the 'First' substring selected) Actual outcome: True (but nothing is selected) C. Manually select the 'First' substring and type 'acc.queryText().getSelection(0)' Expected outcome: (0, 5) Actual outcome: (3, 8) 346843 1 81533 mario 2011-02-07 15:02:35 -0800 Created attachment 81533 Patch proposal + unit test Attaching patch proposal + an unit test updated to check this new stuff 353213 2 81533 mrobinson 2011-02-17 15:42:21 -0800 Comment on attachment 81533 Patch proposal + unit test View in context: https://bugs.webkit.org/attachment.cgi?id=81533&action=review > Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:1117 > + int end = endOffset; Why not just continue to use endOffset? 353482 3 mario 2011-02-18 01:36:57 -0800 (In reply to comment #2) > (From update of attachment 81533 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=81533&action=review > > > Source/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp:1117 > > + int end = endOffset; > > Why not just continue to use endOffset? Because we need to use its value even after having set 'end', which can change its value along the function, thus differing from the original endoffset value. 353483 4 mario 2011-02-18 01:41:16 -0800 Committed r78978: <http://trac.webkit.org/changeset/78978> 353502 5 webkit.review.bot 2011-02-18 02:38:27 -0800 http://trac.webkit.org/changeset/78978 might have broken GTK Linux 32-bit Release The following tests are not passing: fast/events/popup-when-select-change.html fast/forms/listbox-hit-test-zoomed.html fast/forms/listbox-typeahead-greek.html fast/forms/select-type-ahead-non-latin.html fast/spatial-navigation/snav-single-select.html inspector/debugger/debug-inlined-scripts.html inspector/debugger/debugger-no-nested-pause.html inspector/debugger/debugger-step-in.html platform/gtk/accessibility/combo-box-collapsed-selection-changed.html platform/gtk/fast/forms/menulist-typeahead-find.html 81533 2011-02-07 15:02:35 -0800 2011-02-17 15:42:21 -0800 Patch proposal + unit test 0001-2011-02-07-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 12438 mario RnJvbSAxM2FjZWQ1YmY5ZmRlNDljMjZhMGNlYzU3NzliOGExMTAzZDI3M2FjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDcgRmViIDIwMTEgMjM6NTY6NDMgKzAxMDAKU3ViamVjdDogW1BBVENI XSAyMDExLTAyLTA3ICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4K CiAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtHdGtdIGF0a190 ZXh0X2dldF9zZWxlY3Rpb24vYXRrX3RleHRfc2V0X3NlbGVjdGlvbiBmYWlscyBmb3IgbGlzdCBp dGVtcwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzQ1 MwoKICAgICAgICBFbnN1cmUgdGhhdCBhdGtfdGV4dF97Z2V0fHNldH1fc2VsZWN0aW9uKCkgd29y ayB3aXRoIGxpc3QgaXRlbXMuCgogICAgICAgICogYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJBdGsuY3BwOgogICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0 X2dldF90ZXh0KTogUHJvcGVybHkgaGFuZGxlIGxpc3QgaXRlbQogICAgICAgIG1hcmtlcnMgd2hl biByZXR1cm5pbmcgdGhlIHRleHQgZm9yIGFuIG9iamVjdCBmb3IgYSBnaXZlbiBpbnRlcnZhbAog ICAgICAgIHNwZWNpZmllZCB0aHJvdWdoIHRoZSBzdGFydE9mZnNldCBhbmQgZW5kT2Zmc2V0IHBh cmFtZXRlcnMuCiAgICAgICAgKGdldFNlbGVjdGlvbk9mZnNldHNGb3JPYmplY3QpOiBCZWFyIGlu IG1pbmQgbGlzdCBpdGVtIG1hcmtlcnMKICAgICAgICB3aGVuIHJldHVybmluZyB0aGUgb2Zmc2V0 cyBmb3IgYSBzZWxlY3Rpb24gb3ZlciBhIGxpc3QgaXRlbS4KICAgICAgICAod2Via2l0X2FjY2Vz c2libGVfdGV4dF9zZXRfc2VsZWN0aW9uKTogQWRqdXN0IG9mZnNldHMgaWYgbmVlZGVkCiAgICAg ICAgZm9yIGxpc3QgaXRlbXMgd2l0aCBpdGVtIG1hcmtlcnMuIEVuc3VyZSB0aGF0IGl0IHJldHVy bnMgVFJVRSBvbmx5CiAgICAgICAgd2hlbiBldmVyeXRoaW5nIHdlbnQgZmluZSBzZXR0aW5nIHRo ZSB0ZXh0IHNlbGVjdGlvbi4KCjIwMTEtMDItMDcgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2Fu Y2hlekBpZ2FsaWEuY29tPgoKICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAg ICAgICAgW0d0a10gYXRrX3RleHRfZ2V0X3NlbGVjdGlvbi9hdGtfdGV4dF9zZXRfc2VsZWN0aW9u IGZhaWxzIGZvciBsaXN0IGl0ZW1zCiAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUzNDUzCgogICAgICAgIFVwZGF0ZSB1bml0IHRlc3QgdG8gY2hlY2sgdGhl IGZpeCBmb3IgdGhpcyBidWcuCgogICAgICAgICogdGVzdHMvdGVzdGF0ay5jOgogICAgICAgICh0 ZXN0V2Via2l0QXRrVGV4dFNlbGVjdGlvbnMpOiBDaGVjayB0aGF0IGZ1bmN0aW9ucyBmcm9tIEF0 a1RleHQKICAgICAgICBpbnRlcmZhY2UgdG8gc2V0IGFuZCBnZXQgdGV4dCBzZWxlY3Rpb25zIHdv cmsgd2l0aCBsaXN0IGl0ZW1zLgotLS0KIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgICAgICAgICAgIHwgICAxOSArKysrKysrCiAuLi4vZ3RrL0FjY2Vzc2liaWxpdHlP YmplY3RXcmFwcGVyQXRrLmNwcCAgICAgICAgICB8ICAgNTcgKysrKysrKysrKysrKystLS0tLQog U291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDEz ICsrKysrCiBTb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgICAgICAgICAgICAgICAg ICB8ICAgMzggKysrKysrKysrKysrKy0KIDQgZmlsZXMgY2hhbmdlZCwgMTExIGluc2VydGlvbnMo KyksIDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA3NzFjOTc3Li40MTE5ODBkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEtMDItMDcgIE1hcmlvIFNhbmNoZXogUHJhZGEg IDxtc2FuY2hlekBpZ2FsaWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHdGtdIGF0a190ZXh0X2dldF9zZWxlY3Rpb24vYXRrX3RleHRfc2V0 X3NlbGVjdGlvbiBmYWlscyBmb3IgbGlzdCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM0NTMKKworICAgICAgICBFbnN1cmUgdGhhdCBhdGtf dGV4dF97Z2V0fHNldH1fc2VsZWN0aW9uKCkgd29yayB3aXRoIGxpc3QgaXRlbXMuCisKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckF0ay5jcHA6 CisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X2dldF90ZXh0KTogUHJvcGVybHkgaGFu ZGxlIGxpc3QgaXRlbQorICAgICAgICBtYXJrZXJzIHdoZW4gcmV0dXJuaW5nIHRoZSB0ZXh0IGZv ciBhbiBvYmplY3QgZm9yIGEgZ2l2ZW4gaW50ZXJ2YWwKKyAgICAgICAgc3BlY2lmaWVkIHRocm91 Z2ggdGhlIHN0YXJ0T2Zmc2V0IGFuZCBlbmRPZmZzZXQgcGFyYW1ldGVycy4KKyAgICAgICAgKGdl dFNlbGVjdGlvbk9mZnNldHNGb3JPYmplY3QpOiBCZWFyIGluIG1pbmQgbGlzdCBpdGVtIG1hcmtl cnMKKyAgICAgICAgd2hlbiByZXR1cm5pbmcgdGhlIG9mZnNldHMgZm9yIGEgc2VsZWN0aW9uIG92 ZXIgYSBsaXN0IGl0ZW0uCisgICAgICAgICh3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X3NldF9zZWxl Y3Rpb24pOiBBZGp1c3Qgb2Zmc2V0cyBpZiBuZWVkZWQKKyAgICAgICAgZm9yIGxpc3QgaXRlbXMg d2l0aCBpdGVtIG1hcmtlcnMuIEVuc3VyZSB0aGF0IGl0IHJldHVybnMgVFJVRSBvbmx5CisgICAg ICAgIHdoZW4gZXZlcnl0aGluZyB3ZW50IGZpbmUgc2V0dGluZyB0aGUgdGV4dCBzZWxlY3Rpb24u CisKKzIwMTEtMDItMDcgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29t PgorCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KIAogICAgICAgICBbR3RrXSBhdGtf dGV4dF9nZXRfY2FyZXRfb2Zmc2V0IGZhaWxzIGZvciBsaXN0IGl0ZW1zCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBl ckF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2d0ay9BY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckF0ay5jcHAKaW5kZXggODZlZThiZS4uODgyYzc4NCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9ndGsvQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJBdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvZ3RrL0FjY2Vzc2li aWxpdHlPYmplY3RXcmFwcGVyQXRrLmNwcApAQCAtMTExMywyOSArMTExMywyOCBAQCBnY2hhciog dGV4dEZvck9iamVjdChBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KiBhY2NPYmplY3QpCiBzdGF0 aWMgZ2NoYXIqIHdlYmtpdF9hY2Nlc3NpYmxlX3RleHRfZ2V0X3RleHQoQXRrVGV4dCogdGV4dCwg Z2ludCBzdGFydE9mZnNldCwgZ2ludCBlbmRPZmZzZXQpCiB7CiAgICAgQWNjZXNzaWJpbGl0eU9i amVjdCogY29yZU9iamVjdCA9IGNvcmUodGV4dCk7Ci0gICAgU3RyaW5nIHJldDsKLSAgICB1bnNp Z25lZCBzdGFydCA9IHN0YXJ0T2Zmc2V0OworCisgICAgaW50IGVuZCA9IGVuZE9mZnNldDsKICAg ICBpZiAoZW5kT2Zmc2V0ID09IC0xKSB7Ci0gICAgICAgIGVuZE9mZnNldCA9IGNvcmVPYmplY3Qt PnN0cmluZ1ZhbHVlKCkubGVuZ3RoKCk7Ci0gICAgICAgIGlmICghZW5kT2Zmc2V0KQotICAgICAg ICAgICAgZW5kT2Zmc2V0ID0gY29yZU9iamVjdC0+dGV4dFVuZGVyRWxlbWVudCgpLmxlbmd0aCgp OworICAgICAgICBlbmQgPSBjb3JlT2JqZWN0LT5zdHJpbmdWYWx1ZSgpLmxlbmd0aCgpOworICAg ICAgICBpZiAoIWVuZCkKKyAgICAgICAgICAgIGVuZCA9IGNvcmVPYmplY3QtPnRleHRVbmRlckVs ZW1lbnQoKS5sZW5ndGgoKTsKICAgICB9Ci0gICAgaW50IGxlbmd0aCA9IGVuZE9mZnNldCAtIHN0 YXJ0T2Zmc2V0OwogCisgICAgU3RyaW5nIHJldDsKICAgICBpZiAoY29yZU9iamVjdC0+aXNUZXh0 Q29udHJvbCgpKQotICAgICAgICByZXQgPSBjb3JlT2JqZWN0LT5kb0FYU3RyaW5nRm9yUmFuZ2Uo UGxhaW5UZXh0UmFuZ2Uoc3RhcnQsIGxlbmd0aCkpOworICAgICAgICByZXQgPSBjb3JlT2JqZWN0 LT5kb0FYU3RyaW5nRm9yUmFuZ2UoUGxhaW5UZXh0UmFuZ2UoMCwgZW5kT2Zmc2V0KSk7CiAgICAg ZWxzZSB7Ci0gICAgICAgIHJldCA9IGNvcmVPYmplY3QtPnN0cmluZ1ZhbHVlKCkuc3Vic3RyaW5n KHN0YXJ0LCBsZW5ndGgpOworICAgICAgICByZXQgPSBjb3JlT2JqZWN0LT5zdHJpbmdWYWx1ZSgp OwogICAgICAgICBpZiAoIXJldCkKLSAgICAgICAgICAgIHJldCA9IGNvcmVPYmplY3QtPnRleHRV bmRlckVsZW1lbnQoKS5zdWJzdHJpbmcoc3RhcnQsIGxlbmd0aCk7CisgICAgICAgICAgICByZXQg PSBjb3JlT2JqZWN0LT50ZXh0VW5kZXJFbGVtZW50KCk7CiAgICAgfQogCiAgICAgaWYgKCFyZXQu bGVuZ3RoKCkpIHsKICAgICAgICAgLy8gVGhpcyBjYW4gaGFwcGVuIGF0IGxlYXN0IHdpdGggYW5v bnltb3VzIFJlbmRlckJsb2NrcyAoZS5nLiBib2R5IHRleHQgYW1vbmdzdCBwYXJhZ3JhcGhzKQot ICAgICAgICByZXQgPSBTdHJpbmcodGV4dEZvck9iamVjdChzdGF0aWNfY2FzdDxBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0Kj4oY29yZU9iamVjdCkpKTsKLSAgICAgICAgaWYgKCFlbmRPZmZzZXQp Ci0gICAgICAgICAgICBlbmRPZmZzZXQgPSByZXQubGVuZ3RoKCk7Ci0gICAgICAgIHJldCA9IHJl dC5zdWJzdHJpbmcoc3RhcnQsIGVuZE9mZnNldCAtIHN0YXJ0T2Zmc2V0KTsKKyAgICAgICAgcmV0 ID0gU3RyaW5nKHRleHRGb3JPYmplY3QodG9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0KGNvcmVP YmplY3QpKSk7CisgICAgICAgIGlmICghZW5kKQorICAgICAgICAgICAgZW5kID0gcmV0Lmxlbmd0 aCgpOwogICAgIH0KIAogICAgIC8vIFByZWZpeCBhIGl0ZW0gbnVtYmVyL2J1bGxldCBpZiBuZWVk ZWQKQEAgLTExNDQsOSArMTE0MywxMiBAQCBzdGF0aWMgZ2NoYXIqIHdlYmtpdF9hY2Nlc3NpYmxl X3RleHRfZ2V0X3RleHQoQXRrVGV4dCogdGV4dCwgZ2ludCBzdGFydE9mZnNldCwgZwogICAgICAg ICBpZiAob2JqUmVuZGVyZXIgJiYgb2JqUmVuZGVyZXItPmlzTGlzdEl0ZW0oKSkgewogICAgICAg ICAgICAgU3RyaW5nIG1hcmtlclRleHQgPSB0b1JlbmRlckxpc3RJdGVtKG9ialJlbmRlcmVyKS0+ bWFya2VyVGV4dFdpdGhTdWZmaXgoKTsKICAgICAgICAgICAgIHJldCA9IG9ialJlbmRlcmVyLT5z dHlsZSgpLT5kaXJlY3Rpb24oKSA9PSBMVFIgPyBtYXJrZXJUZXh0ICsgcmV0IDogcmV0ICsgbWFy a2VyVGV4dDsKKyAgICAgICAgICAgIGlmIChlbmRPZmZzZXQgPT0gLTEpCisgICAgICAgICAgICAg ICAgZW5kICs9IG1hcmtlclRleHQubGVuZ3RoKCk7CiAgICAgICAgIH0KICAgICB9CiAKKyAgICBy ZXQgPSByZXQuc3Vic3RyaW5nKHN0YXJ0T2Zmc2V0LCBlbmQgLSBzdGFydE9mZnNldCk7CiAgICAg cmV0dXJuIGdfc3RyZHVwKHJldC51dGY4KCkuZGF0YSgpKTsKIH0KIApAQCAtMTYxOSw2ICsxNjIx LDE0IEBAIHN0YXRpYyB2b2lkIGdldFNlbGVjdGlvbk9mZnNldHNGb3JPYmplY3QoQWNjZXNzaWJp bGl0eU9iamVjdCogY29yZU9iamVjdCwgVmlzaWJsCiAKICAgICAvLyBTZXQgdmFsdWVzIGZvciBz dGFydCBhbmQgZW5kIG9mZnNldHMuCiAgICAgc3RhcnRPZmZzZXQgPSBUZXh0SXRlcmF0b3I6OnJh bmdlTGVuZ3RoKHJhbmdlSW5QYXJlbnQuZ2V0KCkpOworCisgICAgLy8gV2UgbmVlZCB0byBhZGp1 c3QgdGhlIG9mZnNldHMgZm9yIHRoZSBsaXN0IGl0ZW0gbWFya2VyLgorICAgIFJlbmRlck9iamVj dCogcmVuZGVyZXIgPSB0b0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QoY29yZU9iamVjdCktPnJl bmRlcmVyKCk7CisgICAgaWYgKHJlbmRlcmVyICYmIHJlbmRlcmVyLT5pc0xpc3RJdGVtKCkpIHsK KyAgICAgICAgU3RyaW5nIG1hcmtlclRleHQgPSB0b1JlbmRlckxpc3RJdGVtKHJlbmRlcmVyKS0+ bWFya2VyVGV4dFdpdGhTdWZmaXgoKTsKKyAgICAgICAgc3RhcnRPZmZzZXQgKz0gbWFya2VyVGV4 dC5sZW5ndGgoKTsKKyAgICB9CisKICAgICBSZWZQdHI8UmFuZ2U+IG5vZGVSYW5nZSA9IFJhbmdl OjpjcmVhdGUobm9kZS0+ZG9jdW1lbnQoKSwgbm9kZVJhbmdlU3RhcnQsIG5vZGVSYW5nZUVuZCk7 CiAgICAgZW5kT2Zmc2V0ID0gc3RhcnRPZmZzZXQgKyBUZXh0SXRlcmF0b3I6OnJhbmdlTGVuZ3Ro KG5vZGVSYW5nZS5nZXQoKSk7CiB9CkBAIC0xNjc1LDYgKzE2ODUsMTAgQEAgc3RhdGljIGdib29s ZWFuIHdlYmtpdF9hY2Nlc3NpYmxlX3RleHRfc2V0X3NlbGVjdGlvbihBdGtUZXh0KiB0ZXh0LCBn aW50IHNlbGVjdGkKICAgICBpZiAoc2VsZWN0aW9uTnVtKQogICAgICAgICByZXR1cm4gRkFMU0U7 CiAKKyAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0ID0gY29yZSh0ZXh0KTsKKyAg ICBpZiAoIWNvcmVPYmplY3QtPmlzQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdCgpKQorICAgICAg ICByZXR1cm4gRkFMU0U7CisKICAgICAvLyBDb25zaWRlciAtMSBhbmQgb3V0LW9mLWJvdW5kIHZh bHVlcyBhbmQgY29ycmVjdCB0aGVtIHRvIGxlbmd0aAogICAgIGdpbnQgdGV4dENvdW50ID0gd2Vi a2l0X2FjY2Vzc2libGVfdGV4dF9nZXRfY2hhcmFjdGVyX2NvdW50KHRleHQpOwogICAgIGlmIChz dGFydE9mZnNldCA8IDAgfHwgc3RhcnRPZmZzZXQgPiB0ZXh0Q291bnQpCkBAIC0xNjgyLDExICsx Njk2LDI0IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfYWNjZXNzaWJsZV90ZXh0X3NldF9zZWxl Y3Rpb24oQXRrVGV4dCogdGV4dCwgZ2ludCBzZWxlY3RpCiAgICAgaWYgKGVuZE9mZnNldCA8IDAg fHwgZW5kT2Zmc2V0ID4gdGV4dENvdW50KQogICAgICAgICBlbmRPZmZzZXQgPSB0ZXh0Q291bnQ7 CiAKLSAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0ID0gY29yZSh0ZXh0KTsKKyAg ICAvLyBXZSBuZWVkIHRvIGFkanVzdCB0aGUgb2Zmc2V0cyBmb3IgdGhlIGxpc3QgaXRlbSBtYXJr ZXIuCisgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IHRvQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdChjb3JlT2JqZWN0KS0+cmVuZGVyZXIoKTsKKyAgICBpZiAocmVuZGVyZXIgJiYgcmVuZGVy ZXItPmlzTGlzdEl0ZW0oKSkgeworICAgICAgICBTdHJpbmcgbWFya2VyVGV4dCA9IHRvUmVuZGVy TGlzdEl0ZW0ocmVuZGVyZXIpLT5tYXJrZXJUZXh0V2l0aFN1ZmZpeCgpOworICAgICAgICBpbnQg bWFya2VyTGVuZ3RoID0gbWFya2VyVGV4dC5sZW5ndGgoKTsKKyAgICAgICAgaWYgKHN0YXJ0T2Zm c2V0IDwgbWFya2VyTGVuZ3RoIHx8IGVuZE9mZnNldCA8IG1hcmtlckxlbmd0aCkKKyAgICAgICAg ICAgIHJldHVybiBGQUxTRTsKKworICAgICAgICBzdGFydE9mZnNldCAtPSBtYXJrZXJMZW5ndGg7 CisgICAgICAgIGVuZE9mZnNldCAtPSBtYXJrZXJMZW5ndGg7CisgICAgfQorCiAgICAgUGxhaW5U ZXh0UmFuZ2UgdGV4dFJhbmdlKHN0YXJ0T2Zmc2V0LCBlbmRPZmZzZXQgLSBzdGFydE9mZnNldCk7 CiAgICAgVmlzaWJsZVBvc2l0aW9uUmFuZ2UgcmFuZ2UgPSBjb3JlT2JqZWN0LT52aXNpYmxlUG9z aXRpb25SYW5nZUZvclJhbmdlKHRleHRSYW5nZSk7Ci0gICAgY29yZU9iamVjdC0+c2V0U2VsZWN0 ZWRWaXNpYmxlUG9zaXRpb25SYW5nZShyYW5nZSk7CisgICAgaWYgKHJhbmdlLmlzTnVsbCgpKQor ICAgICAgICByZXR1cm4gRkFMU0U7CiAKKyAgICBjb3JlT2JqZWN0LT5zZXRTZWxlY3RlZFZpc2li bGVQb3NpdGlvblJhbmdlKHJhbmdlKTsKICAgICByZXR1cm4gVFJVRTsKIH0KIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdl TG9nCmluZGV4IDJmZjgxNzAuLmMwNGFhYjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDUgKzEs MTggQEAKIDIwMTEtMDItMDcgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtH dGtdIGF0a190ZXh0X2dldF9zZWxlY3Rpb24vYXRrX3RleHRfc2V0X3NlbGVjdGlvbiBmYWlscyBm b3IgbGlzdCBpdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTM0NTMKKworICAgICAgICBVcGRhdGUgdW5pdCB0ZXN0IHRvIGNoZWNrIHRoZSBmaXgg Zm9yIHRoaXMgYnVnLgorCisgICAgICAgICogdGVzdHMvdGVzdGF0ay5jOgorICAgICAgICAodGVz dFdlYmtpdEF0a1RleHRTZWxlY3Rpb25zKTogQ2hlY2sgdGhhdCBmdW5jdGlvbnMgZnJvbSBBdGtU ZXh0CisgICAgICAgIGludGVyZmFjZSB0byBzZXQgYW5kIGdldCB0ZXh0IHNlbGVjdGlvbnMgd29y ayB3aXRoIGxpc3QgaXRlbXMuCisKKzIwMTEtMDItMDcgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxt c2FuY2hlekBpZ2FsaWEuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3Blei4KIAog ICAgICAgICBbR3RrXSBhdGtfdGV4dF9nZXRfY2FyZXRfb2Zmc2V0IGZhaWxzIGZvciBsaXN0IGl0 ZW1zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMgYi9Tb3Vy Y2UvV2ViS2l0L2d0ay90ZXN0cy90ZXN0YXRrLmMKaW5kZXggNjUwODYzOC4uNzljYTY3ZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvdGVzdHMvdGVzdGF0ay5jCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL3Rlc3RzL3Rlc3RhdGsuYwpAQCAtNjIsNyArNjIsNyBAQCBzdGF0aWMgY29uc3Qg Y2hhciogbGlzdHNPZkl0ZW1zID0gIjxodG1sPjxib2R5Pjx1bD48bGk+dGV4dCBvbmx5PC9saT48 bGk+PGEgaHJlZgogCiBzdGF0aWMgY29uc3QgY2hhciogdGV4dEZvckNhcmV0QnJvd3NpbmcgPSAi PGh0bWw+PGJvZHk+PGgxPkEgdGV4dCBoZWFkZXI8L2gxPjxwPkEgcGFyYWdyYXBoIDxhIGhyZWY9 J2h0dHA6Ly9mb28uYmFyLmJhei8nPndpdGggYSBsaW5rPC9hPiBpbiB0aGUgbWlkZGxlPC9wPjxv bD48bGk+QSBsaXN0IGl0ZW08L2xpPjwvb2w+PHNlbGVjdD48b3B0aW9uIHNlbGVjdGVkIHZhbHVl PSdmb28nPkFuIG9wdGlvbiBpbiBhIGNvbWJvIGJveDwvb3B0aW9uPjwvc2VsZWN0PjwvYm9keT48 L2h0bWw+IjsKIAotc3RhdGljIGNvbnN0IGNoYXIqIHRleHRGb3JTZWxlY3Rpb25zID0gIjxodG1s Pjxib2R5PjxwPkEgcGFyYWdyYXBoIHdpdGggcGxhaW4gdGV4dDwvcD48cD5BIHBhcmFncmFwaCB3 aXRoIDxhIGhyZWY9J2h0dHA6Ly93ZWJraXQub3JnJz5hIGxpbms8L2E+IGluIHRoZSBtaWRkbGU8 L3A+PC9ib2R5PjwvaHRtbD4iOworc3RhdGljIGNvbnN0IGNoYXIqIHRleHRGb3JTZWxlY3Rpb25z ID0gIjxodG1sPjxib2R5PjxwPkEgcGFyYWdyYXBoIHdpdGggcGxhaW4gdGV4dDwvcD48cD5BIHBh cmFncmFwaCB3aXRoIDxhIGhyZWY9J2h0dHA6Ly93ZWJraXQub3JnJz5hIGxpbms8L2E+IGluIHRo ZSBtaWRkbGU8L3A+PG9sPjxsaT5BIGxpc3QgaXRlbTwvbGk+PC9vbD48c2VsZWN0PjwvYm9keT48 L2h0bWw+IjsKIAogc3RhdGljIGNvbnN0IGNoYXIqIHRleHRXaXRoQXR0cmlidXRlcyA9ICI8aHRt bD48aGVhZD48c3R5bGU+LnN0MSB7Zm9udC1mYW1pbHk6IG1vbm9zcGFjZTsgY29sb3I6cmdiKDEy MCwxMjEsMTIyKTt9IC5zdDIge3RleHQtZGVjb3JhdGlvbjp1bmRlcmxpbmU7IGJhY2tncm91bmQt Y29sb3I6cmdiKDgwLDgxLDgyKTt9PC9zdHlsZT48L2hlYWQ+PGJvZHk+PHAgc3R5bGU9XCJmb250 LXNpemU6MTQ7IHRleHQtYWxpZ246cmlnaHQ7XCI+VGhpcyBpcyB0aGUgPGk+Zmlyc3Q8L2k+PGI+ IHNlbnRlbmNlIG9mIHRoaXMgdGV4dC48L2I+PC9wPjxwIGNsYXNzPVwic3QxXCI+VGhpcyBzZW50 ZW5jZSBzaG91bGQgaGF2ZSBhbiBzdHlsZSBhcHBsaWVkIDxzcGFuIGNsYXNzPVwic3QyXCI+YW5k IHRoaXMgcGFydCBzaG91bGQgaGF2ZSBhbm90aGVyIG9uZTwvc3Bhbj4uPC9wPjxwPng8c3ViPjE8 L3N1Yj48c3VwPjI8L3N1cD49eDxzdWI+Mjwvc3ViPjxzdXA+Mzwvc3VwPjwvcD48cCBzdHlsZT1c InRleHQtYWxpZ246Y2VudGVyO1wiPlRoaXMgc2VudGVuY2UgaXMgdGhlIDxzdHJpa2U+bGFzdDwv c3RyaWtlPiBvbmUuPC9wPjwvYm9keT48L2h0bWw+IjsKIApAQCAtOTk2LDExICs5OTYsMTkgQEAg c3RhdGljIHZvaWQgdGVzdFdlYmtpdEF0a1RleHRTZWxlY3Rpb25zKCkKIAogICAgIEF0a1RleHQq IHBhcmFncmFwaDEgPSBBVEtfVEVYVChhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxlX2NoaWxkKG9i amVjdCwgMCkpOwogICAgIGdfYXNzZXJ0KEFUS19JU19URVhUKHBhcmFncmFwaDEpKTsKKwogICAg IEF0a1RleHQqIHBhcmFncmFwaDIgPSBBVEtfVEVYVChhdGtfb2JqZWN0X3JlZl9hY2Nlc3NpYmxl X2NoaWxkKG9iamVjdCwgMSkpOwogICAgIGdfYXNzZXJ0KEFUS19JU19URVhUKHBhcmFncmFwaDIp KTsKKwogICAgIEF0a1RleHQqIGxpbmsgPSBBVEtfVEVYVChhdGtfb2JqZWN0X3JlZl9hY2Nlc3Np YmxlX2NoaWxkKEFUS19PQkpFQ1QocGFyYWdyYXBoMiksIDApKTsKICAgICBnX2Fzc2VydChBVEtf SVNfVEVYVChsaW5rKSk7CiAKKyAgICBBdGtPYmplY3QqIGxpc3QgPSBhdGtfb2JqZWN0X3JlZl9h Y2Nlc3NpYmxlX2NoaWxkKG9iamVjdCwgMik7CisgICAgZ19hc3NlcnQoQVRLX09CSkVDVChsaXN0 KSk7CisKKyAgICBBdGtUZXh0KiBsaXN0SXRlbSA9IEFUS19URVhUKGF0a19vYmplY3RfcmVmX2Fj Y2Vzc2libGVfY2hpbGQobGlzdCwgMCkpOworICAgIGdfYXNzZXJ0KEFUS19JU19URVhUKGxpc3RJ dGVtKSk7CisKICAgICAvKiBGaXJzdCBwYXJhZ3JhcGggKHNpbXBsZSB0ZXh0KS4gKi8KIAogICAg IC8qIEJhc2ljIGluaXRpYWwgY2hlY2tzLiAqLwpAQCAtMTA5Niw4ICsxMTA0LDM2IEBAIHN0YXRp YyB2b2lkIHRlc3RXZWJraXRBdGtUZXh0U2VsZWN0aW9ucygpCiAgICAgZ19hc3NlcnRfY21wc3Ry KHNlbGVjdGVkVGV4dCwgPT0sIDApOwogICAgIGdfZnJlZSAoc2VsZWN0ZWRUZXh0KTsKIAorICAg IC8qIExpc3QgaXRlbSAqLworCisgICAgZ19hc3NlcnQoYXRrX29iamVjdF9nZXRfcm9sZShsaXN0 KSA9PSBBVEtfUk9MRV9MSVNUKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoYXRrX29iamVjdF9nZXRf bl9hY2Nlc3NpYmxlX2NoaWxkcmVuKGxpc3QpLCA9PSwgMSk7CisKKyAgICBnY2hhciogdGV4dCA9 IGF0a190ZXh0X2dldF90ZXh0KGxpc3RJdGVtLCAwLCAtMSk7CisgICAgZ19hc3NlcnRfY21wc3Ry KHRleHQsID09LCAiMS4gQSBsaXN0IGl0ZW0iKTsKKyAgICBnX2ZyZWUgKHRleHQpOworCisgICAg LyogSXQncyBub3QgcG9zc2libGUgdG8gc2VsZWN0IHRleHQgaW5zaWRlIGFuIGl0ZW0ncyBtYXJr ZXIuICovCisgICAgcmVzdWx0ID0gYXRrX3RleHRfc2V0X3NlbGVjdGlvbiAobGlzdEl0ZW0sIDAs IDAsIDkpOworICAgIGdfYXNzZXJ0KCFyZXN1bHQpOworICAgIHJlc3VsdCA9IGF0a190ZXh0X3Nl dF9zZWxlY3Rpb24gKGxpc3RJdGVtLCAwLCA5LCAxKTsKKyAgICBnX2Fzc2VydCghcmVzdWx0KTsK KworICAgIC8qIEl0IHNob3VsZCBiZSBwb3NzaWJsZSB0byBzZWxlY3QgdGV4dCBpbnNpZGUgYW4g aXRlbSdzIHRleHQuICovCisgICAgcmVzdWx0ID0gYXRrX3RleHRfc2V0X3NlbGVjdGlvbiAobGlz dEl0ZW0sIDAsIDMsIDkpOworICAgIGdfYXNzZXJ0KHJlc3VsdCk7CisKKyAgICBnX2Fzc2VydF9j bXBpbnQoYXRrX3RleHRfZ2V0X25fc2VsZWN0aW9ucyhsaXN0SXRlbSksID09LCAxKTsKKyAgICBz ZWxlY3RlZFRleHQgPSBhdGtfdGV4dF9nZXRfc2VsZWN0aW9uKGxpc3RJdGVtLCAwLCAmc3RhcnRP ZmZzZXQsICZlbmRPZmZzZXQpOworICAgIGdfYXNzZXJ0X2NtcGludChzdGFydE9mZnNldCwgPT0s IDMpOworICAgIGdfYXNzZXJ0X2NtcGludChlbmRPZmZzZXQsID09LCA5KTsKKyAgICBnX2Fzc2Vy dF9jbXBzdHIoc2VsZWN0ZWRUZXh0LCA9PSwgIkEgbGlzdCIpOworICAgIGdfZnJlZSAoc2VsZWN0 ZWRUZXh0KTsKKwogICAgIGdfb2JqZWN0X3VucmVmKHBhcmFncmFwaDEpOwogICAgIGdfb2JqZWN0 X3VucmVmKHBhcmFncmFwaDIpOworICAgIGdfb2JqZWN0X3VucmVmKGxpc3QpOworICAgIGdfb2Jq ZWN0X3VucmVmKGxpc3RJdGVtKTsKICAgICBnX29iamVjdF91bnJlZih3ZWJWaWV3KTsKIH0KIAot LSAKMS43LjMuNQoK