94058 2012-08-14 18:58:14 -0700 [BlackBerry] [DRT] 5 tests failed for incorrect JS console message format 2012-08-16 07:55:14 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 xiaobwang webkit-unassigned mifenton mxie rwlbuis staikos tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 695649 0 xiaobwang 2012-08-14 18:58:14 -0700 From RIM PR #191441 Failed cases: 1 fast/frames/sandboxed-iframe-history-denied.html 2 fast/frames/sandboxed-iframe-navigation-targetlink.html 3 fast/frames/sandboxed-iframe-navigation-top-by-name-denied.html 4 fast/frames/sandboxed-iframe-navigation-top-denied.html 5 fast/frames/seamless/seamless-window-location-sandbox.html All tests failed because of incorrect console message format. Need to fix in DumpRenderTree code. Here's the text diff for one of the tests. ---/tmp/developer/layout-test-results/fast/frames/sandboxed-iframe-navigation-top-denied-expected.txt +++/tmp/developer/layout-test-results/fast/frames/sandboxed-iframe-navigation-top-denied-actual.txt @@ -1,4 +1,6 @@ -CONSOLE MESSAGE: Unsafe JavaScript attempt to initiate a navigation change for frame with URL navigate-top-to-fail.html. +CONSOLE MESSAGE: line 0: Unsafe JavaScript attempt to initiate a navigation change for frame with URL file:///developer/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html from frame with URL file:///developer/LayoutTests/fast/frames/resources/navigate-top-to-fail.html. + +JS Console: :0: Unsafe JavaScript attempt to initiate a navigation change for frame with URL file:///developer/LayoutTests/fast/frames/sandboxed-iframe-navigation-top-denied.html from frame with URL file:///developer/LayoutTests/fast/frames/resources/navigate-top-to-fail.html. This test verifies that a sandboxed IFrame cannot navigate the top-level frame without allow-top-navigation. This test passes if the navigation does not occur. 695685 1 158486 xiaobwang 2012-08-14 19:58:08 -0700 Created attachment 158486 patch Patch for this issue. The Source part is patched by Rob Buis. 695841 2 xiaobwang 2012-08-15 01:58:16 -0700 Adding Yong, Antonio, and George. Can any of you help to review? 695929 3 158486 rwlbuis 2012-08-15 05:47:38 -0700 Comment on attachment 158486 patch Thanks for this patch, looks good! 695976 4 158486 yong.li.webkit 2012-08-15 07:08:38 -0700 Comment on attachment 158486 patch View in context: https://bugs.webkit.org/attachment.cgi?id=158486&action=review > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:653 > + String remaining = message.substring(pos, message.length() - pos); ", message.length() - pos" is not necessary > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:657 > + baseName = remaining.substring(indexBase + 1, remaining.length() - indexBase - 1); ditto. Also it should be called "fileName" rather than "baseName"? "Base" sounds like base URL / the folder path... 696641 5 xiaobwang 2012-08-15 19:22:09 -0700 (In reply to comment #4) > (From update of attachment 158486 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=158486&action=review > > > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:653 > > + String remaining = message.substring(pos, message.length() - pos); > > ", message.length() - pos" is not necessary > > > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:657 > > + baseName = remaining.substring(indexBase + 1, remaining.length() - indexBase - 1); > > ditto. Also it should be called "fileName" rather than "baseName"? "Base" sounds like base URL / the folder path... Good suggestions Yong. I agree "fileName" is better. Actually I borrowed the name from the UNIX command "basename" which usually returns the file name of a full path. Will update the patch soon. 696884 6 158745 xiaobwang 2012-08-16 01:18:23 -0700 Created attachment 158745 patch updated Updated according to comments from Yong Li. 697102 7 158745 yong.li.webkit 2012-08-16 07:17:27 -0700 Comment on attachment 158745 patch updated View in context: https://bugs.webkit.org/attachment.cgi?id=158745&action=review > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:662 > + printf("%s\n", newMessage.utf8().data()); I have introduced a class ReadOnlyLatinString that will give better performance if you are sure latin1() won't lose any info and in most cases the String has a 8-bit internal buffer. But this is minor thing, especially this is only for DRT. 697133 8 158745 webkit.review.bot 2012-08-16 07:55:10 -0700 Comment on attachment 158745 patch updated Clearing flags on attachment: 158745 Committed r125778: <http://trac.webkit.org/changeset/125778> 697134 9 webkit.review.bot 2012-08-16 07:55:14 -0700 All reviewed patches have been landed. Closing bug. 158486 2012-08-14 19:58:08 -0700 2012-08-16 07:17:47 -0700 patch 0001-Source-WebKit-blackberry-BlackBerry-Suppress-non-DRT.patch text/plain 5358 xiaobwang RnJvbSAyY2VjOWVjNjBlZTdjMzU0NmEyZDc3NTI4ZjhmMjQ3OTFlZTExMWM4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogV2VkLCAxNSBBdWcgMjAxMiAxMDo1MToxNiArMDgwMApTdWJqZWN0OiBbUEFUQ0hd IFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeTogW0JsYWNrQmVycnldIFN1cHByZXNzIG5vbiBEUlQg SlMKIENvbnNvbGUgb3V0cHV0LgogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk0MDU4CgpQYXRjaCBieSBSb2IgQnVpcyA8cmJ1aXNAcmltLmNvbT4gb24gMjAxMi0wOC0x NApSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBNaW5n IFhpZS4KClNvbWUgYWN0dWFsIHRlc3QgcmVzdWx0cyBzaG93IEpTIENvbnNvbGUgc2hvd2luZyB1 cCB0d2ljZSwgZm9yCmluc3RhbmNlIHRyYXZlcnNhbC9tb3otYnVnNTU5NTI2Lmh0bWwuIE9ubHkg cHJpbnQgdGhlIERSVCBzcGVjaWZpYwpDb25zb2xlIG1lc3NhZ2UuCgoqIFdlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgooV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CgpUb29sczogW0JsYWNrQmVycnldIFVwZGF0ZSBm b3JtYXQgb2YgSlMgY29uc29sZSBtZXNzYWdlIHRvIGtlZXAgY29uc2lzdGVudCB3aXRoIG90aGVy IHBvcnRzLgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQwNTgKClJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpSZXZpZXdlZCBpbnRlcm5hbGx5IGJ5IEdlb3JnZSBT dGFpa29zLgoKMS4gUmVtb3ZlIGxpbmUgbnVtYmVyIGlmIGl0J3MgemVyby4KMi4gUHJpbnQgb25s eSBmaWxlIG5hbWUgZm9yICJmaWxlOi8vIiBVUkwuCgoqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVy cnkvRHVtcFJlbmRlclRyZWUuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJl ZTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwogLi4uL1dlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwICAgICAgfCAgICA0ICsrKy0KIFRv b2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNCAr KysrKysrKysrKysrKwogVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVy VHJlZS5jcHAgfCAgIDE4ICsrKysrKysrKysrKysrKysrLQogNCBmaWxlcyBjaGFuZ2VkLCA0OSBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n CmluZGV4IDdkMjVhZGUuLmVmMTFkMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTE0ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisK KyAgICAgICAgU3VwcHJlc3Mgbm9uIERSVCBKUyBDb25zb2xlIG91dHB1dC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0MDU4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIFJldmlld2VkIGludGVybmFsbHkgYnkg TWluZyBYaWUuCisKKyAgICAgICAgU29tZSBhY3R1YWwgdGVzdCByZXN1bHRzIHNob3cgSlMgQ29u c29sZSBzaG93aW5nIHVwIHR3aWNlLCBmb3IKKyAgICAgICAgaW5zdGFuY2UgdHJhdmVyc2FsL21v ei1idWc1NTk1MjYuaHRtbC4gT25seSBwcmludCB0aGUgRFJUIHNwZWNpZmljCisgICAgICAgIENv bnNvbGUgbWVzc2FnZS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJs YWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6 YWRkTWVzc2FnZVRvQ29uc29sZSk6CisKIDIwMTItMDgtMTQgIEFkYW0gQmFydGggIDxhYmFydGhA d2Via2l0Lm9yZz4KIAogICAgICAgICBEZWxldGUgRnJhbWU6OmRvbVdpbmRvdygpIGFuZCBGcmFt ZTo6ZXhpc3RpbmdET01XaW5kb3coKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dl YktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3Bw CmluZGV4IDA4YzExZGQuLjlhNjMyNWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJy eS5jcHAKQEAgLTkxLDggKzkxLDEwIEBAIENocm9tZUNsaWVudEJsYWNrQmVycnk6OkNocm9tZUNs aWVudEJsYWNrQmVycnkoV2ViUGFnZVByaXZhdGUqIHBhZ2VQcml2YXRlKQogdm9pZCBDaHJvbWVD bGllbnRCbGFja0JlcnJ5OjphZGRNZXNzYWdlVG9Db25zb2xlKE1lc3NhZ2VTb3VyY2UsIE1lc3Nh Z2VUeXBlLCBNZXNzYWdlTGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWduZWQgaW50 IGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQpCiB7CiAjaWYgIWRlZmluZWQoUFVC TElDX0JVSUxEKSB8fCAhUFVCTElDX0JVSUxECi0gICAgaWYgKG1fd2ViUGFnZVByaXZhdGUtPm1f ZHVtcFJlbmRlclRyZWUpCisgICAgaWYgKG1fd2ViUGFnZVByaXZhdGUtPm1fZHVtcFJlbmRlclRy ZWUpIHsKICAgICAgICAgbV93ZWJQYWdlUHJpdmF0ZS0+bV9kdW1wUmVuZGVyVHJlZS0+YWRkTWVz c2FnZVRvQ29uc29sZShtZXNzYWdlLCBsaW5lTnVtYmVyLCBzb3VyY2VJRCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAjZW5kaWYKIAogICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fY2xpZW50LT5h ZGRNZXNzYWdlVG9Db25zb2xlKG1lc3NhZ2UuY2hhcmFjdGVycygpLCBtZXNzYWdlLmxlbmd0aCgp LCBzb3VyY2VJRC5jaGFyYWN0ZXJzKCksIHNvdXJjZUlELmxlbmd0aCgpLCBsaW5lTnVtYmVyKTsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAxNTAz YTRhLi4wYjYxZmU3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDgtMTQgIFhpYW9ibyBXYW5nICA8eGJ3YW5n QHRvcmNobW9iaWxlLmNvbS5jbj4KKworICAgICAgICBVcGRhdGUgZm9ybWF0IG9mIEpTIGNvbnNv bGUgbWVzc2FnZSB0byBrZWVwIGNvbnNpc3RlbnQgd2l0aCBvdGhlciBwb3J0cy4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk0MDU4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIFJldmlld2VkIGludGVybmFsbHkg YnkgR2VvcmdlIFN0YWlrb3MKKworICAgICAgICAxLiBSZW1vdmUgbGluZSBudW1iZXIgaWYgaXQn cyB6ZXJvLgorICAgICAgICAyLiBQcmludCBvbmx5IGZpbGUgbmFtZSBmb3IgImZpbGU6Ly8iIFVS TC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUu Y3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6YWRkTWVz c2FnZVRvQ29uc29sZSk6CisKIDIwMTItMDgtMTQgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBh cHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gRml4IHNvbWUgdHlwb3MgaW4gTWluaUJyb3dzZXIK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRy ZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5j cHAKaW5kZXggNWYxMTc5ZC4uN2RjMTMwNyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTY0Myw3ICs2NDMsMjMgQEAgdm9p ZCBEdW1wUmVuZGVyVHJlZTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUoY29uc3QgU3RyaW5nJiB0 aXRsZSwgV2ViQ29yZTo6RnJhbWUKIC8vIENocm9tZUNsaWVudCBkZWxlZ2F0ZXMuCiB2b2lkIER1 bXBSZW5kZXJUcmVlOjphZGRNZXNzYWdlVG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg dW5zaWduZWQgaW50IGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQpCiB7Ci0gICAg cHJpbnRmKCJDT05TT0xFIE1FU1NBR0U6IGxpbmUgJWQ6ICVzXG4iLCBsaW5lTnVtYmVyLCBtZXNz YWdlLnV0ZjgoKS5kYXRhKCkpOworICAgIHByaW50ZigiQ09OU09MRSBNRVNTQUdFOiAiKTsKKyAg ICBpZiAobGluZU51bWJlcikKKyAgICAgICAgcHJpbnRmKCJsaW5lICVkOiAiLCBsaW5lTnVtYmVy KTsKKyAgICBTdHJpbmcgbmV3TWVzc2FnZSA9IG1lc3NhZ2U7CisgICAgaW50IHBvcyA9IG1lc3Nh Z2UuZmluZCgiZmlsZTovLyIpOworICAgIGlmIChwb3MgPj0gMCkgeworICAgICAgICBuZXdNZXNz YWdlID0gbWVzc2FnZS5zdWJzdHJpbmcoMCwgcG9zKTsKKyAgICAgICAgU3RyaW5nIHJlbWFpbmlu ZyA9IG1lc3NhZ2Uuc3Vic3RyaW5nKHBvcywgbWVzc2FnZS5sZW5ndGgoKSAtIHBvcyk7CisgICAg ICAgIFN0cmluZyBiYXNlTmFtZTsKKyAgICAgICAgaW50IGluZGV4QmFzZSA9IHJlbWFpbmluZy5y ZXZlcnNlRmluZCgnLycpOworICAgICAgICBpZiAoaW5kZXhCYXNlID49IDAgJiYgaW5kZXhCYXNl IDwgcmVtYWluaW5nLmxlbmd0aCgpIC0gMSkKKyAgICAgICAgICAgIGJhc2VOYW1lID0gcmVtYWlu aW5nLnN1YnN0cmluZyhpbmRleEJhc2UgKyAxLCByZW1haW5pbmcubGVuZ3RoKCkgLSBpbmRleEJh c2UgLSAxKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgYmFzZU5hbWUgPSAiZmlsZToiOwor ICAgICAgICBuZXdNZXNzYWdlLmFwcGVuZChiYXNlTmFtZSk7CisgICAgfQorICAgIHByaW50Zigi JXNcbiIsIG5ld01lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiB9CiAKIHZvaWQgRHVtcFJlbmRlclRy ZWU6OnJ1bkphdmFTY3JpcHRBbGVydChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCi0tIAoxLjcuNgoK 158745 2012-08-16 01:18:23 -0700 2012-08-16 07:55:10 -0700 patch updated 0001-Source-WebKit-blackberry-BlackBerry-Suppress-non-DRT.patch text/plain 5320 xiaobwang RnJvbSBjNjRmYzM4NzRlODlkMTA0NjU5ZmFiZTI2M2E1OTdhYzllN2U4ZTY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogV2VkLCAxNSBBdWcgMjAxMiAxMDo1MToxNiArMDgwMApTdWJqZWN0OiBbUEFUQ0hd IFNvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeTogW0JsYWNrQmVycnldIFN1cHByZXNzIG5vbiBEUlQg SlMKIENvbnNvbGUgb3V0cHV0LgogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTk0MDU4CgpQYXRjaCBieSBSb2IgQnVpcyA8cmJ1aXNAcmltLmNvbT4gb24gMjAxMi0wOC0x NApSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBNaW5n IFhpZS4KClNvbWUgYWN0dWFsIHRlc3QgcmVzdWx0cyBzaG93IEpTIENvbnNvbGUgc2hvd2luZyB1 cCB0d2ljZSwgZm9yCmluc3RhbmNlIHRyYXZlcnNhbC9tb3otYnVnNTU5NTI2Lmh0bWwuIE9ubHkg cHJpbnQgdGhlIERSVCBzcGVjaWZpYwpDb25zb2xlIG1lc3NhZ2UuCgoqIFdlYkNvcmVTdXBwb3J0 L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwOgooV2ViQ29yZTo6Q2hyb21lQ2xpZW50QmxhY2tC ZXJyeTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CgpUb29sczogW0JsYWNrQmVycnldIFVwZGF0ZSBm b3JtYXQgb2YgSlMgY29uc29sZSBtZXNzYWdlIHRvIGtlZXAgY29uc2lzdGVudCB3aXRoIG90aGVy IHBvcnRzLgpodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTQwNTgKClJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpSZXZpZXdlZCBpbnRlcm5hbGx5IGJ5IEdlb3JnZSBT dGFpa29zLgoKMS4gUmVtb3ZlIGxpbmUgbnVtYmVyIGlmIGl0J3MgemVyby4KMi4gUHJpbnQgb25s eSBmaWxlIG5hbWUgZm9yICJmaWxlOi8vIiBVUkwuCgoqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVy cnkvRHVtcFJlbmRlclRyZWUuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJl ZTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6Ci0tLQogU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZyAgICAgICAgICAgICAgICAgfCAgIDE1ICsrKysrKysrKysrKysrKwogLi4uL1dlYkNv cmVTdXBwb3J0L0Nocm9tZUNsaWVudEJsYWNrQmVycnkuY3BwICAgICAgfCAgICA0ICsrKy0KIFRv b2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNCAr KysrKysrKysrKysrKwogVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVy VHJlZS5jcHAgfCAgIDE4ICsrKysrKysrKysrKysrKysrLQogNCBmaWxlcyBjaGFuZ2VkLCA0OSBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv YmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n CmluZGV4IDdkMjVhZGUuLjU3MzVlYjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2ti ZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwpA QCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTE0ICBSb2IgQnVpcyAgPHJidWlzQHJpbS5jb20+CisK KyAgICAgICAgW0JsYWNrQmVycnldIFN1cHByZXNzIG5vbiBEUlQgSlMgQ29uc29sZSBvdXRwdXQu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NDA1OAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBSZXZpZXdlZCBp bnRlcm5hbGx5IGJ5IE1pbmcgWGllLgorCisgICAgICAgIFNvbWUgYWN0dWFsIHRlc3QgcmVzdWx0 cyBzaG93IEpTIENvbnNvbGUgc2hvd2luZyB1cCB0d2ljZSwgZm9yCisgICAgICAgIGluc3RhbmNl IHRyYXZlcnNhbC9tb3otYnVnNTU5NTI2Lmh0bWwuIE9ubHkgcHJpbnQgdGhlIERSVCBzcGVjaWZp YworICAgICAgICBDb25zb2xlIG1lc3NhZ2UuCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9D aHJvbWVDbGllbnRCbGFja0JlcnJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVu dEJsYWNrQmVycnk6OmFkZE1lc3NhZ2VUb0NvbnNvbGUpOgorCiAyMDEyLTA4LTE0ICBBZGFtIEJh cnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRGVsZXRlIEZyYW1lOjpkb21XaW5k b3coKSBhbmQgRnJhbWU6OmV4aXN0aW5nRE9NV2luZG93KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRCbGFja0JlcnJ5LmNw cCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRC bGFja0JlcnJ5LmNwcAppbmRleCAwOGMxMWRkLi45YTYzMjVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2JsYWNrYmVycnkvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50QmxhY2tCZXJyeS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNs aWVudEJsYWNrQmVycnkuY3BwCkBAIC05MSw4ICs5MSwxMCBAQCBDaHJvbWVDbGllbnRCbGFja0Jl cnJ5OjpDaHJvbWVDbGllbnRCbGFja0JlcnJ5KFdlYlBhZ2VQcml2YXRlKiBwYWdlUHJpdmF0ZSkK IHZvaWQgQ2hyb21lQ2xpZW50QmxhY2tCZXJyeTo6YWRkTWVzc2FnZVRvQ29uc29sZShNZXNzYWdl U291cmNlLCBNZXNzYWdlVHlwZSwgTWVzc2FnZUxldmVsLCBjb25zdCBTdHJpbmcmIG1lc3NhZ2Us IHVuc2lnbmVkIGludCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKQogewogI2lm ICFkZWZpbmVkKFBVQkxJQ19CVUlMRCkgfHwgIVBVQkxJQ19CVUlMRAotICAgIGlmIChtX3dlYlBh Z2VQcml2YXRlLT5tX2R1bXBSZW5kZXJUcmVlKQorICAgIGlmIChtX3dlYlBhZ2VQcml2YXRlLT5t X2R1bXBSZW5kZXJUcmVlKSB7CiAgICAgICAgIG1fd2ViUGFnZVByaXZhdGUtPm1fZHVtcFJlbmRl clRyZWUtPmFkZE1lc3NhZ2VUb0NvbnNvbGUobWVzc2FnZSwgbGluZU51bWJlciwgc291cmNlSUQp OworICAgICAgICByZXR1cm47CisgICAgfQogI2VuZGlmCiAKICAgICBtX3dlYlBhZ2VQcml2YXRl LT5tX2NsaWVudC0+YWRkTWVzc2FnZVRvQ29uc29sZShtZXNzYWdlLmNoYXJhY3RlcnMoKSwgbWVz c2FnZS5sZW5ndGgoKSwgc291cmNlSUQuY2hhcmFjdGVycygpLCBzb3VyY2VJRC5sZW5ndGgoKSwg bGluZU51bWJlcik7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VM b2cKaW5kZXggMTUwM2E0YS4uZmQ0N2U0MSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA4LTE0ICBYaWFvYm8g V2FuZyAgPHhid2FuZ0B0b3JjaG1vYmlsZS5jb20uY24+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFVwZGF0ZSBmb3JtYXQgb2YgSlMgY29uc29sZSBtZXNzYWdlIHRvIGtlZXAgY29uc2lzdGVudCB3 aXRoIG90aGVyIHBvcnRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTQwNTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgUmV2aWV3ZWQgaW50ZXJuYWxseSBieSBHZW9yZ2UgU3RhaWtvcy4KKworICAgICAgICAx LiBSZW1vdmUgbGluZSBudW1iZXIgaWYgaXQncyB6ZXJvLgorICAgICAgICAyLiBQcmludCBvbmx5 IGZpbGUgbmFtZSBmb3IgImZpbGU6Ly8iIFVSTC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2Vi S2l0OjpEdW1wUmVuZGVyVHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CisKIDIwMTItMDgtMTQg IEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dLMl0gRml4 IHNvbWUgdHlwb3MgaW4gTWluaUJyb3dzZXIKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv YmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXggNWYxMTc5ZC4uYjc3ODc3MSAxMDA2 NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5j cHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5j cHAKQEAgLTY0Myw3ICs2NDMsMjMgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZGlkUmVjZWl2ZVRp dGxlRm9yRnJhbWUoY29uc3QgU3RyaW5nJiB0aXRsZSwgV2ViQ29yZTo6RnJhbWUKIC8vIENocm9t ZUNsaWVudCBkZWxlZ2F0ZXMuCiB2b2lkIER1bXBSZW5kZXJUcmVlOjphZGRNZXNzYWdlVG9Db25z b2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWduZWQgaW50IGxpbmVOdW1iZXIsIGNvbnN0 IFN0cmluZyYgc291cmNlSUQpCiB7Ci0gICAgcHJpbnRmKCJDT05TT0xFIE1FU1NBR0U6IGxpbmUg JWQ6ICVzXG4iLCBsaW5lTnVtYmVyLCBtZXNzYWdlLnV0ZjgoKS5kYXRhKCkpOworICAgIHByaW50 ZigiQ09OU09MRSBNRVNTQUdFOiAiKTsKKyAgICBpZiAobGluZU51bWJlcikKKyAgICAgICAgcHJp bnRmKCJsaW5lICVkOiAiLCBsaW5lTnVtYmVyKTsKKyAgICBTdHJpbmcgbmV3TWVzc2FnZSA9IG1l c3NhZ2U7CisgICAgaW50IHBvcyA9IG1lc3NhZ2UuZmluZCgiZmlsZTovLyIpOworICAgIGlmIChw b3MgPj0gMCkgeworICAgICAgICBuZXdNZXNzYWdlID0gbWVzc2FnZS5zdWJzdHJpbmcoMCwgcG9z KTsKKyAgICAgICAgU3RyaW5nIHJlbWFpbmluZyA9IG1lc3NhZ2Uuc3Vic3RyaW5nKHBvcyk7Cisg ICAgICAgIFN0cmluZyBmaWxlTmFtZTsKKyAgICAgICAgaW50IGluZGV4RmlsZSA9IHJlbWFpbmlu Zy5yZXZlcnNlRmluZCgnLycpICsgMTsKKyAgICAgICAgaWYgKGluZGV4RmlsZSA+IDAgJiYgaW5k ZXhGaWxlIDwgcmVtYWluaW5nLmxlbmd0aCgpKQorICAgICAgICAgICAgZmlsZU5hbWUgPSByZW1h aW5pbmcuc3Vic3RyaW5nKGluZGV4RmlsZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIGZp bGVOYW1lID0gImZpbGU6IjsKKyAgICAgICAgbmV3TWVzc2FnZS5hcHBlbmQoZmlsZU5hbWUpOwor ICAgIH0KKyAgICBwcmludGYoIiVzXG4iLCBuZXdNZXNzYWdlLnV0ZjgoKS5kYXRhKCkpOwogfQog CiB2b2lkIER1bXBSZW5kZXJUcmVlOjpydW5KYXZhU2NyaXB0QWxlcnQoY29uc3QgU3RyaW5nJiBt ZXNzYWdlKQotLSAKMS43LjYKCg==