72131 2011-11-11 08:24:21 -0800 REGRESSION (r99924): broke 2 pasteboard tests on GTK 2011-11-18 15:10:34 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand mrobinson dcheng mrobinson pnormand oldest_to_newest 500789 0 pnormand 2011-11-11 08:24:21 -0800 editing/pasteboard/copy-backslash-with-euc.html and editing/pasteboard/paste-text-events.html now fail. I locally checked that reverting r99924 and r99925 works. Diffs: --- /var/lib/buildbot/build/gtk-linux-32-release/build/layout-test-results/editing/pasteboard/copy-backslash-with-euc-expected.txt +++ /var/lib/buildbot/build/gtk-linux-32-release/build/layout-test-results/editing/pasteboard/copy-backslash-with-euc-actual.txt @@ -14,7 +14,7 @@ from EUC secure to UTF8 text-control: from EUC secure to UTF8 content-editable: •••••••••••••••••••••••• from EUC control to UTF8 text-control: -from EUC control to UTF8 content-editable: \ from EUC text control +from EUC control to UTF8 content-editable: •••••••••••••••••••••••• Results @@ -25,7 +25,7 @@ from EUC secure to UTF8 text-control: PASS from EUC secure to UTF8 content-editable: PASS from EUC control to UTF8 text-control: PASS -from EUC control to UTF8 content-editable: PASS +from EUC control to UTF8 content-editable: FAIL: the actual text was '••••••••••••••••••••••••' (char code of the first character was 8226) from UTF8 div to EUC text-control: PASS from UTF8 div to EUC content-editable: PASS from UTF8 transform to EUC text-control: PASS @@ -33,5 +33,5 @@ from UTF8 secure to EUC text-control: PASS from UTF8 secure to EUC content-editable: PASS from UTF8 control to EUC text-control: PASS -from UTF8 control to EUC content-editable: PASS +from UTF8 control to EUC content-editable: FAIL: the actual text was '•••••••••••••••••••••••••' (char code of the first character was 8226) --- /var/lib/buildbot/build/gtk-linux-32-release/build/layout-test-results/editing/pasteboard/paste-text-events-expected.txt +++ /var/lib/buildbot/build/gtk-linux-32-release/build/layout-test-results/editing/pasteboard/paste-text-events-actual.txt @@ -8,7 +8,7 @@ PASS event.data is 'PlainHello' PASS testTargetInput.value is 'PlainHello' PASS event.data is '' -PASS testTargetEditable.innerHTML is 'PlainHello' +FAIL testTargetEditable.innerHTML should be PlainHello. Was •••••••••••••••••••••••••. PASS event.data is 'RichHello' PASS testTargetTextarea.value is 'RichHello' PASS event.data is 'RichHello' 500791 1 pnormand 2011-11-11 08:27:59 -0800 Skipped in GTK: http://trac.webkit.org/changeset/99973 Any idea what might be wrong Daniel? 500803 2 dcheng 2011-11-11 08:38:05 -0800 Sorry. I'll investigate and fix ASAP. 503489 3 dcheng 2011-11-15 18:18:54 -0800 One of the bugs seems to be a race when running layout tests. I'm guessing that manipulating the clipboard in the layout tests is changing the contents of the system clipboard--when I run paste-text-events.html by itself, it seems to pass. I'm still trying to understand the copy-backslash-with-euc.html failure though. 503495 4 dcheng 2011-11-15 18:47:29 -0800 Actually it appears the problem is GTK does not reset the clipboard to a clean state before writing to it in Pasteboard::writeSelection, Pasteboard::writePlaintext, and probably other locations as well. If you don't reset the clipboard to a clean state, then you might have the plain text copied from one page with the URL/html previously copied from somewhere else. I've verified locally that fixing this fixes the problem. 503945 5 mrobinson 2011-11-16 09:01:02 -0800 (In reply to comment #4) > Actually it appears the problem is GTK does not reset the clipboard to a clean state before writing to it in Pasteboard::writeSelection, Pasteboard::writePlaintext, and probably other locations as well. If you don't reset the clipboard to a clean state, then you might have the plain text copied from one page with the URL/html previously copied from somewhere else. I've verified locally that fixing this fixes the problem. Interesting. I'll fix this today then, assuming that your patch isn't complete. Thank you for looking at this! 505595 6 115763 mrobinson 2011-11-18 01:12:21 -0800 Created attachment 115763 Patch 505898 7 115763 dcheng 2011-11-18 10:44:24 -0800 Comment on attachment 115763 Patch Informal review--the changes look right to me. 505904 8 115763 tony 2011-11-18 10:47:17 -0800 Comment on attachment 115763 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=115763&action=review > Source/WebCore/platform/gtk/ClipboardGtk.cpp:120 > default: Nit: Can we convert this default: into ClipboardDataTypeImage:? Then the compiler will be able to warn us in the future if we add a new type. 506103 9 mrobinson 2011-11-18 15:09:12 -0800 Committed r100817: <http://trac.webkit.org/changeset/100817> 506104 10 mrobinson 2011-11-18 15:10:34 -0800 (In reply to comment #8) > (From update of attachment 115763 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=115763&action=review > > > Source/WebCore/platform/gtk/ClipboardGtk.cpp:120 > > default: > > Nit: Can we convert this default: into ClipboardDataTypeImage:? Then the compiler will be able to warn us in the future if we add a new type. Thanks for the review. Landed with this change. 115763 2011-11-18 01:12:21 -0800 2011-11-18 15:10:15 -0800 Patch bug-72131-20111118011220.patch text/plain 10000 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTAwNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjEzNzMyN2NhYzNmOGM5 NjQ2NDkwMGQ2NDNjM2U3OTcxZWI5YWU1MS4uMjQ5ZThjNDA0YmNhNTRmNTk3YzhkNGQ4NDE1NjNi ZTdhODA4MmRhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTExLTE4ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9O IChyOTk5MjQpOiBicm9rZSAyIHBhc3RlYm9hcmQgdGVzdHMgb24gR1RLCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjEzMQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0NsaXBib2Fy ZEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRHdGs6OmNsZWFyRGF0YSk6IENh bGwgY2xlYXJBbGwgbm93LgorICAgICAgICAoV2ViQ29yZTo6Q2xpcGJvYXJkR3RrOjpjbGVhckFs bERhdGEpOiBDYWxsIGNsZWFyQWxsRXhjZXB0RmlsZW5hbWVzIG5vdy4KKyAgICAgICAgKiBwbGF0 Zm9ybS9ndGsvRGF0YU9iamVjdEd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEYXRhT2JqZWN0 R3RrOjpjbGVhckFsbEV4Y2VwdEZpbGVuYW1lcyk6IFJlbmFtZWQgZnJvbSBjbGVhci4KKyAgICAg ICAgKFdlYkNvcmU6OkRhdGFPYmplY3RHdGs6OmNsZWFyQWxsKTogQWRkZWQgdGhpcyBtZXRob2Qg d2hpY2ggYWxzbyBjbGVhciBmaWxlbmFtZXMuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0RhdGFP YmplY3RHdGsuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEd0ay5jcHA6IENh bGwgY2xlYXIgYmVmb3JlIHNldHRpbmcgbmV3IGNsaXBib2FyZCBkYXRhLgorICAgICAgICAoV2Vi Q29yZTo6UGFzdGVib2FyZDo6d3JpdGVTZWxlY3Rpb24pOiBEaXR0by4KKyAgICAgICAgKFdlYkNv cmU6OlBhc3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KTogRGl0dG8uCisgICAgICAgIChXZWJDb3Jl OjpQYXN0ZWJvYXJkOjp3cml0ZVVSTCk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVi b2FyZDo6d3JpdGVJbWFnZSk6IERpdHRvLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9QYXN0ZWJv YXJkSGVscGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNsZWFyQ2xpcGJvYXJkQ29udGVudHND YWxsYmFjayk6IFVzZSB0aGUgY2xlYXJBbGwgbWV0aG9kIG5vdy4KKwogMjAxMS0xMS0xNyAgTWFy dGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gVGhl IHByb2Nlc3MgZnJlZXplcyB3aGVuIHlvdSByaWdodCBjbGljayBvbiB3aW5kb3dsZXNzIEZsYXNo CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L2d0ay9DaGFuZ2VMb2cKaW5kZXggY2YzNzkxNjUyMTEwZmNhNTMwMDZjZTc1ZTZlYjU0ZmI5NDlj ZTEwMC4uNmMzNjZiN2U2MzEzMzkxNzA0MDY3NGY3YWMzODMzMjBiNTk5NjRlMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTExLTE4ICBNYXJ0aW4gUm9iaW5zb24gIDxt cm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyOTk5MjQpOiBicm9r ZSAyIHBhc3RlYm9hcmQgdGVzdHMgb24gR1RLCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MjEzMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcDoK KyAgICAgICAgKFdlYktpdDo6c2V0U2VsZWN0aW9uUHJpbWFyeUNsaXBib2FyZElmTmVlZGVkKTog VXNlIHRoZSBuZXcgY2xlYXJBbGwgbWV0aG9kLgorCiAyMDExLTExLTE3ICBNYXJ0aW4gUm9iaW5z b24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBSZW1vdmUgdGhlIGxh c3QgcmVtYWluaW5nIFdlYktpdDEgZ3RrZG9jIHdhcm5pbmdzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvQ2xpcGJvYXJkR3RrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2d0ay9DbGlwYm9hcmRHdGsuY3BwCmluZGV4IGI1NTRkMjA4NWU0ODFlN2FiYmJiMTQ3 YjYzOWM5N2U5Y2YyYjczOTMuLjAyNjVlNTY0MTM3YzBmNGVkYTJmZjkyM2M3Y2QzMWIwN2M0Nzdj ZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9DbGlwYm9hcmRHdGsu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9DbGlwYm9hcmRHdGsuY3BwCkBA IC0xMTgsNyArMTE4LDcgQEAgdm9pZCBDbGlwYm9hcmRHdGs6OmNsZWFyRGF0YShjb25zdCBTdHJp bmcmIHR5cGVTdHJpbmcpCiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgQ2xpcGJvYXJkRGF0YVR5 cGVVbmtub3duOgogICAgIGRlZmF1bHQ6Ci0gICAgICAgIG1fZGF0YU9iamVjdC0+Y2xlYXIoKTsK KyAgICAgICAgbV9kYXRhT2JqZWN0LT5jbGVhckFsbCgpOwogICAgIH0KIAogICAgIGlmIChtX2Ns aXBib2FyZCkKQEAgLTEzMSw3ICsxMzEsMTEgQEAgdm9pZCBDbGlwYm9hcmRHdGs6OmNsZWFyQWxs RGF0YSgpCiAgICAgaWYgKHBvbGljeSgpICE9IENsaXBib2FyZFdyaXRhYmxlKQogICAgICAgICBy ZXR1cm47CiAKLSAgICBtX2RhdGFPYmplY3QtPmNsZWFyKCk7CisgICAgLy8gV2UgZG8gbm90IGNs ZWFyIGZpbGVuYW1lcy4gQWNjb3JkaW5nIHRvIHRoZSBzcGVjOiAiVGhlIGNsZWFyRGF0YSgpIG1l dGhvZAorICAgIC8vIGRvZXMgbm90IGFmZmVjdCB3aGV0aGVyIGFueSBmaWxlcyB3ZXJlIGluY2x1 ZGVkIGluIHRoZSBkcmFnLCBzbyB0aGUgdHlwZXMKKyAgICAvLyBhdHRyaWJ1dGUncyBsaXN0IG1p Z2h0IHN0aWxsIG5vdCBiZSBlbXB0eSBhZnRlciBjYWxsaW5nIGNsZWFyRGF0YSgpIChpdCB3b3Vs ZCAKKyAgICAvLyBzdGlsbCBjb250YWluIHRoZSAiRmlsZXMiIHN0cmluZyBpZiBhbnkgZmlsZXMg d2VyZSBpbmNsdWRlZCBpbiB0aGUgZHJhZykuIgorICAgIG1fZGF0YU9iamVjdC0+Y2xlYXJBbGxF eGNlcHRGaWxlbmFtZXMoKTsKIAogICAgIGlmIChtX2NsaXBib2FyZCkKICAgICAgICAgUGFzdGVi b2FyZEhlbHBlcjo6ZGVmYXVsdFBhc3RlYm9hcmRIZWxwZXIoKS0+d3JpdGVDbGlwYm9hcmRDb250 ZW50cyhtX2NsaXBib2FyZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvRGF0YU9iamVjdEd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvRGF0YU9i amVjdEd0ay5jcHAKaW5kZXggMzI0MDVjMTdmNmYyZGU3MWUwZDJkYmZjYzA2NTJjZjdkZDIwZTdi MS4uMWE4NGY4YmQzMTk1MmIyOGUyNjgyNzFkZDJhNWY1N2Y0NGQ4MjdkNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RhdGFPYmplY3RHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EYXRhT2JqZWN0R3RrLmNwcApAQCAtMTQ0LDcgKzE0NCw3 IEBAIFN0cmluZyBEYXRhT2JqZWN0R3RrOjp1cmxMYWJlbCgpIGNvbnN0CiAgICAgcmV0dXJuIFN0 cmluZygpOwogfQogCi12b2lkIERhdGFPYmplY3RHdGs6OmNsZWFyKCkKK3ZvaWQgRGF0YU9iamVj dEd0azo6Y2xlYXJBbGxFeGNlcHRGaWxlbmFtZXMoKQogewogICAgIG1fdGV4dCA9ICIiOwogICAg IG1fbWFya3VwID0gIiI7CkBAIC0xNTIsMTEgKzE1MiwxMiBAQCB2b2lkIERhdGFPYmplY3RHdGs6 OmNsZWFyKCkKICAgICBtX3VybCA9IEtVUkwoKTsKICAgICBtX2ltYWdlID0gMDsKICAgICBtX3Jh bmdlID0gMDsKK30KIAotICAgIC8vIFdlIGRvIG5vdCBjbGVhciBmaWxlbmFtZXMuIEFjY29yZGlu ZyB0byB0aGUgc3BlYzogIlRoZSBjbGVhckRhdGEoKSBtZXRob2QKLSAgICAvLyBkb2VzIG5vdCBh ZmZlY3Qgd2hldGhlciBhbnkgZmlsZXMgd2VyZSBpbmNsdWRlZCBpbiB0aGUgZHJhZywgc28gdGhl IHR5cGVzCi0gICAgLy8gYXR0cmlidXRlJ3MgbGlzdCBtaWdodCBzdGlsbCBub3QgYmUgZW1wdHkg YWZ0ZXIgY2FsbGluZyBjbGVhckRhdGEoKSAoaXQgd291bGQgCi0gICAgLy8gc3RpbGwgY29udGFp biB0aGUgIkZpbGVzIiBzdHJpbmcgaWYgYW55IGZpbGVzIHdlcmUgaW5jbHVkZWQgaW4gdGhlIGRy YWcpLiIKK3ZvaWQgRGF0YU9iamVjdEd0azo6Y2xlYXJBbGwoKQoreworICAgIGNsZWFyQWxsRXhj ZXB0RmlsZW5hbWVzKCk7CisgICAgbV9maWxlbmFtZXMuY2xlYXIoKTsKIH0KIAogRGF0YU9iamVj dEd0ayogRGF0YU9iamVjdEd0azo6Zm9yQ2xpcGJvYXJkKEd0a0NsaXBib2FyZCogY2xpcGJvYXJk KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0RhdGFPYmplY3RHdGsu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9EYXRhT2JqZWN0R3RrLmgKaW5kZXggZTI3 YmM5MTVmZjZiZTNjZjI0NGQ5YmNlNTM1ZjUzMjJlZGM1ZTcxMC4uYjVhODFlM2Q1NTliOTJjNWYy Nzc4OGQyOGRhMjJkNzZiY2I4MDBkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL0RhdGFPYmplY3RHdGsuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsv RGF0YU9iamVjdEd0ay5oCkBAIC01OSw3ICs1OSw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE1h cmt1cChjb25zdCBTdHJpbmcmKTsKICAgICB2b2lkIHNldFVSSUxpc3QoY29uc3QgU3RyaW5nJik7 CiAgICAgU3RyaW5nIHVybExhYmVsKCkgY29uc3Q7Ci0gICAgdm9pZCBjbGVhcigpOworCisgICAg dm9pZCBjbGVhckFsbEV4Y2VwdEZpbGVuYW1lcygpOworICAgIHZvaWQgY2xlYXJBbGwoKTsKICAg ICB2b2lkIGNsZWFyVGV4dCgpOwogICAgIHZvaWQgY2xlYXJNYXJrdXAoKTsKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Bhc3RlYm9hcmRHdGsuY3BwCmluZGV4IDQ5YWZiYzc5MDI3 Y2Y3NmE1NmM5NDNkZjk2ZWU1MDUwYzk5OTY2NDEuLjBiZmY1ZWI0ODBiODcwZWM1MWVlYWYyNDRm MmY4NjQwZTRlYjEyYWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9Q YXN0ZWJvYXJkR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVi b2FyZEd0ay5jcHAKQEAgLTU5LDcgKzU5LDEwIEBAIHZvaWQgUGFzdGVib2FyZDo6d3JpdGVTZWxl Y3Rpb24oUmFuZ2UqIHNlbGVjdGVkUmFuZ2UsIGJvb2wgY2FuU21hcnRDb3B5T3JEZWxldGUsCiB7 CiAgICAgUGFzdGVib2FyZEhlbHBlciogaGVscGVyID0gUGFzdGVib2FyZEhlbHBlcjo6ZGVmYXVs dFBhc3RlYm9hcmRIZWxwZXIoKTsKICAgICBHdGtDbGlwYm9hcmQqIGNsaXBib2FyZCA9IGhlbHBl ci0+Z2V0Q2xpcGJvYXJkKGZyYW1lKTsKKwogICAgIERhdGFPYmplY3RHdGsqIGRhdGFPYmplY3Qg PSBEYXRhT2JqZWN0R3RrOjpmb3JDbGlwYm9hcmQoY2xpcGJvYXJkKTsKKyAgICBkYXRhT2JqZWN0 LT5jbGVhckFsbCgpOworCiAgICAgZGF0YU9iamVjdC0+c2V0VGV4dChmcmFtZS0+ZWRpdG9yKCkt PnNlbGVjdGVkVGV4dCgpKTsKICAgICBkYXRhT2JqZWN0LT5zZXRNYXJrdXAoY3JlYXRlTWFya3Vw KHNlbGVjdGVkUmFuZ2UsIDAsIEFubm90YXRlRm9ySW50ZXJjaGFuZ2UsIGZhbHNlLCBSZXNvbHZl Tm9uTG9jYWxVUkxzKSk7CiAgICAgaGVscGVyLT53cml0ZUNsaXBib2FyZENvbnRlbnRzKGNsaXBi b2FyZCwgY2FuU21hcnRDb3B5T3JEZWxldGUgPyBQYXN0ZWJvYXJkSGVscGVyOjpJbmNsdWRlU21h cnRQYXN0ZSA6IFBhc3RlYm9hcmRIZWxwZXI6OkRvTm90SW5jbHVkZVNtYXJ0UGFzdGUpOwpAQCAt NjksNiArNzIsOCBAQCB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlUGxhaW5UZXh0KGNvbnN0IFN0cmlu ZyYgdGV4dCkKIHsKICAgICBHdGtDbGlwYm9hcmQqIGNsaXBib2FyZCA9IGd0a19jbGlwYm9hcmRf Z2V0X2Zvcl9kaXNwbGF5KGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCksIEdES19TRUxFQ1RJT05f Q0xJUEJPQVJEKTsKICAgICBEYXRhT2JqZWN0R3RrKiBkYXRhT2JqZWN0ID0gRGF0YU9iamVjdEd0 azo6Zm9yQ2xpcGJvYXJkKGNsaXBib2FyZCk7CisgICAgZGF0YU9iamVjdC0+Y2xlYXJBbGwoKTsK KwogICAgIGRhdGFPYmplY3QtPnNldFRleHQodGV4dCk7CiAgICAgUGFzdGVib2FyZEhlbHBlcjo6 ZGVmYXVsdFBhc3RlYm9hcmRIZWxwZXIoKS0+d3JpdGVDbGlwYm9hcmRDb250ZW50cyhjbGlwYm9h cmQpOwogfQpAQCAtODAsNyArODUsMTAgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZVVSTChjb25z dCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbGFiZWwsIEZyYW1lKiBmcmFtZSkKIAogICAgIFBh c3RlYm9hcmRIZWxwZXIqIGhlbHBlciA9IFBhc3RlYm9hcmRIZWxwZXI6OmRlZmF1bHRQYXN0ZWJv YXJkSGVscGVyKCk7CiAgICAgR3RrQ2xpcGJvYXJkKiBjbGlwYm9hcmQgPSBoZWxwZXItPmdldENs aXBib2FyZChmcmFtZSk7CisKICAgICBEYXRhT2JqZWN0R3RrKiBkYXRhT2JqZWN0ID0gRGF0YU9i amVjdEd0azo6Zm9yQ2xpcGJvYXJkKGNsaXBib2FyZCk7CisgICAgZGF0YU9iamVjdC0+Y2xlYXJB bGwoKTsKKwogICAgIGRhdGFPYmplY3QtPnNldFVSTCh1cmwsIGxhYmVsKTsKICAgICBoZWxwZXIt PndyaXRlQ2xpcGJvYXJkQ29udGVudHMoY2xpcGJvYXJkKTsKIH0KQEAgLTExOCw2ICsxMjYsNyBA QCB2b2lkIFBhc3RlYm9hcmQ6OndyaXRlSW1hZ2UoTm9kZSogbm9kZSwgY29uc3QgS1VSTCYsIGNv bnN0IFN0cmluZyYgdGl0bGUpCiAKICAgICBHdGtDbGlwYm9hcmQqIGNsaXBib2FyZCA9IGd0a19j bGlwYm9hcmRfZ2V0X2Zvcl9kaXNwbGF5KGdka19kaXNwbGF5X2dldF9kZWZhdWx0KCksIEdES19T RUxFQ1RJT05fQ0xJUEJPQVJEKTsKICAgICBEYXRhT2JqZWN0R3RrKiBkYXRhT2JqZWN0ID0gRGF0 YU9iamVjdEd0azo6Zm9yQ2xpcGJvYXJkKGNsaXBib2FyZCk7CisgICAgZGF0YU9iamVjdC0+Y2xl YXJBbGwoKTsKIAogICAgIEtVUkwgdXJsID0gZ2V0VVJMRm9ySW1hZ2VOb2RlKG5vZGUpOwogICAg IGlmICghdXJsLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3RrL1Bhc3RlYm9hcmRIZWxwZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Bhc3RlYm9hcmRIZWxwZXIuY3BwCmluZGV4IDFjMTczYjZkZDA3YTBiZGFiNDI5YzQxOGJkNDE1 NmQ1MzdmNTk4NWUuLjkxMGI2M2I3YmY0Mzk1Mzk5YWI4ODgwYTY5M2JjZjk1NTgzZjcyM2EgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9QYXN0ZWJvYXJkSGVscGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGFzdGVib2FyZEhlbHBlci5jcHAK QEAgLTI4Myw3ICsyODMsNyBAQCBzdGF0aWMgdm9pZCBjbGVhckNsaXBib2FyZENvbnRlbnRzQ2Fs bGJhY2soR3RrQ2xpcGJvYXJkKiBjbGlwYm9hcmQsIGdwb2ludGVyIGRhdAogCiAgICAgLy8gT25s eSBjbGVhciB0aGUgRGF0YU9iamVjdCBmb3IgdGhpcyBjbGlwYm9hcmQgaWYgd2UgYXJlIG5vdCBj dXJyZW50bHkgc2V0dGluZyBpdC4KICAgICBpZiAoZGF0YU9iamVjdCAhPSBzZXR0aW5nQ2xpcGJv YXJkRGF0YU9iamVjdCkKLSAgICAgICAgZGF0YU9iamVjdC0+Y2xlYXIoKTsKKyAgICAgICAgZGF0 YU9iamVjdC0+Y2xlYXJBbGwoKTsKIAogICAgIGlmICghZGF0YSkKICAgICAgICAgcmV0dXJuOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50 R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0VkaXRvckNsaWVudEd0 ay5jcHAKaW5kZXggYjE1NzIyODJmOWFhZjg3MGI5OGM5NGRlZWNlZTViNGJiNjFkN2E4OC4uZmQy M2E4YWNmZGY2ODUzNzYzYTFkNDM3MjNjYjU0NjI0ZTI0MzJkNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRWRpdG9yQ2xpZW50R3RrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9FZGl0b3JDbGllbnRHdGsuY3BwCkBAIC0yOTEs NyArMjkxLDcgQEAgc3RhdGljIHZvaWQgc2V0U2VsZWN0aW9uUHJpbWFyeUNsaXBib2FyZElmTmVl ZGVkKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAgICAgaWYgKCF0YXJnZXRGcmFtZS0+c2VsZWN0 aW9uKCktPmlzUmFuZ2UoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGF0YU9iamVjdC0+Y2xl YXIoKTsKKyAgICBkYXRhT2JqZWN0LT5jbGVhckFsbCgpOwogICAgIGRhdGFPYmplY3QtPnNldFJh bmdlKHRhcmdldEZyYW1lLT5zZWxlY3Rpb24oKS0+dG9Ob3JtYWxpemVkUmFuZ2UoKSk7CiAKICAg ICB2aWV3U2V0dGluZ0NsaXBib2FyZCA9IHdlYlZpZXc7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMjZjN2VkNjUzODFhNjhk N2U0OWY2MTJkYWQ0ZDljNWJmNThlNjNhNi4uZTllZjllYTBmNDg5ZjQ2OGJhOGQ0YjM2MTAxNzIx OTYwZmY3MDQ1ZSAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91 dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTExLTE4ICBNYXJ0aW4gUm9i aW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyOTk5 MjQpOiBicm9rZSAyIHBhc3RlYm9hcmQgdGVzdHMgb24gR1RLCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MjEzMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1NraXBwZWQ6IFVuc2tp cCBwYXNzaW5nIHRlc3RzLgorCiAyMDExLTExLTE3ICBBZGFtIEtsZWluICA8YWRhbWtAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIE1vdmUgSlMgcmVjdXJzaW9uIGNvdW50ZXIgZnJvbSBWOFByb3h5 IHRvIFY4QmluZGluZ1Blcklzb2xhdGVEYXRhCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4 IGEwYWIzNGRhMTgyMWRjM2ZhZGUyYTg4MDIzNWU2NDNjYjVjN2ZjOTIuLjQzYmNkOGIyNWE2OTYx NGEyMmQwMGUyNWQzOWQ3NWUzZTQwZmMyOGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBA IC0xNTg4LDExICsxNTg4LDYgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9taXhlZENvbnRlbnQvcmVk aXJlY3QtaHR0cHMtdG8taHR0cC1zY3JpcHQtaW4taWZyYW1lLmh0bWwKIGZhc3QvZnJhbWVzL2Zs YXR0ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmctbmVzdGVkLmh0bWwKIGZhc3QvZnJhbWVzL2ZsYXR0 ZW5pbmcvaWZyYW1lLWZsYXR0ZW5pbmctZml4ZWQtd2lkdGgtYW5kLWhlaWdodC1uby1zY3JvbGxp bmcuaHRtbAogCi0jIFJFR1JFU1NJT04gKHI5OTkyNCk6IGJyb2tlIDIgcGFzdGVib2FyZCB0ZXN0 cyBvbiBHVEsKLSMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMTMx Ci1lZGl0aW5nL3Bhc3RlYm9hcmQvY29weS1iYWNrc2xhc2gtd2l0aC1ldWMuaHRtbAotZWRpdGlu Zy9wYXN0ZWJvYXJkL3Bhc3RlLXRleHQtZXZlbnRzLmh0bWwKLQogIyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIyNDgKIGVkaXRpbmcvc3BlbGxpbmcvc3BlbGxpbmct dW5pZmllZC1lbXVsYXRpb24uaHRtbAogCg==