86540 2012-05-15 15:54:22 -0700 MHTML files should be loadable from all schemes considered local, not just file: 2012-05-24 12:26:58 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED GoogleBug P2 Normal --- 86583 1 gspencer gspencer abarth ap bashi beidson japhet jberlin sam webkit.review.bot oldest_to_newest 624683 0 gspencer 2012-05-15 15:54:22 -0700 In MainResourceLoader::continueAfterContentPolicy and in MHTMLArchive::create, there are tests to make sure that we don't load remote html archives. Both of these tests use KURL.isLocalFile(), which only checks to see if the scheme of the URL is "file:". This is fine as a first approximation, but since the SchemeRegistry has the extensible mechanism shouldTreatURLSchemeAsLocal(), we should use that instead, since on some platforms we would like to be able to register non-file schemes as being local. This is related to the Chromium bug: http://crbug.com/126955 624688 1 142088 gspencer 2012-05-15 15:57:35 -0700 Created attachment 142088 A proposed patch 624695 2 142089 gspencer 2012-05-15 16:04:58 -0700 Created attachment 142089 Patch 624699 3 webkit.review.bot 2012-05-15 16:07:21 -0700 Attachment 142089 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:10: You should remove the 'No new tests' and either add and list tests, or explain why no new tests were possible. [changelog/nonewtests] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 624713 4 142093 gspencer 2012-05-15 16:23:22 -0700 Created attachment 142093 Patch 624726 5 gspencer 2012-05-15 16:39:11 -0700 Adding Adam as a potential reviewer. 624818 6 142093 abarth 2012-05-15 18:27:56 -0700 Comment on attachment 142093 Patch Makes sense to me. 624889 7 142093 webkit.review.bot 2012-05-15 19:48:28 -0700 Comment on attachment 142093 Patch Clearing flags on attachment: 142093 Committed r117206: <http://trac.webkit.org/changeset/117206> 624891 8 webkit.review.bot 2012-05-15 19:48:33 -0700 All reviewed patches have been landed. Closing bug. 625049 9 webkit.review.bot 2012-05-16 00:16:40 -0700 Re-opened since this is blocked by 86583 625055 10 bashi 2012-05-16 00:18:26 -0700 The patch also breaks chromium's browser_tests. http://test-results.appspot.com/dashboards/flakiness_dashboard.html#testType=browser_tests&tests=RenderViewHostTest.BaseURLParam I'm going to revert the patch. 625619 11 ap 2012-05-16 10:38:46 -0700 How does the change to MainResourceLoader::continueAfterContentPolicy affect WebArchives? 626155 12 142093 abarth 2012-05-16 19:25:53 -0700 Comment on attachment 142093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142093&action=review > Source/WebCore/loader/MainResourceLoader.cpp:270 > - && !m_substituteData.isValid() && !url.isLocalFile(); > + && !m_substituteData.isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(url); Sorry, I gave you a bad review. This function just take the scheme, not the whole URL: http://trac.webkit.org/browser/trunk/Source/WebCore/platform/SchemeRegistry.cpp#L167 626156 13 abarth 2012-05-16 19:26:54 -0700 > How does the change to MainResourceLoader::continueAfterContentPolicy affect WebArchives? It should make it possible to load web archives from all "local" URLs, not just file URLs. Normally, "file" is the only local URL scheme, but embedders can add other URL schemes that they want to work the same way as file URLs. 626609 14 142093 gspencer 2012-05-17 08:42:18 -0700 Comment on attachment 142093 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142093&action=review >> Source/WebCore/loader/MainResourceLoader.cpp:270 >> + && !m_substituteData.isValid() && !SchemeRegistry::shouldTreatURLSchemeAsLocal(url); > > Sorry, I gave you a bad review. This function just take the scheme, not the whole URL: > > http://trac.webkit.org/browser/trunk/Source/WebCore/platform/SchemeRegistry.cpp#L167 Heh. No, you didn't give me a bad review, I gave you bad code. Clearly I should have run more of the test suite. I'll upload a new patch today. 626720 15 ap 2012-05-17 10:56:09 -0700 WebArchive behavior change makes me nervous, because these are always dangerous, and I don't understand our local schemes well enough. Perhaps Brady or Jessie could ponder whether it's safe. 626754 16 abarth 2012-05-17 11:29:59 -0700 (In reply to comment #15) > WebArchive behavior change makes me nervous, because these are always dangerous, and I don't understand our local schemes well enough. Perhaps Brady or Jessie could ponder whether it's safe. One easy way to determine whether it's safe is to look at the list of schemes Safari registers as local. I suspect it's just "file" and possibly a scheme for error pages (which won't have any WebArchive resources). 626916 17 142540 gspencer 2012-05-17 13:41:55 -0700 Created attachment 142540 Patch 626964 18 gspencer 2012-05-17 14:14:08 -0700 OK, the latest patch should do the right thing, and the chromium browser tests that failed before are passing now (locally on my machine at least). 627029 19 abarth 2012-05-17 15:11:47 -0700 (In reply to comment #18) > OK, the latest patch should do the right thing, and the chromium browser tests that failed before are passing now (locally on my machine at least). Have we resolved Alexey's concern? To follow the approach in Comment #16, you can just build a debug version of the apple-mac port and set a breakpoint in the function that registers local schemes. If you run that WebKit DLL in Safari, that will let us see what all Safari is registering 627043 20 gspencer 2012-05-17 15:22:52 -0700 (In reply to comment #19) > Have we resolved Alexey's concern? To follow the approach in Comment #16, > you can just build a debug version of the apple-mac port and set a > breakpoint in the function that registers local schemes. If you run that > WebKit DLL in Safari, that will let us see what all Safari is registering Well, but that would mean I would have to have a mac with XCode and know how to build the apple-mac version of WebKit. :-) I can learn how to do that, but it'll take me a day or two to set up. 627060 21 abarth 2012-05-17 15:38:13 -0700 If you remind me on Monday, I'd be happy to run that experiment for you. (I'm currently traveling and don't have a build environment.) 627820 22 jberlin 2012-05-18 11:07:49 -0700 (In reply to comment #16) > (In reply to comment #15) > > WebArchive behavior change makes me nervous, because these are always dangerous, and I don't understand our local schemes well enough. Perhaps Brady or Jessie could ponder whether it's safe. > > One easy way to determine whether it's safe is to look at the list of schemes Safari registers as local. I suspect it's just "file" and possibly a scheme for error pages (which won't have any WebArchive resources). I checked, and this is not a concern for Safari. 627856 23 abarth 2012-05-18 11:35:25 -0700 Thanks Jessie. 627864 24 142540 abarth 2012-05-18 11:39:51 -0700 Comment on attachment 142540 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=142540&action=review > Source/WebCore/loader/archive/mhtml/MHTMLArchive.cpp:106 > // For security reasons we only load MHTML pages from the local file system. I'd change this comment slightly to say "from local URLs" rather than "from the local file system". 627883 25 142756 gspencer 2012-05-18 11:56:42 -0700 Created attachment 142756 Patch 627884 26 gspencer 2012-05-18 11:57:31 -0700 (In reply to comment #24) > I'd change this comment slightly to say "from local URLs" rather than "from the local file system". OK, done. 632959 27 gspencer 2012-05-24 11:09:01 -0700 Adam, is there anything else I need to do to commit this? (your "review+" doesn't seem to have done it, and I'm not familiar enough with WebKit submissions to know what's missing). 633005 28 ap 2012-05-24 11:39:22 -0700 As described in <http://www.webkit.org/coding/contributing.html>, please set "commit-queue?" flag. 633010 29 142756 abarth 2012-05-24 11:42:38 -0700 Comment on attachment 142756 Patch As ap says, you can set the commit-queue? flag to ask folks to mark your patch for commit. 633048 30 142756 webkit.review.bot 2012-05-24 12:26:51 -0700 Comment on attachment 142756 Patch Clearing flags on attachment: 142756 Committed r118402: <http://trac.webkit.org/changeset/118402> 633049 31 webkit.review.bot 2012-05-24 12:26:58 -0700 All reviewed patches have been landed. Closing bug. 142088 2012-05-15 15:57:35 -0700 2012-05-15 16:04:56 -0700 A proposed patch mhtml_fix.patch text/plain 1975 gspencer ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNzE1 YTRiYS4uMGUwZGFjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNv dXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5jcHAKQEAgLTI2Nyw3ICsyNjcsNyBAQCB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6Y29u dGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIGNvbnRlbnRQb2xpY3ksCiAgICAg Y2FzZSBQb2xpY3lVc2U6IHsKICAgICAgICAgLy8gUHJldmVudCByZW1vdGUgd2ViIGFyY2hpdmVz IGZyb20gbG9hZGluZyBiZWNhdXNlIHRoZXkgY2FuIGNsYWltIHRvIGJlIGZyb20gYW55IGRvbWFp biBhbmQgdGh1cyBhdm9pZCBjcm9zcy1kb21haW4gc2VjdXJpdHkgY2hlY2tzICg0MTIwMjU1KS4K ICAgICAgICAgYm9vbCBpc1JlbW90ZVdlYkFyY2hpdmUgPSAoZXF1YWxJZ25vcmluZ0Nhc2UoImFw cGxpY2F0aW9uL3gtd2ViYXJjaGl2ZSIsIG1pbWVUeXBlKSB8fCBlcXVhbElnbm9yaW5nQ2FzZSgi bXVsdGlwYXJ0L3JlbGF0ZWQiLCBtaW1lVHlwZSkpCi0gICAgICAgICAgICAmJiAhbV9zdWJzdGl0 dXRlRGF0YS5pc1ZhbGlkKCkgJiYgIXVybC5pc0xvY2FsRmlsZSgpOworICAgICAgICAgICAgJiYg IW1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpICYmICFTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJl YXRVUkxTY2hlbWVBc0xvY2FsKHVybCk7CiAgICAgICAgIGlmICghZnJhbWVMb2FkZXIoKS0+Y2xp ZW50KCktPmNhblNob3dNSU1FVHlwZShtaW1lVHlwZSkgfHwgaXNSZW1vdGVXZWJBcmNoaXZlKSB7 CiAgICAgICAgICAgICBmcmFtZUxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPmNhbm5vdFNob3dN SU1FVHlwZShyKTsKICAgICAgICAgICAgIC8vIENoZWNrIHJlYWNoZWRUZXJtaW5hbFN0YXRlIHNp bmNlIHRoZSBsb2FkIG1heSBoYXZlIGFscmVhZHkgYmVlbiBjYW5jZWxsZWQgaW5zaWRlIG9mIF9o YW5kbGVVbmltcGxlbWVudGFibGVQb2xpY3lXaXRoRXJyb3JDb2RlOjouCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcAppbmRleCBj Yzg1NDQ1Li5hZWIzMzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2 ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9hcmNo aXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNsdWRlICJQ YWdlLmgiCiAjaW5jbHVkZSAiUGFnZVNlcmlhbGl6ZXIuaCIKICNpbmNsdWRlICJRdW90ZWRQcmlu dGFibGUuaCIKKyNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1 ZmZlci5oIgogCiAjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVtYmVyLmg+ CkBAIC0xMDMsNyArMTA0LDcgQEAgUGFzc1JlZlB0cjxNSFRNTEFyY2hpdmU+IE1IVE1MQXJjaGl2 ZTo6Y3JlYXRlKCkKIFBhc3NSZWZQdHI8TUhUTUxBcmNoaXZlPiBNSFRNTEFyY2hpdmU6OmNyZWF0 ZShjb25zdCBLVVJMJiB1cmwsIFNoYXJlZEJ1ZmZlciogZGF0YSkKIHsKICAgICAvLyBGb3Igc2Vj dXJpdHkgcmVhc29ucyB3ZSBvbmx5IGxvYWQgTUhUTUwgcGFnZXMgZnJvbSB0aGUgbG9jYWwgZmls ZSBzeXN0ZW0uCi0gICAgaWYgKCF1cmwuaXNMb2NhbEZpbGUoKSkKKyAgICBpZiAoIVNjaGVtZVJl Z2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodXJsKSkKICAgICAgICAgcmV0dXJu IDA7CiAKICAgICBNSFRNTFBhcnNlciBwYXJzZXIoZGF0YSk7Cg== 142089 2012-05-15 16:04:58 -0700 2012-05-15 16:23:19 -0700 Patch bug-86540-20120515160457.patch text/plain 2962 gspencer U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc3ZjFhNTI1Y2Q0ODBj ZTdmNjliZWE4ODFmYTRiODZiNWEyYjNjNS4uMzU5ODFiNWQ2ZTIxY2I5Y2EzYjE3NTE0MWU5YWQ4 ZTk0MmY1YTM5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTE1ICBHcmVn IFNwZW5jZXIgIDxnc3BlbmNlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTUhUTUwgZmlsZXMg c2hvdWxkIGJlIGxvYWRhYmxlIGZyb20gYWxsIHNjaGVtZXMgY29uc2lkZXJlZCBsb2NhbCwKKyAg ICAgICAgbm90IGp1c3QgZmlsZToKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODY1NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIGxvYWRlci9N YWluUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9h ZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGljeSk6CisgICAgICAgICogbG9hZGVyL2FyY2hp dmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1IVE1MQXJjaGl2 ZTo6Y3JlYXRlKToKKwogMjAxMi0wNS0xMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJv dEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExNjgwMi4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNzE1 YTRiYTg5ODhlOTE2MWNjMjdiNWU5NDYwNmQwMTk3MTFkZDNiZi4uMGUwZGFjNGU5ODlmMzA5YmY1 YzVhNTg0NjVmNWYzODU3MTRlZjNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVy L01haW5SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5S ZXNvdXJjZUxvYWRlci5jcHAKQEAgLTI2Nyw3ICsyNjcsNyBAQCB2b2lkIE1haW5SZXNvdXJjZUxv YWRlcjo6Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIGNvbnRlbnRQb2xp Y3ksCiAgICAgY2FzZSBQb2xpY3lVc2U6IHsKICAgICAgICAgLy8gUHJldmVudCByZW1vdGUgd2Vi IGFyY2hpdmVzIGZyb20gbG9hZGluZyBiZWNhdXNlIHRoZXkgY2FuIGNsYWltIHRvIGJlIGZyb20g YW55IGRvbWFpbiBhbmQgdGh1cyBhdm9pZCBjcm9zcy1kb21haW4gc2VjdXJpdHkgY2hlY2tzICg0 MTIwMjU1KS4KICAgICAgICAgYm9vbCBpc1JlbW90ZVdlYkFyY2hpdmUgPSAoZXF1YWxJZ25vcmlu Z0Nhc2UoImFwcGxpY2F0aW9uL3gtd2ViYXJjaGl2ZSIsIG1pbWVUeXBlKSB8fCBlcXVhbElnbm9y aW5nQ2FzZSgibXVsdGlwYXJ0L3JlbGF0ZWQiLCBtaW1lVHlwZSkpCi0gICAgICAgICAgICAmJiAh bV9zdWJzdGl0dXRlRGF0YS5pc1ZhbGlkKCkgJiYgIXVybC5pc0xvY2FsRmlsZSgpOworICAgICAg ICAgICAgJiYgIW1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpICYmICFTY2hlbWVSZWdpc3RyeTo6 c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKHVybCk7CiAgICAgICAgIGlmICghZnJhbWVMb2Fk ZXIoKS0+Y2xpZW50KCktPmNhblNob3dNSU1FVHlwZShtaW1lVHlwZSkgfHwgaXNSZW1vdGVXZWJB cmNoaXZlKSB7CiAgICAgICAgICAgICBmcmFtZUxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPmNh bm5vdFNob3dNSU1FVHlwZShyKTsKICAgICAgICAgICAgIC8vIENoZWNrIHJlYWNoZWRUZXJtaW5h bFN0YXRlIHNpbmNlIHRoZSBsb2FkIG1heSBoYXZlIGFscmVhZHkgYmVlbiBjYW5jZWxsZWQgaW5z aWRlIG9mIF9oYW5kbGVVbmltcGxlbWVudGFibGVQb2xpY3lXaXRoRXJyb3JDb2RlOjouCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNw cAppbmRleCBjYzg1NDQ1YTg2YmVkOGY0Y2YyNmJhMzk3MjZhN2M3NTliNmIyOTIwLi5hZWIzMzg4 Yzg2YWFiMDE0OTU4NTMxMjhlZDMwYzg2NDBkMWIyYjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKQEAgLTQxLDYgKzQx LDcgQEAKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFnZVNlcmlhbGl6ZXIuaCIKICNp bmNsdWRlICJRdW90ZWRQcmludGFibGUuaCIKKyNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgog I2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogCiAjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNh bGx5UmFuZG9tTnVtYmVyLmg+CkBAIC0xMDMsNyArMTA0LDcgQEAgUGFzc1JlZlB0cjxNSFRNTEFy Y2hpdmU+IE1IVE1MQXJjaGl2ZTo6Y3JlYXRlKCkKIFBhc3NSZWZQdHI8TUhUTUxBcmNoaXZlPiBN SFRNTEFyY2hpdmU6OmNyZWF0ZShjb25zdCBLVVJMJiB1cmwsIFNoYXJlZEJ1ZmZlciogZGF0YSkK IHsKICAgICAvLyBGb3Igc2VjdXJpdHkgcmVhc29ucyB3ZSBvbmx5IGxvYWQgTUhUTUwgcGFnZXMg ZnJvbSB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0uCi0gICAgaWYgKCF1cmwuaXNMb2NhbEZpbGUoKSkK KyAgICBpZiAoIVNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodXJs KSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBNSFRNTFBhcnNlciBwYXJzZXIoZGF0YSk7Cg== 142093 2012-05-15 16:23:22 -0700 2012-05-17 13:41:52 -0700 Patch bug-86540-20120515162321.patch text/plain 3007 gspencer U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzc3ZjFhNTI1Y2Q0ODBj ZTdmNjliZWE4ODFmYTRiODZiNWEyYjNjNS4uMWNjMjNjNGU4NTU3MjNmZmY1YjAwZjNkNGNlZTYz ZTJmMzcxYTk3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTE1ICBHcmVn IFNwZW5jZXIgIDxnc3BlbmNlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTUhUTUwgZmlsZXMg c2hvdWxkIGJlIGxvYWRhYmxlIGZyb20gYWxsIHNjaGVtZXMgY29uc2lkZXJlZCBsb2NhbCwKKyAg ICAgICAgbm90IGp1c3QgZmlsZToKKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODY1NDAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDdXJyZW50IHRlc3RzIHNob3VsZCBhc3N1cmUgdGhhdCBsb2FkaW5nIGlz IHN0aWxsIGFsbG93ZWQgbG9jYWxseS4KKworICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpjb250aW51 ZUFmdGVyQ29udGVudFBvbGljeSk6CisgICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhU TUxBcmNoaXZlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Y3JlYXRlKToK KwogMjAxMi0wNS0xMSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExNjgwMi4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggNzE1YTRiYTg5ODhlOTE2 MWNjMjdiNWU5NDYwNmQwMTk3MTFkZDNiZi4uMGUwZGFjNGU5ODlmMzA5YmY1YzVhNTg0NjVmNWYz ODU3MTRlZjNkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRl ci5jcHAKQEAgLTI2Nyw3ICsyNjcsNyBAQCB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6Y29udGlu dWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIGNvbnRlbnRQb2xpY3ksCiAgICAgY2Fz ZSBQb2xpY3lVc2U6IHsKICAgICAgICAgLy8gUHJldmVudCByZW1vdGUgd2ViIGFyY2hpdmVzIGZy b20gbG9hZGluZyBiZWNhdXNlIHRoZXkgY2FuIGNsYWltIHRvIGJlIGZyb20gYW55IGRvbWFpbiBh bmQgdGh1cyBhdm9pZCBjcm9zcy1kb21haW4gc2VjdXJpdHkgY2hlY2tzICg0MTIwMjU1KS4KICAg ICAgICAgYm9vbCBpc1JlbW90ZVdlYkFyY2hpdmUgPSAoZXF1YWxJZ25vcmluZ0Nhc2UoImFwcGxp Y2F0aW9uL3gtd2ViYXJjaGl2ZSIsIG1pbWVUeXBlKSB8fCBlcXVhbElnbm9yaW5nQ2FzZSgibXVs dGlwYXJ0L3JlbGF0ZWQiLCBtaW1lVHlwZSkpCi0gICAgICAgICAgICAmJiAhbV9zdWJzdGl0dXRl RGF0YS5pc1ZhbGlkKCkgJiYgIXVybC5pc0xvY2FsRmlsZSgpOworICAgICAgICAgICAgJiYgIW1f c3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpICYmICFTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRV UkxTY2hlbWVBc0xvY2FsKHVybCk7CiAgICAgICAgIGlmICghZnJhbWVMb2FkZXIoKS0+Y2xpZW50 KCktPmNhblNob3dNSU1FVHlwZShtaW1lVHlwZSkgfHwgaXNSZW1vdGVXZWJBcmNoaXZlKSB7CiAg ICAgICAgICAgICBmcmFtZUxvYWRlcigpLT5wb2xpY3lDaGVja2VyKCktPmNhbm5vdFNob3dNSU1F VHlwZShyKTsKICAgICAgICAgICAgIC8vIENoZWNrIHJlYWNoZWRUZXJtaW5hbFN0YXRlIHNpbmNl IHRoZSBsb2FkIG1heSBoYXZlIGFscmVhZHkgYmVlbiBjYW5jZWxsZWQgaW5zaWRlIG9mIF9oYW5k bGVVbmltcGxlbWVudGFibGVQb2xpY3lXaXRoRXJyb3JDb2RlOjouCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcAppbmRleCBjYzg1 NDQ1YTg2YmVkOGY0Y2YyNmJhMzk3MjZhN2M3NTliNmIyOTIwLi5hZWIzMzg4Yzg2YWFiMDE0OTU4 NTMxMjhlZDMwYzg2NDBkMWIyYjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv YXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKQEAgLTQxLDYgKzQxLDcgQEAKICNpbmNs dWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFnZVNlcmlhbGl6ZXIuaCIKICNpbmNsdWRlICJRdW90 ZWRQcmludGFibGUuaCIKKyNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgogI2luY2x1ZGUgIlNo YXJlZEJ1ZmZlci5oIgogCiAjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNhbGx5UmFuZG9tTnVt YmVyLmg+CkBAIC0xMDMsNyArMTA0LDcgQEAgUGFzc1JlZlB0cjxNSFRNTEFyY2hpdmU+IE1IVE1M QXJjaGl2ZTo6Y3JlYXRlKCkKIFBhc3NSZWZQdHI8TUhUTUxBcmNoaXZlPiBNSFRNTEFyY2hpdmU6 OmNyZWF0ZShjb25zdCBLVVJMJiB1cmwsIFNoYXJlZEJ1ZmZlciogZGF0YSkKIHsKICAgICAvLyBG b3Igc2VjdXJpdHkgcmVhc29ucyB3ZSBvbmx5IGxvYWQgTUhUTUwgcGFnZXMgZnJvbSB0aGUgbG9j YWwgZmlsZSBzeXN0ZW0uCi0gICAgaWYgKCF1cmwuaXNMb2NhbEZpbGUoKSkKKyAgICBpZiAoIVNj aGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodXJsKSkKICAgICAgICAg cmV0dXJuIDA7CiAKICAgICBNSFRNTFBhcnNlciBwYXJzZXIoZGF0YSk7Cg== 142540 2012-05-17 13:41:55 -0700 2012-05-18 11:56:32 -0700 Patch bug-86540-20120517134154.patch text/plain 3289 gspencer U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjRjMmEzM2ZkZGM1MmJi N2YzMDdkNGYzMDkyNWU1Y2MwODk2ZTQxMS4uMDdhY2YwZTdiODk3MjlkZTNhYTQwNTVkMDc1NjUw YmMxNzY5NDllZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTE3ICBHcmVn IFNwZW5jZXIgIDxnc3BlbmNlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTUhUTUwgZmlsZXMg c2hvdWxkIGJlIGxvYWRhYmxlIGZyb20gYWxsIHNjaGVtZXMgY29uc2lkZXJlZCBsb2NhbCwKKyAg ICAgICAgbm90IGp1c3QgImZpbGU6IgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjU0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEV4aXN0aW5nIHRlc3RzIHNob3VsZCB2ZXJpZnkgY29ycmVjdCBmdW5j dGlvbi4KKworICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGlj eSk6CisgICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Y3JlYXRlKToKKwogMjAxMi0wNS0xNyAgUGF2 ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVj dG9yOiBjcmVhdGUgU291cmNlRnJhbWVzIHdpdGggY29udGVudCBwcm92aWRlcnMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGRjOTM0NjBiM2Rk ZjQxODc0MjdhNzA3YWY5ZmY3OTFjM2FkZTE5OTEuLjA1YjQ3MjdmNWQ1ODA2ZjMyNjQ2OWY0YTYz YWQyM2IzMzRkN2VlNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVz b3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC0yNjcsMTAgKzI2NywxMCBAQCB2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6 Y29udGludWVBZnRlckNvbnRlbnRQb2xpY3koUG9saWN5QWN0aW9uIGNvbnRlbnRQb2xpY3ksCiAg ICAgY2FzZSBQb2xpY3lVc2U6IHsKICAgICAgICAgLy8gUHJldmVudCByZW1vdGUgd2ViIGFyY2hp dmVzIGZyb20gbG9hZGluZyBiZWNhdXNlIHRoZXkgY2FuIGNsYWltIHRvIGJlIGZyb20gYW55IGRv bWFpbiBhbmQgdGh1cyBhdm9pZCBjcm9zcy1kb21haW4gc2VjdXJpdHkgY2hlY2tzICg0MTIwMjU1 KS4KICAgICAgICAgYm9vbCBpc1JlbW90ZVdlYkFyY2hpdmUgPSAoZXF1YWxJZ25vcmluZ0Nhc2Uo ImFwcGxpY2F0aW9uL3gtd2ViYXJjaGl2ZSIsIG1pbWVUeXBlKSB8fCBlcXVhbElnbm9yaW5nQ2Fz ZSgibXVsdGlwYXJ0L3JlbGF0ZWQiLCBtaW1lVHlwZSkpCi0gICAgICAgICAgICAmJiAhbV9zdWJz dGl0dXRlRGF0YS5pc1ZhbGlkKCkgJiYgIXVybC5pc0xvY2FsRmlsZSgpOworICAgICAgICAgICAg JiYgIW1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpICYmICFTY2hlbWVSZWdpc3RyeTo6c2hvdWxk VHJlYXRVUkxTY2hlbWVBc0xvY2FsKHVybC5wcm90b2NvbCgpKTsKICAgICAgICAgaWYgKCFmcmFt ZUxvYWRlcigpLT5jbGllbnQoKS0+Y2FuU2hvd01JTUVUeXBlKG1pbWVUeXBlKSB8fCBpc1JlbW90 ZVdlYkFyY2hpdmUpIHsKICAgICAgICAgICAgIGZyYW1lTG9hZGVyKCktPnBvbGljeUNoZWNrZXIo KS0+Y2Fubm90U2hvd01JTUVUeXBlKHIpOwotICAgICAgICAgICAgLy8gQ2hlY2sgcmVhY2hlZFRl cm1pbmFsU3RhdGUgc2luY2UgdGhlIGxvYWQgbWF5IGhhdmUgYWxyZWFkeSBiZWVuIGNhbmNlbGxl ZCBpbnNpZGUgb2YgX2hhbmRsZVVuaW1wbGVtZW50YWJsZVBvbGljeVdpdGhFcnJvckNvZGU6Oi4K KyAgICAgICAgICAgIC8vIENoZWNrIHJlYWNoZWRUZXJtaW5hbFN0YXRlIHNpbmNlIHRoZSBsb2Fk IG1heSBoYXZlIGFscmVhZHkgYmVlbiBjYW5jZWxlZCBpbnNpZGUgb2YgX2hhbmRsZVVuaW1wbGVt ZW50YWJsZVBvbGljeVdpdGhFcnJvckNvZGU6Oi4KICAgICAgICAgICAgIGlmICghcmVhY2hlZFRl cm1pbmFsU3RhdGUoKSkKICAgICAgICAgICAgICAgICBzdG9wTG9hZGluZ0ZvclBvbGljeUNoYW5n ZSgpOwogICAgICAgICAgICAgcmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9h ZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKaW5kZXggY2M4NTQ0NWE4NmJlZDhmNGNm MjZiYTM5NzI2YTdjNzU5YjZiMjkyMC4uNDliMGRkOWE4ZmM5NWNiYzE1MGE4MzQ4MDFhMzM0YWY3 OTI4MTYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwv TUhUTUxBcmNoaXZlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRt bC9NSFRNTEFyY2hpdmUuY3BwCkBAIC00MSw2ICs0MSw3IEBACiAjaW5jbHVkZSAiUGFnZS5oIgog I2luY2x1ZGUgIlBhZ2VTZXJpYWxpemVyLmgiCiAjaW5jbHVkZSAiUXVvdGVkUHJpbnRhYmxlLmgi CisjaW5jbHVkZSAiU2NoZW1lUmVnaXN0cnkuaCIKICNpbmNsdWRlICJTaGFyZWRCdWZmZXIuaCIK IAogI2luY2x1ZGUgPHd0Zi9DcnlwdG9ncmFwaGljYWxseVJhbmRvbU51bWJlci5oPgpAQCAtMTAz LDcgKzEwNCw3IEBAIFBhc3NSZWZQdHI8TUhUTUxBcmNoaXZlPiBNSFRNTEFyY2hpdmU6OmNyZWF0 ZSgpCiBQYXNzUmVmUHRyPE1IVE1MQXJjaGl2ZT4gTUhUTUxBcmNoaXZlOjpjcmVhdGUoY29uc3Qg S1VSTCYgdXJsLCBTaGFyZWRCdWZmZXIqIGRhdGEpCiB7CiAgICAgLy8gRm9yIHNlY3VyaXR5IHJl YXNvbnMgd2Ugb25seSBsb2FkIE1IVE1MIHBhZ2VzIGZyb20gdGhlIGxvY2FsIGZpbGUgc3lzdGVt LgotICAgIGlmICghdXJsLmlzTG9jYWxGaWxlKCkpCisgICAgaWYgKCFTY2hlbWVSZWdpc3RyeTo6 c2hvdWxkVHJlYXRVUkxTY2hlbWVBc0xvY2FsKHVybC5wcm90b2NvbCgpKSkKICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICBNSFRNTFBhcnNlciBwYXJzZXIoZGF0YSk7Cg== 142756 2012-05-18 11:56:42 -0700 2012-05-24 12:26:51 -0700 Patch bug-86540-20120518115640.patch text/plain 3445 gspencer U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAzZDU2Y2IwYjEwNzQ3 YjBmZDVkMzNjMWQ2OWU5NjliNDc2M2E0ZC4uZDM0NGY0MDhlNGQ2NDM5MzQ3NjNlMDc2MjM1YmM0 NTNkZmRkZWNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1LTE4ICBHcmVn IFNwZW5jZXIgIDxnc3BlbmNlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTUhUTUwgZmlsZXMg c2hvdWxkIGJlIGxvYWRhYmxlIGZyb20gYWxsIHNjaGVtZXMgY29uc2lkZXJlZCBsb2NhbCwKKyAg ICAgICAgbm90IGp1c3QgImZpbGU6IgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04NjU0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEV4aXN0aW5nIHRlc3RzIHNob3VsZCB2ZXJpZnkgY29ycmVjdCBmdW5j dGlvbi4KKworICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGlj eSk6CisgICAgICAgICogbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Ok1IVE1MQXJjaGl2ZTo6Y3JlYXRlKToKKwogMjAxMi0wNS0xOCAgQWxl eGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IGVtcHR5IENTUyBEZWNsYXJhdGlvbiBpcyBnZW5lcmF0ZWQgYnkgY2xpY2tpbmcgdGhl IGxlZnQgc3BhY2Ugb2YgJ3VzZXIgYWdlbnQgc3R5bGVzaGVldCcgb24gU3R5bGVzIHNpZGViYXIg b2YgRWxlbWVudHMgcGFuZWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWlu UmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxv YWRlci5jcHAKaW5kZXggZGM5MzQ2MGIzZGRmNDE4NzQyN2E3MDdhZjlmZjc5MWMzYWRlMTk5MS4u MDViNDcyN2Y1ZDU4MDZmMzI2NDY5ZjRhNjNhZDIzYjMzNGQ3ZWU1MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKQEAgLTI2NywxMCArMjY3LDEwIEBA IHZvaWQgTWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGljeShQb2xp Y3lBY3Rpb24gY29udGVudFBvbGljeSwKICAgICBjYXNlIFBvbGljeVVzZTogewogICAgICAgICAv LyBQcmV2ZW50IHJlbW90ZSB3ZWIgYXJjaGl2ZXMgZnJvbSBsb2FkaW5nIGJlY2F1c2UgdGhleSBj YW4gY2xhaW0gdG8gYmUgZnJvbSBhbnkgZG9tYWluIGFuZCB0aHVzIGF2b2lkIGNyb3NzLWRvbWFp biBzZWN1cml0eSBjaGVja3MgKDQxMjAyNTUpLgogICAgICAgICBib29sIGlzUmVtb3RlV2ViQXJj aGl2ZSA9IChlcXVhbElnbm9yaW5nQ2FzZSgiYXBwbGljYXRpb24veC13ZWJhcmNoaXZlIiwgbWlt ZVR5cGUpIHx8IGVxdWFsSWdub3JpbmdDYXNlKCJtdWx0aXBhcnQvcmVsYXRlZCIsIG1pbWVUeXBl KSkKLSAgICAgICAgICAgICYmICFtX3N1YnN0aXR1dGVEYXRhLmlzVmFsaWQoKSAmJiAhdXJsLmlz TG9jYWxGaWxlKCk7CisgICAgICAgICAgICAmJiAhbV9zdWJzdGl0dXRlRGF0YS5pc1ZhbGlkKCkg JiYgIVNjaGVtZVJlZ2lzdHJ5OjpzaG91bGRUcmVhdFVSTFNjaGVtZUFzTG9jYWwodXJsLnByb3Rv Y29sKCkpOwogICAgICAgICBpZiAoIWZyYW1lTG9hZGVyKCktPmNsaWVudCgpLT5jYW5TaG93TUlN RVR5cGUobWltZVR5cGUpIHx8IGlzUmVtb3RlV2ViQXJjaGl2ZSkgewogICAgICAgICAgICAgZnJh bWVMb2FkZXIoKS0+cG9saWN5Q2hlY2tlcigpLT5jYW5ub3RTaG93TUlNRVR5cGUocik7Ci0gICAg ICAgICAgICAvLyBDaGVjayByZWFjaGVkVGVybWluYWxTdGF0ZSBzaW5jZSB0aGUgbG9hZCBtYXkg aGF2ZSBhbHJlYWR5IGJlZW4gY2FuY2VsbGVkIGluc2lkZSBvZiBfaGFuZGxlVW5pbXBsZW1lbnRh YmxlUG9saWN5V2l0aEVycm9yQ29kZTo6LgorICAgICAgICAgICAgLy8gQ2hlY2sgcmVhY2hlZFRl cm1pbmFsU3RhdGUgc2luY2UgdGhlIGxvYWQgbWF5IGhhdmUgYWxyZWFkeSBiZWVuIGNhbmNlbGVk IGluc2lkZSBvZiBfaGFuZGxlVW5pbXBsZW1lbnRhYmxlUG9saWN5V2l0aEVycm9yQ29kZTo6Lgog ICAgICAgICAgICAgaWYgKCFyZWFjaGVkVGVybWluYWxTdGF0ZSgpKQogICAgICAgICAgICAgICAg IHN0b3BMb2FkaW5nRm9yUG9saWN5Q2hhbmdlKCk7CiAgICAgICAgICAgICByZXR1cm47CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUu Y3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2FyY2hpdmUvbWh0bWwvTUhUTUxBcmNoaXZlLmNw cAppbmRleCBjYzg1NDQ1YTg2YmVkOGY0Y2YyNmJhMzk3MjZhN2M3NTliNmIyOTIwLi5iOTk2ZjJk NGJiZGYxMGIwOGQ2YzU0M2E2Y2FmNTEyZWIxMmY5NmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvYXJjaGl2ZS9taHRtbC9NSFRNTEFyY2hpdmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9hcmNoaXZlL21odG1sL01IVE1MQXJjaGl2ZS5jcHAKQEAgLTQxLDYgKzQx LDcgQEAKICNpbmNsdWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGFnZVNlcmlhbGl6ZXIuaCIKICNp bmNsdWRlICJRdW90ZWRQcmludGFibGUuaCIKKyNpbmNsdWRlICJTY2hlbWVSZWdpc3RyeS5oIgog I2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5oIgogCiAjaW5jbHVkZSA8d3RmL0NyeXB0b2dyYXBoaWNh bGx5UmFuZG9tTnVtYmVyLmg+CkBAIC0xMDIsOCArMTAzLDggQEAgUGFzc1JlZlB0cjxNSFRNTEFy Y2hpdmU+IE1IVE1MQXJjaGl2ZTo6Y3JlYXRlKCkKIAogUGFzc1JlZlB0cjxNSFRNTEFyY2hpdmU+ IE1IVE1MQXJjaGl2ZTo6Y3JlYXRlKGNvbnN0IEtVUkwmIHVybCwgU2hhcmVkQnVmZmVyKiBkYXRh KQogewotICAgIC8vIEZvciBzZWN1cml0eSByZWFzb25zIHdlIG9ubHkgbG9hZCBNSFRNTCBwYWdl cyBmcm9tIHRoZSBsb2NhbCBmaWxlIHN5c3RlbS4KLSAgICBpZiAoIXVybC5pc0xvY2FsRmlsZSgp KQorICAgIC8vIEZvciBzZWN1cml0eSByZWFzb25zIHdlIG9ubHkgbG9hZCBNSFRNTCBwYWdlcyBm cm9tIGxvY2FsIFVSTHMuCisgICAgaWYgKCFTY2hlbWVSZWdpc3RyeTo6c2hvdWxkVHJlYXRVUkxT Y2hlbWVBc0xvY2FsKHVybC5wcm90b2NvbCgpKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICBN SFRNTFBhcnNlciBwYXJzZXIoZGF0YSk7Cg==