36701 2010-03-27 07:04:08 -0700 Fix tests added by https://bugs.webkit.org/show_bug.cgi?id=36675 on Qt Linux and Windows 2010-04-07 11:49:09 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other Linux RESOLVED FIXED Qt P2 Normal --- 1 robert robert eric simon.fraser webkit.review.bot oldest_to_newest 204981 0 robert 2010-03-27 07:04:08 -0700 Add support to unix and windows NS plugin for executing scripts on setWindow. Amend plugins/reentrant-update-widget-positions.html to trigger the test in the same way as its companion test update-widgets-crash.html, i.e.: window.addEventListener('load', doTest, false); reentrant-update-widget-positions.html was using: window.addEventListener('load', function() { window.setTimeout(doTest, 0); which on Qt (and apparently Windows judging by the bot) runs the test after onSetWindow has been called. There must be a bug at the bottom of this difference but probably best to treat separately. 204982 1 51827 robert 2010-03-27 07:15:07 -0700 Created attachment 51827 Patch 204983 2 webkit.review.bot 2010-03-27 07:16:34 -0700 Attachment 51827 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:89: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp:111: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 204985 3 robert 2010-03-27 07:19:38 -0700 See https://bugs.webkit.org/show_bug.cgi?id=36702 for tracking the inconsistency in EventListener/setTimeOut. 204986 4 robert 2010-03-27 07:21:06 -0700 (In reply to comment #2) > Attachment 51827 [details] did not pass style-queue: > > Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 > WebKitTools/DumpRenderTree/unix/TestNetscapePlugin/TestNetscapePlugin.cpp:89: > Tests for true/false, null/non-null, and zero/non-zero should all be done > without equality comparisons. [readability/comparison_to_zero] [5] > WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.cpp:111: Tests for > true/false, null/non-null, and zero/non-zero should all be done without > equality comparisons. [readability/comparison_to_zero] [5] > Total errors found: 2 in 5 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. Ignoring these errors as the style is consistent with the rest of the file. 204990 5 51827 simon.fraser 2010-03-27 08:31:49 -0700 Comment on attachment 51827 Patch > Subject: [PATCH] 2010-03-27 Robert Hogan <robert@webkit.org> > > Reviewed by NOBODY (OOPS!). > > Amend plugins/reentrant-update-widget-positions.html to trigger the test in the > same way as its companion test plugins/update-widgets-crash.html, i.e.: The tests are different for the specific reason that they triggered different bugs. Please leave them as they are. r=me on the plugin code changes. 205015 6 51827 ap 2010-03-27 11:52:52 -0700 Comment on attachment 51827 Patch Marking cq-, because this patch shouldn't be landed as is. 209474 7 eric 2010-04-06 23:45:35 -0700 Attachment 51827 was posted by a committer and has review+, assigning to Robert Hogan for commit. 209757 8 robert 2010-04-07 11:49:09 -0700 Landed as r56668. 51827 2010-03-27 07:15:07 -0700 2010-03-27 11:52:52 -0700 Patch 0001-2010-03-27-Robert-Hogan-robert-webkit.org.patch text/plain 8675 robert RnJvbSA2YjA3NWMxM2E0Yjk5OWM3YmQxMWYyZWU1MjIyZTIzYjJjYzdlN2I0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSG9nYW4gPHJvYmVydEB3ZWJraXQub3JnPgpEYXRl OiBTYXQsIDI3IE1hciAyMDEwIDE0OjA0OjM5ICswMDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMC0w My0yNyAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CgogICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBBbWVuZCBwbHVnaW5zL3JlZW50cmFudC11cGRh dGUtd2lkZ2V0LXBvc2l0aW9ucy5odG1sIHRvIHRyaWdnZXIgdGhlIHRlc3QgaW4gdGhlCiAgICAg ICAgc2FtZSB3YXkgYXMgaXRzIGNvbXBhbmlvbiB0ZXN0IHBsdWdpbnMvdXBkYXRlLXdpZGdldHMt Y3Jhc2guaHRtbCwgaS5lLjoKCiAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQn LCBkb1Rlc3QsIGZhbHNlKTsKCiAgICAgICAgcmVlbnRyYW50LXVwZGF0ZS13aWRnZXQtcG9zaXRp b25zLmh0bWwgd2FzIHVzaW5nOgoKICAgICAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIo J2xvYWQnLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGRv VGVzdCwgMCk7CgogICAgICAgIHdoaWNoIG9uIFF0IChhbmQgYXBwYXJlbnRseSBXaW5kb3dzIGp1 ZGdpbmcgYnkgdGhlIGJvdCkgZXhlY3V0ZXMgdGhlIGZ1bmN0aW9uIGFmdGVyCiAgICAgICAgb25T ZXRXaW5kb3cgaGFzIGJlZW4gY2FsbGVkIGJ5IHRoZSBwbHVnaW4gZW1iZWRkZWQgaW4gPGJvZHk+ LiBUaGVyZSBtdXN0IGJlIGEgYnVnCiAgICAgICAgYXQgdGhlIGJvdHRvbSBvZiB0aGlzIGRpZmZl cmVuY2UgYnV0IHByb2JhYmx5IGJlc3QgdG8gdHJlYXQgc2VwYXJhdGVseS4KCiAgICAgICAgVGhl IHRlc3RzIHdlcmUgYWRkZWQgaW4gcjU2NjQ2LgoKICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY3MDEKCiAgICAgICAgKiBwbHVnaW5zL3JlZW50cmFudC11 cGRhdGUtd2lkZ2V0LXBvc2l0aW9ucy5odG1sOgoKMjAxMC0wMy0yNyAgUm9iZXJ0IEhvZ2FuICA8 cm9iZXJ0QHdlYmtpdC5vcmc+CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoK ICAgICAgICBbUXQvV2luXSBBZGQgc3VwcG9ydCB0byB1bml4IGFuZCB3aW5kb3dzIE5TIHBsdWdp biBmb3IgZXhlY3V0aW5nIHNjcmlwdHMgb24gc2V0V2luZG93LgoKICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzY3MDEKCiAgICAgICAgKiBEdW1wUmVuZGVy VHJlZS91bml4L1Rlc3ROZXRzY2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQbHVnaW4uY3BwOgogICAg ICAgICh3ZWJraXRfdGVzdF9wbHVnaW5fbmV3X2luc3RhbmNlKTogQWRkIG9uU2V0V2luZG93Lgog ICAgICAgICh3ZWJraXRfdGVzdF9wbHVnaW5fZGVzdHJveV9pbnN0YW5jZSk6IEFkZCBvblNldFdp bmRvdy4KICAgICAgICAod2Via2l0X3Rlc3RfcGx1Z2luX3NldF93aW5kb3cpOiBBZGQgb25TZXRX aW5kb3cuCiAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vVGVzdE5ldHNjYXBlUGx1Z2luL21h aW4uY3BwOgogICAgICAgIChOUFBfTmV3KTogQWRkIG9uU2V0V2luZG93LgogICAgICAgIChOUFBf RGVzdHJveSk6IEFkZCBvblNldFdpbmRvdy4KICAgICAgICAoTlBQX1NldFdpbmRvdyk6IEFkZCBv blNldFdpbmRvdy4KLS0tCiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMjQgKysrKysrKysrKysrKysrKysrKysKIC4uLi9wbHVnaW5zL3JlZW50 cmFudC11cGRhdGUtd2lkZ2V0LXBvc2l0aW9ucy5odG1sIHwgICAgNyArKystLQogV2ViS2l0VG9v bHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE3ICsrKysrKysr KysrKysrCiAuLi4vdW5peC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLmNw cCB8ICAgIDcgKysrKysKIC4uLi9EdW1wUmVuZGVyVHJlZS93aW4vVGVzdE5ldHNjYXBlUGx1Z2lu L21haW4uY3BwIHwgICAxMCArKysrKysrLQogNSBmaWxlcyBjaGFuZ2VkLCA2MSBpbnNlcnRpb25z KCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjMzRiMjUxLi42MTY3MWJiIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjcgQEAKKzIwMTAtMDMtMjcgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFtZW5k IHBsdWdpbnMvcmVlbnRyYW50LXVwZGF0ZS13aWRnZXQtcG9zaXRpb25zLmh0bWwgdG8gdHJpZ2dl ciB0aGUgdGVzdCBpbiB0aGUKKyAgICAgICAgc2FtZSB3YXkgYXMgaXRzIGNvbXBhbmlvbiB0ZXN0 IHBsdWdpbnMvdXBkYXRlLXdpZGdldHMtY3Jhc2guaHRtbCwgaS5lLjoKKworICAgICAgICB3aW5k b3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGRvVGVzdCwgZmFsc2UpOworCisgICAgICAgIHJl ZW50cmFudC11cGRhdGUtd2lkZ2V0LXBvc2l0aW9ucy5odG1sIHdhcyB1c2luZzoKKworICAgICAg ICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQnLCBmdW5jdGlvbigpIHsKKyAgICAg ICAgICAgICAgICB3aW5kb3cuc2V0VGltZW91dChkb1Rlc3QsIDApOworCisgICAgICAgIHdoaWNo IG9uIFF0IChhbmQgYXBwYXJlbnRseSBXaW5kb3dzIGp1ZGdpbmcgYnkgdGhlIGJvdCkgZXhlY3V0 ZXMgdGhlIGZ1bmN0aW9uIGFmdGVyCisgICAgICAgIG9uU2V0V2luZG93IGhhcyBiZWVuIGNhbGxl ZCBieSB0aGUgcGx1Z2luIGVtYmVkZGVkIGluIDxib2R5Pi4gVGhlcmUgbXVzdCBiZSBhIGJ1Zwor ICAgICAgICBhdCB0aGUgYm90dG9tIG9mIHRoaXMgZGlmZmVyZW5jZSBidXQgcHJvYmFibHkgYmVz dCB0byB0cmVhdCBzZXBhcmF0ZWx5LgorCisgICAgICAgIFRoZSB0ZXN0cyB3ZXJlIGFkZGVkIGlu IHI1NjY0Ni4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzY3MDEKKworICAgICAgICAqIHBsdWdpbnMvcmVlbnRyYW50LXVwZGF0ZS13aWRnZXQtcG9z aXRpb25zLmh0bWw6CisKIDIwMTAtMDMtMjYgIFJvYmVydCBIb2dhbiAgPHJvYmVydEByb2JlcnRo b2dhbi5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbHVnaW5zL3JlZW50cmFudC11cGRhdGUtd2lkZ2V0LXBvc2l0aW9u cy5odG1sIGIvTGF5b3V0VGVzdHMvcGx1Z2lucy9yZWVudHJhbnQtdXBkYXRlLXdpZGdldC1wb3Np dGlvbnMuaHRtbAppbmRleCBmZThlMTYwLi5kZGNlMTQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbHVnaW5zL3JlZW50cmFudC11cGRhdGUtd2lkZ2V0LXBvc2l0aW9ucy5odG1sCisrKyBiL0xh eW91dFRlc3RzL3BsdWdpbnMvcmVlbnRyYW50LXVwZGF0ZS13aWRnZXQtcG9zaXRpb25zLmh0bWwK QEAgLTIsNiArMiw5IEBACiAKIDxodG1sPgogPGhlYWQ+CisgICAgPGRpdiBpZD0iY29uc29sZSI+ PC9kaXY+CisgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9mYXN0L2pzL3Jlc291 cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+CisgICAgPHNjcmlwdCBzcmM9Ii4uL2Zhc3QvanMvcmVz b3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KICAgICA8c3R5bGUgdHlwZT0idGV4dC9j c3MiIG1lZGlhPSJzY3JlZW4iPgogICAgICAgICAjcGx1Z2luIHsKICAgICAgICAgICAgIHBvc2l0 aW9uOiBhYnNvbHV0ZTsKQEAgLTM3LDkgKzQwLDcgQEAKICAgICAgICAgZG9pbmdUZXN0ID0gZmFs c2U7CiAgICAgfQogICAgIAotICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZnVu Y3Rpb24oKSB7Ci0gICAgICAgIHdpbmRvdy5zZXRUaW1lb3V0KGRvVGVzdCwgMCk7Ci0gICAgfSwg ZmFsc2UpOworICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywgZG9UZXN0LCBmYWxz ZSk7CiAgICAgPC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keT4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA3NWM1ZDZjLi41NDc2 Y2Q0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMDMtMjcgIFJvYmVydCBIb2dhbiAgPHJv YmVydEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdC9XaW5dIEFkZCBzdXBwb3J0IHRvIHVuaXggYW5kIHdpbmRvd3MgTlMgcGx1 Z2luIGZvciBleGVjdXRpbmcgc2NyaXB0cyBvbiBzZXRXaW5kb3cuCisKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2NzAxCisKKyAgICAgICAgKiBEdW1w UmVuZGVyVHJlZS91bml4L1Rlc3ROZXRzY2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQbHVnaW4uY3Bw OgorICAgICAgICAod2Via2l0X3Rlc3RfcGx1Z2luX25ld19pbnN0YW5jZSk6IEFkZCBvblNldFdp bmRvdy4KKyAgICAgICAgKHdlYmtpdF90ZXN0X3BsdWdpbl9kZXN0cm95X2luc3RhbmNlKTogQWRk IG9uU2V0V2luZG93LgorICAgICAgICAod2Via2l0X3Rlc3RfcGx1Z2luX3NldF93aW5kb3cpOiBB ZGQgb25TZXRXaW5kb3cuCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1Rlc3ROZXRzY2Fw ZVBsdWdpbi9tYWluLmNwcDoKKyAgICAgICAgKE5QUF9OZXcpOiBBZGQgb25TZXRXaW5kb3cuCisg ICAgICAgIChOUFBfRGVzdHJveSk6IEFkZCBvblNldFdpbmRvdy4KKyAgICAgICAgKE5QUF9TZXRX aW5kb3cpOiBBZGQgb25TZXRXaW5kb3cuCisKIDIwMTAtMDMtMjYgIFJvYmVydCBIb2dhbiAgPHJv YmVydEByb2JlcnRob2dhbi5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21h bm4uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS91bml4L1Rlc3ROZXRz Y2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQbHVnaW4uY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvdW5peC9UZXN0TmV0c2NhcGVQbHVnaW4vVGVzdE5ldHNjYXBlUGx1Z2luLmNwcAppbmRl eCA1ZmVlYWFmLi5hM2M2NzczIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS91bml4L1Rlc3ROZXRzY2FwZVBsdWdpbi9UZXN0TmV0c2NhcGVQbHVnaW4uY3BwCisrKyBiL1dl YktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3VuaXgvVGVzdE5ldHNjYXBlUGx1Z2luL1Rlc3ROZXRz Y2FwZVBsdWdpbi5jcHAKQEAgLTg2LDYgKzg2LDggQEAgd2Via2l0X3Rlc3RfcGx1Z2luX25ld19p bnN0YW5jZShOUE1JTUVUeXBlIC8qbWltZXR5cGUqLywKICAgICAgICAgICAgICAgICBvYmotPnRl c3REb2N1bWVudE9wZW5JbkRlc3Ryb3lTdHJlYW0gPSBUUlVFOwogICAgICAgICAgICAgZWxzZSBp ZiAoc3RyY2FzZWNtcChhcmduW2ldLCAidGVzdHdpbmRvd29wZW4iKSA9PSAwKQogICAgICAgICAg ICAgICAgIG9iai0+dGVzdFdpbmRvd09wZW4gPSBUUlVFOworICAgICAgICAgICAgZWxzZSBpZiAo c3RyY2FzZWNtcChhcmduW2ldLCAib25TZXRXaW5kb3ciKSA9PSAwICYmICFvYmotPm9uU2V0V2lu ZG93KQorICAgICAgICAgICAgICAgIG9iai0+b25TZXRXaW5kb3cgPSBzdHJkdXAoYXJndltpXSk7 CiAgICAgICAgIH0KIAogICAgICAgICBicm93c2VyLT5nZXR2YWx1ZShpbnN0YW5jZSwgTlBOVnBy aXZhdGVNb2RlQm9vbCwgKHZvaWQgKikmb2JqLT5jYWNoZWRQcml2YXRlQnJvd3NpbmdNb2RlKTsK QEAgLTExNiw2ICsxMTgsOSBAQCB3ZWJraXRfdGVzdF9wbHVnaW5fZGVzdHJveV9pbnN0YW5jZShO UFAgaW5zdGFuY2UsIE5QU2F2ZWREYXRhKiogLypzYXZlKi8pCiAgICAgICAgIGlmIChvYmotPmxv Z0Rlc3Ryb3kpCiAgICAgICAgICAgICBwbHVnaW5Mb2coaW5zdGFuY2UsICJOUFBfRGVzdHJveSIp OwogCisgICAgICAgIGlmIChvYmotPm9uU2V0V2luZG93KQorICAgICAgICAgICAgZnJlZShvYmot Pm9uU2V0V2luZG93KTsKKwogICAgICAgICBicm93c2VyLT5yZWxlYXNlb2JqZWN0KCZvYmotPmhl YWRlcik7CiAgICAgfQogCkBAIC0xMzQsNiArMTM5LDggQEAgd2Via2l0X3Rlc3RfcGx1Z2luX3Nl dF93aW5kb3coTlBQIGluc3RhbmNlLCBOUFdpbmRvdyAqd2luZG93KQogICAgICAgICAgICAgcGx1 Z2luTG9nKGluc3RhbmNlLCAiTlBQX1NldFdpbmRvdzogJWQgJWQiLCAoaW50KXdpbmRvdy0+d2lk dGgsIChpbnQpd2luZG93LT5oZWlnaHQpOwogICAgICAgICAgICAgb2JqLT5sb2dTZXRXaW5kb3cg PSBmYWxzZTsKICAgICAgICAgfQorICAgICAgICBpZiAob2JqLT5vblNldFdpbmRvdykKKyAgICAg ICAgICAgIGV4ZWN1dGVTY3JpcHQob2JqLCBvYmotPm9uU2V0V2luZG93KTsKIAogICAgICAgICBp ZiAob2JqLT50ZXN0V2luZG93T3BlbikgewogICAgICAgICAgICAgdGVzdFdpbmRvd09wZW4oaW5z dGFuY2UpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rlc3RO ZXRzY2FwZVBsdWdpbi9tYWluLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9U ZXN0TmV0c2NhcGVQbHVnaW4vbWFpbi5jcHAKaW5kZXggOGM0MjJhOC4uZWVhY2I3ZSAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL1Rlc3ROZXRzY2FwZVBsdWdpbi9t YWluLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS93aW4vVGVzdE5ldHNjYXBl UGx1Z2luL21haW4uY3BwCkBAIC02LDcgKzYsNyBAQAogIHJlZGlzdHJpYnV0ZSB0aGlzIEFwcGxl IHNvZnR3YXJlLgogIAogIEluIGNvbnNpZGVyYXRpb24gb2YgeW91ciBhZ3JlZW1lbnQgdG8gYWJp ZGUgYnkgdGhlIGZvbGxvd2luZyB0ZXJtcywgYW5kIHN1YmplY3QgdG8gdGhlc2UgCi0gdGVybXMs IEFwcGxlIGdyYW50cyB5b3UgYSBwZXJzb25hbCwgbm9uLWV4Y2x1c2l2ZSBsaWNlbnNlLCB1bmRl ciBBcHBsZdVzIGNvcHlyaWdodHMgaW4gCisgdGVybXMsIEFwcGxlIGdyYW50cyB5b3UgYSBwZXJz b25hbCwgbm9uLWV4Y2x1c2l2ZSBsaWNlbnNlLCB1bmRlciBBcHBsZSdzIGNvcHlyaWdodHMgaW4K ICB0aGlzIG9yaWdpbmFsIEFwcGxlIHNvZnR3YXJlICh0aGUgIkFwcGxlIFNvZnR3YXJlIiksIHRv IHVzZSwgcmVwcm9kdWNlLCBtb2RpZnkgYW5kIAogIHJlZGlzdHJpYnV0ZSB0aGUgQXBwbGUgU29m dHdhcmUsIHdpdGggb3Igd2l0aG91dCBtb2RpZmljYXRpb25zLCBpbiBzb3VyY2UgYW5kL29yIGJp bmFyeSAKICBmb3JtczsgcHJvdmlkZWQgdGhhdCBpZiB5b3UgcmVkaXN0cmlidXRlIHRoZSBBcHBs ZSBTb2Z0d2FyZSBpbiBpdHMgZW50aXJldHkgYW5kIHdpdGhvdXQgCkBAIC0xMDgsNiArMTA4LDgg QEAgTlBFcnJvciBOUFBfTmV3KE5QTUlNRVR5cGUgcGx1Z2luVHlwZSwgTlBQIGluc3RhbmNlLCB1 aW50MTYgbW9kZSwgaW50MTYgYXJnYywgY2gKICAgICAgICAgICAgICAgICBvYmotPnRlc3REb2N1 bWVudE9wZW5JbkRlc3Ryb3lTdHJlYW0gPSBUUlVFOwogICAgICAgICAgICAgICBlbHNlIGlmIChf c3RyaWNtcChhcmduW2ldLCAidGVzdHdpbmRvd29wZW4iKSA9PSAwKQogICAgICAgICAgICAgICAg IG9iai0+dGVzdFdpbmRvd09wZW4gPSBUUlVFOworICAgICAgICAgICAgZWxzZSBpZiAoX3N0cmlj bXAoYXJnbltpXSwgIm9uU2V0V2luZG93IikgPT0gMCAmJiAhb2JqLT5vblNldFdpbmRvdykKKyAg ICAgICAgICAgICAgICBvYmotPm9uU2V0V2luZG93ID0gc3RyZHVwKGFyZ3ZbaV0pOwogICAgICAg ICB9CiAKICAgICAgICAgYnJvd3Nlci0+Z2V0dmFsdWUoaW5zdGFuY2UsIE5QTlZwcml2YXRlTW9k ZUJvb2wsICh2b2lkICopJm9iai0+Y2FjaGVkUHJpdmF0ZUJyb3dzaW5nTW9kZSk7CkBAIC0xMzcs NiArMTM5LDkgQEAgTlBFcnJvciBOUFBfRGVzdHJveShOUFAgaW5zdGFuY2UsIE5QU2F2ZWREYXRh ICoqc2F2ZSkKICAgICAgICAgaWYgKG9iai0+bG9nRGVzdHJveSkKICAgICAgICAgICAgIHByaW50 ZigiUExVR0lOOiBOUFBfRGVzdHJveVxuIik7CiAKKyAgICAgICAgaWYgKG9iai0+b25TZXRXaW5k b3cpCisgICAgICAgICAgICBmcmVlKG9iai0+b25TZXRXaW5kb3cpOworCiAgICAgICAgIGJyb3dz ZXItPnJlbGVhc2VvYmplY3QoJm9iai0+aGVhZGVyKTsKICAgICB9CiAgICAgcmV0dXJuIE5QRVJS X05PX0VSUk9SOwpAQCAtMTQ5LDYgKzE1NCw5IEBAIE5QRXJyb3IgTlBQX1NldFdpbmRvdyhOUFAg aW5zdGFuY2UsIE5QV2luZG93ICp3aW5kb3cpCiAgICAgaWYgKG9iaikgewogICAgICAgICBvYmot Pmxhc3RXaW5kb3cgPSAqd2luZG93OwogCisgICAgICAgIGlmIChvYmotPm9uU2V0V2luZG93KQor ICAgICAgICAgICAgZXhlY3V0ZVNjcmlwdChvYmosIG9iai0+b25TZXRXaW5kb3cpOworCiAgICAg ICAgIGlmIChvYmotPnRlc3RXaW5kb3dPcGVuKSB7CiAgICAgICAgICAgICB0ZXN0V2luZG93T3Bl bihpbnN0YW5jZSk7CiAgICAgICAgICAgICBvYmotPnRlc3RXaW5kb3dPcGVuID0gRkFMU0U7Ci0t IAoxLjYuMy4zCgo=