92189 2012-07-24 18:06:55 -0700 Disabling eval changes the timing of DidCreateScriptContext 2012-08-03 21:09:04 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93079 1 abarth abarth ap beidson eric haraken japhet jochen johnjbarton mihaip webkit.review.bot oldest_to_newest 677461 0 abarth 2012-07-24 18:06:55 -0700 See http://code.google.com/p/chromium/issues/detail?id=130200 Comment 15 by mihaip@chromium.org, Today (21 minutes ago) Specifically, here's how DidCreateScriptContext is invoked when eval is allowed: ExtensionDispatcher::DidCreateScriptContext() [0x7f77a03b81fd] chrome::ChromeContentRendererClient::DidCreateScriptContext() [0x7f77a030fc50] RenderViewImpl::didCreateScriptContext() [0x7f7794e83480] WebKit::FrameLoaderClientImpl::didCreateScriptContext() [0x7f7797efc72e] WebCore::V8DOMWindowShell::initContextIfNeeded() [0x7f779923424d] WebCore::V8Proxy::mainWorldContext() [0x7f779924f9ac] WebCore::V8Proxy::mainWorldContext() [0x7f779924fbc1] WebCore::ScriptController::evaluate() [0x7f7799200a4e] WebCore::ScriptElement::executeScript() [0x7f7798acd5a0] WebCore::HTMLScriptRunner::executePendingScriptAndDispatchEvent() [0x7f7799982f3f] WebCore::HTMLScriptRunner::executeParsingBlockingScript() [0x7f7799982d92] WebCore::HTMLScriptRunner::executeParsingBlockingScripts() [0x7f77999832be] WebCore::HTMLScriptRunner::executeScriptsWaitingForLoad() [0x7f779998345c] WebCore::HTMLDocumentParser::notifyFinished() [0x7f77999763d5] WebCore::CachedResource::checkNotify() [0x7f7799650a1a] WebCore::CachedScript::data() [0x7f77996626cb] WebCore::SubresourceLoader::didFinishLoading() [0x7f7799633b59] WebCore::ResourceLoader::didFinishLoading() [0x7f779962f2f9] WebCore::ResourceHandleInternal::didFinishLoading() [0x7f779904ee46] webkit_glue::WebURLLoaderImpl::Context::OnCompletedRequest() [0x7f779e28ee36] content::ResourceDispatcher::OnRequestComplete() [0x7f7794d7f1b0] .... And when it's not: ExtensionDispatcher::DidCreateScriptContext() [0x7f7096cbd1fd] chrome::ChromeContentRendererClient::DidCreateScriptContext() [0x7f7096c14c50] RenderViewImpl::didCreateScriptContext() [0x7f708b788480] WebKit::FrameLoaderClientImpl::didCreateScriptContext() [0x7f708e80172e] WebCore::V8DOMWindowShell::initContextIfNeeded() [0x7f708fb3924d] WebCore::ScriptController::disableEval() [0x7f708fb05f93] WebCore::Document::disableEval() [0x7f708f31104c] WebCore::CSPDirectiveList::create() [0x7f708ff78c71] WebCore::ContentSecurityPolicy::didReceiveHeader() [0x7f708ff7bb13] WebCore::FrameLoader::didBeginDocument() [0x7f708ff03253] WebCore::DocumentWriter::begin() [0x7f708fef684d] WebCore::DocumentLoader::commitData() [0x7f708fee6c2f] WebKit::WebFrameImpl::commitDocumentData() [0x7f708e860e52] WebKit::FrameLoaderClientImpl::committedLoad() [0x7f708e804a87] WebCore::DocumentLoader::commitLoad() [0x7f708fee6b6c] WebCore::DocumentLoader::receivedData() [0x7f708fee706b] WebCore::MainResourceLoader::addData() [0x7f708ff1eb97] WebCore::ResourceLoader::didReceiveData() [0x7f708ff339cb] WebCore::MainResourceLoader::didReceiveData() [0x7f708ff20044] WebCore::ResourceLoader::didReceiveData() [0x7f708ff342b3] WebCore::ResourceHandleInternal::didReceiveData() [0x7f708f953c7e] webkit_glue::WebURLLoaderImpl::Context::OnReceivedData() [0x7f7094b93a4c] content::ResourceDispatcher::OnReceivedData() [0x7f708b683d83] .... 679065 1 abarth 2012-07-26 02:06:03 -0700 This is on my list for Thursday. 679752 2 154749 abarth 2012-07-26 14:17:48 -0700 Created attachment 154749 one approach 679916 3 154788 abarth 2012-07-26 16:47:47 -0700 Created attachment 154788 an attempt at a test 679937 4 ap 2012-07-26 17:16:38 -0700 Is this bug v8-only? Looking at the code, I suspect that JSC is also affected. 679946 5 abarth 2012-07-26 17:25:33 -0700 > Is this bug v8-only? Nope. It affects JSC also. > Looking at the code, I suspect that JSC is also affected. Correct. The issue is that disabling eval based on a header is causing us to boot up JavaScript earlier. The main thing I'm exploring is how best to fix this issue. My current thought is to have the bindings check whether eval is disabled when creating the script context. The complication with this approach is that sometimes we need to disable eval after the script context exists. That means they'll be two pathways for disabling eval. 679974 6 154801 abarth 2012-07-26 18:10:30 -0700 Created attachment 154801 more progress on a test 687263 7 156480 abarth 2012-08-03 16:40:12 -0700 Created attachment 156480 Work in progress 687264 8 abarth 2012-08-03 16:41:47 -0700 The main thing missing from this patch is a test. Anyone have idea for how to write a test? My attempts to write a WebKit unit test kind of flopped. :( 687291 9 156486 abarth 2012-08-03 17:34:27 -0700 Created attachment 156486 Patch 687292 10 156487 abarth 2012-08-03 17:35:03 -0700 Created attachment 156487 Patch 687329 11 156487 eric 2012-08-03 18:50:09 -0700 Comment on attachment 156487 Patch OK. 687367 12 156487 webkit.review.bot 2012-08-03 21:08:59 -0700 Comment on attachment 156487 Patch Clearing flags on attachment: 156487 Committed r124689: <http://trac.webkit.org/changeset/124689> 687368 13 webkit.review.bot 2012-08-03 21:09:04 -0700 All reviewed patches have been landed. Closing bug. 154749 2012-07-26 14:17:48 -0700 2012-07-26 18:10:24 -0700 one approach bug-92189-20120726141737.patch text/plain 2737 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDE0YzA1MGE3NjdmZmNkODQ0MDFhOTljYzQy MWQwZjBiMDQyMTliNTguLjE3NzA1YWI3YzcyOGI3ZDk2ZTliZWU4ODhkZTRmMWM1MGRlMWM4YTIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3Bw CkBAIC0yNzQsOCArMjc0LDYgQEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjpoYXZlSW50ZXJwcmV0 ZXIoKSBjb25zdAogCiB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmVuYWJsZUV2YWwoKQogewotICAg IC8vIFdlIGRvbid0IGNhbGwgaW5pdENvbnRleHRJZk5lZWRlZCBiZWNhdXNlIGNvbnRleHRzIGhh dmUgZXZhbCBlbmFibGVkIGJ5IGRlZmF1bHQuCi0KICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxl U2NvcGU7CiAgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gcHJveHkoKS0+ d2luZG93U2hlbGwoKS0+Y29udGV4dCgpOwogICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQpA QCAtMjg2LDkgKzI4NCw2IEBAIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCgpCiAK IHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZGlzYWJsZUV2YWwoKQogewotICAgIGlmICghcHJveHko KS0+d2luZG93U2hlbGwoKS0+aW5pdENvbnRleHRJZk5lZWRlZCgpKQotICAgICAgICByZXR1cm47 Ci0KICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgdjg6OkhhbmRsZTx2ODo6 Q29udGV4dD4gdjhDb250ZXh0ID0gcHJveHkoKS0+d2luZG93U2hlbGwoKS0+Y29udGV4dCgpOwog ICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv YmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAppbmRleCAwNTYyMzliNGZkMTAzZmNlNDY5YThlNzUy MzEyNTQxNDgxMGJhMWJjLi4xYmExZDUwYmNkODg0ZWQzNWZlNmY0Y2UyYTk4YzFjZWQwZGRjZmFi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxs LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNw cApAQCAtMzEsNyArMzEsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlY4RE9N V2luZG93U2hlbGwuaCIKIAotI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgorI2luY2x1ZGUg IkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUgIkRhdGVFeHRlbnNpb24uaCIKICNp bmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCkBAIC0zOSw2ICsz OSw3IEBACiAjaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBwb3J0LmgiCiAjaW5jbHVkZSAiUGFnZS5o IgogI2luY2x1ZGUgIlBhZ2VHcm91cC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtU3VwcG9ydC5oIgog I2luY2x1ZGUgIlJ1bnRpbWVFbmFibGVkRmVhdHVyZXMuaCIKICNpbmNsdWRlICJTYWZlQWxsb2Nh dGlvbi5oIgogI2luY2x1ZGUgIlNjcmlwdENhbGxTdGFjay5oIgpAQCAtNjEsMTcgKzYyLDExIEBA CiAjaW5jbHVkZSAiVjhMb2NhdGlvbi5oIgogI2luY2x1ZGUgIlY4UHJveHkuaCIKICNpbmNsdWRl ICJXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkuaCIKLQogI2luY2x1ZGUgPGFsZ29yaXRobT4K ICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUgPHV0aWxpdHk+CiAjaW5jbHVkZSA8djgtZGVi dWcuaD4KICNpbmNsdWRlIDx2OC5oPgotCi0jaWYgRU5BQkxFKEpBVkFTQ1JJUFRfSTE4Tl9BUEkp Ci0jaW5jbHVkZSA8djgtaTE4bi9pbmNsdWRlL2V4dGVuc2lvbi5oPgotI2VuZGlmCi0KICNpbmNs dWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogI2lu Y2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KQEAgLTc5LDYgKzc0LDEwIEBACiAjaW5jbHVkZSA8 d3RmL1VudXNlZFBhcmFtLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCisjaWYg RU5BQkxFKEpBVkFTQ1JJUFRfSTE4Tl9BUEkpCisjaW5jbHVkZSA8djgtaTE4bi9pbmNsdWRlL2V4 dGVuc2lvbi5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RhdGljIHZvaWQg aGFuZGxlRmF0YWxFcnJvckluVjgoKQpAQCAtMzM2LDYgKzMzNSw5IEBAIGJvb2wgVjhET01XaW5k b3dTaGVsbDo6aW5pdENvbnRleHRJZk5lZWRlZCgpCiAKICAgICB1cGRhdGVEb2N1bWVudCgpOwog CisgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkpCisgICAgICAgIHY4Q29udGV4dC0+QWxsb3dD b2RlR2VuZXJhdGlvbkZyb21TdHJpbmdzKG1fZnJhbWUtPmRvY3VtZW50KCktPmNvbnRlbnRTZWN1 cml0eVBvbGljeSgpLT5hbGxvd0V2YWwoMCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpTdXBwcmVz c1JlcG9ydCkpOworCiAgICAgc2V0U2VjdXJpdHlUb2tlbigpOwogCiAgICAgbV9mcmFtZS0+bG9h ZGVyKCktPmNsaWVudCgpLT5kaWRDcmVhdGVTY3JpcHRDb250ZXh0KG1fY29udGV4dCwgMCwgMCk7 Cg== 154788 2012-07-26 16:47:47 -0700 2012-07-26 18:10:27 -0700 an attempt at a test bug-92189-20120726164736.patch text/plain 2392 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGZmY2QzODZlYzU2ZWRmZDdjODNkNmMxYWQxMGVhN2NjN2YyNTVmZmUuLmZiZTdhOGQ4ODk5OWZj NzdiNTA4MmZmZTZkMjliMDlkMzJjZGNkMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTItMDctMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBEaXNhYmxpbmcgZXZhbCBjaGFuZ2VzIHRoZSB0aW1pbmcgb2YgRGlkQ3Jl YXRlU2NyaXB0Q29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTIxODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRpdGlvbmFsIGluZm9ybWF0aW9uIG9mIHRoZSBjaGFuZ2Ugc3VjaCBhcyBhcHBy b2FjaCwgcmF0aW9uYWxlLiBQbGVhc2UgYWRkIHBlci1mdW5jdGlvbiBkZXNjcmlwdGlvbnMgYmVs b3cgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisKIDIwMTIt MDctMjYgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hy b21pdW1dIFJlbW92ZSByZWR1bmRhbnQgc3VyZmFjZSBvcmlnaW4gdHJhbnNmb3JtcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IDliNzQ1ZTAy OWEzMzJiOWE5NmJiN2JiYmNjYzhlYzRkODQ0MjNmNDQuLjNkZDExZmUzZmNhNTlkNTc0ZTc5ODA2 NWY1NzQyYWVkMjlhZGMyMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YkZyYW1lVGVzdC5jcHAKQEAgLTQ5Myw2ICs0OTMsMzggQEAgVEVTVF9GKFdlYkZyYW1lVGVzdCwg Q2xlYXJGb2N1c2VkTm9kZVRlc3QpCiAgICAgd2ViVmlld0ltcGwtPmNsb3NlKCk7CiB9CiAKK2Ns YXNzIERvY3VtZW50VVJMSXNWYWxpZFdlYkZyYW1lQ2xpZW50IDogcHVibGljIFdlYkZyYW1lQ2xp ZW50IHsKK3B1YmxpYzoKKyAgICBEb2N1bWVudFVSTElzVmFsaWRXZWJGcmFtZUNsaWVudCgpCisg ICAgICAgIDogbV9kb2N1bWVudFVSTElzVmFsaWQoZmFsc2UpCisgICAgeworICAgIH0KKworICAg IGJvb2wgZG9jdW1lbnRVUkxJc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9kb2N1bWVudFVSTElz VmFsaWQ7IH0KKworIHByaXZhdGU6CisgICAgdmlydHVhbCB2b2lkIGRpZENyZWF0ZVNjcmlwdENv bnRleHQoV2ViRnJhbWUqIGZyYW1lLCB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiBjb250ZXh0LCBp bnQgZXh0ZW5zaW9uR3JvdXAsIGludCB3b3JsZElkKSBPVkVSUklERQorICAgIHsKKyAgICAgICAg bV9kb2N1bWVudFVSTElzVmFsaWQgPSA/Pz8KKyAgICB9CisKKyAgICBib29sIG1fZG9jdW1lbnRV UkxJc1ZhbGlkOworfTsKKworVEVTVF9GKFdlYkZyYW1lVGVzdCwgRG9jdW1lbnRVUkxJc1ZhbGlk RHVyaW5nRGlkQ3JlYXRlU2NyaXB0Q29udGV4dCkKK3sKKyAgICB2ODo6SGFuZGxlU2NvcGUgaGFu ZGxlU2NvcGU7CisKKyAgICByZWdpc3Rlck1vY2tlZEh0dHBVUkxMb2FkKCJkb2N1bWVudF93cml0 ZV9oZWxsb193b3JsZC5odG1sIik7CisKKyAgICAvLyBMb2FkIGEgZnJhbWUgd2l0aCBhbiBpZnJh bWUsIG1ha2Ugc3VyZSB3ZSBnZXQgdGhlIHJpZ2h0IGNyZWF0ZSBub3RpZmljYXRpb25zLgorICAg IERvY3VtZW50VVJMSXNWYWxpZFdlYkZyYW1lQ2xpZW50IHdlYkZyYW1lQ2xpZW50OworICAgIFdl YlZpZXcqIHdlYlZpZXcgPSBGcmFtZVRlc3RIZWxwZXJzOjpjcmVhdGVXZWJWaWV3QW5kTG9hZCht X2Jhc2VVUkwgKyAiZG9jdW1lbnRfd3JpdGVfaGVsbG9fd29ybGQuaHRtbCIsIHRydWUsICZ3ZWJG cmFtZUNsaWVudCk7CisgICAgd2ViVmlldy0+Y2xvc2UoKTsKKworICAgIEVYUEVDVF9UUlVFKHdl YkZyYW1lQ2xpZW50LmRvY3VtZW50VVJMSXNWYWxpZCgpKTsKK30KKwogLy8gSW1wbGVtZW50YXRp b24gb2YgV2ViRnJhbWVDbGllbnQgdGhhdCB0cmFja3MgdGhlIHY4IGNvbnRleHRzIHRoYXQgYXJl IGNyZWF0ZWQKIC8vIGFuZCBkZXN0cm95ZWQgZm9yIHZlcmlmaWNhdGlvbi4KIGNsYXNzIENvbnRl eHRMaWZldGltZVRlc3RXZWJGcmFtZUNsaWVudCA6IHB1YmxpYyBXZWJGcmFtZUNsaWVudCB7Cg== 154801 2012-07-26 18:10:30 -0700 2012-08-03 16:40:08 -0700 more progress on a test bug-92189-20120726181018.patch text/plain 3306 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzNzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGZmY2QzODZlYzU2ZWRmZDdjODNkNmMxYWQxMGVhN2NjN2YyNTVmZmUuLmZiZTdhOGQ4ODk5OWZj NzdiNTA4MmZmZTZkMjliMDlkMzJjZGNkMDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTItMDctMjYgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBEaXNhYmxpbmcgZXZhbCBjaGFuZ2VzIHRoZSB0aW1pbmcgb2YgRGlkQ3Jl YXRlU2NyaXB0Q29udGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTIxODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRpdGlvbmFsIGluZm9ybWF0aW9uIG9mIHRoZSBjaGFuZ2Ugc3VjaCBhcyBhcHBy b2FjaCwgcmF0aW9uYWxlLiBQbGVhc2UgYWRkIHBlci1mdW5jdGlvbiBkZXNjcmlwdGlvbnMgYmVs b3cgKE9PUFMhKS4KKworICAgICAgICAqIHRlc3RzL1dlYkZyYW1lVGVzdC5jcHA6CisKIDIwMTIt MDctMjYgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KIAogICAgICAgICBbY2hy b21pdW1dIFJlbW92ZSByZWR1bmRhbnQgc3VyZmFjZSBvcmlnaW4gdHJhbnNmb3JtcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9XZWJGcmFtZVRlc3QuY3BwCmluZGV4IDliNzQ1ZTAy OWEzMzJiOWE5NmJiN2JiYmNjYzhlYzRkODQ0MjNmNDQuLjlhNzQ4MDBmOWE3ZWEyMDFhMDRlOTI0 ZWYzODU0ZTc2ZDY1NGZlMTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvV2ViRnJhbWVUZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL1dl YkZyYW1lVGVzdC5jcHAKQEAgLTUxLDYgKzUxLDcgQEAKICNpbmNsdWRlICJXZWJTZXR0aW5ncy5o IgogI2luY2x1ZGUgIldlYlZpZXdDbGllbnQuaCIKICNpbmNsdWRlICJXZWJWaWV3SW1wbC5oIgor I2luY2x1ZGUgInBsYXRmb3JtL1dlYlVSTFJlc3BvbnNlLmgiCiAjaW5jbHVkZSAidjguaCIKICNp bmNsdWRlIDxndGVzdC9ndGVzdC5oPgogI2luY2x1ZGUgPHdlYmtpdC9zdXBwb3J0L3dlYmtpdF9z dXBwb3J0Lmg+CkBAIC00OTMsNiArNDk0LDUyIEBAIFRFU1RfRihXZWJGcmFtZVRlc3QsIENsZWFy Rm9jdXNlZE5vZGVUZXN0KQogICAgIHdlYlZpZXdJbXBsLT5jbG9zZSgpOwogfQogCitjbGFzcyBE b2N1bWVudFVSTFdoZW5TY3JpcHRDcmVhdGVkV2ViRnJhbWVDbGllbnQgOiBwdWJsaWMgV2ViRnJh bWVDbGllbnQgeworcHVibGljOgorICAgIERvY3VtZW50VVJMV2hlblNjcmlwdENyZWF0ZWRXZWJG cmFtZUNsaWVudCgpCisgICAgeworICAgIH0KKworICAgIGNvbnN0IFdlYlVSTCYgZG9jdW1lbnRV UkwoKSBjb25zdCB7IHJldHVybiBtX2RvY3VtZW50VVJMOyB9CisKKyBwcml2YXRlOgorICAgIHZp cnR1YWwgdm9pZCBkaWRDcmVhdGVTY3JpcHRDb250ZXh0KFdlYkZyYW1lKiBmcmFtZSwgdjg6Okhh bmRsZTx2ODo6Q29udGV4dD4gY29udGV4dCwgaW50IGV4dGVuc2lvbkdyb3VwLCBpbnQgd29ybGRJ ZCkgT1ZFUlJJREUKKyAgICB7CisgICAgICAgIG1fZG9jdW1lbnRVUkwgPSBmcmFtZS0+ZG9jdW1l bnQoKS51cmwoKTsKKyAgICB9CisKKyAgICBXZWJVUkwgbV9kb2N1bWVudFVSTDsKK307CisKK1RF U1RfRihXZWJGcmFtZVRlc3QsIERvY3VtZW50VVJMSXNWYWxpZER1cmluZ0RpZENyZWF0ZVNjcmlw dENvbnRleHQpCit7CisgICAgdjg6OkhhbmRsZVNjb3BlIGhhbmRsZVNjb3BlOworCisgICAgc3Rk OjpzdHJpbmcgZXhwZWN0ZWRVUkxTdHJpbmcgPSAiaHR0cDovL3d3dy50ZXN0LmNvbS9kb2N1bWVu dF93cml0ZV9oZWxsb193b3JsZC5odG1sIjsKKyAgICBXZWJDU3RyaW5nIGV4cGVjdGVkVVJMID0g V2ViQ1N0cmluZyhleHBlY3RlZFVSTFN0cmluZy5jX3N0cigpLCBleHBlY3RlZFVSTFN0cmluZy5s ZW5ndGgoKSk7CisKKyAgICBzdGQ6OnN0cmluZyBmaWxlTmFtZSA9ICJkb2N1bWVudF93cml0ZV9o ZWxsb193b3JsZC5odG1sIjsKKyAgICBzdGQ6OnN0cmluZyB1cmxTdHJpbmcgPSBtX2Jhc2VVUkwg KyBmaWxlTmFtZTsKKworICAgIFdlYlVSTFJlc3BvbnNlIHJlc3BvbnNlOworICAgIHJlc3BvbnNl LmluaXRpYWxpemUoKTsKKyAgICByZXNwb25zZS5zZXRNSU1FVHlwZShXZWJTdHJpbmc6OmZyb21V VEY4KCJ0ZXh0L2h0bWwiKSk7CisgICAgcmVzcG9uc2Uuc2V0SFRUUFN0YXR1c0NvZGUoMjAwKTsK KyAgICByZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQoV2ViU3RyaW5nOjpmcm9tVVRGOCgiWC1X ZWJLaXQtQ1NQIiksIFdlYlN0cmluZzo6ZnJvbVVURjgoImRlZmF1bHQtc3JjICdzZWxmJyIpKTsK KworICAgIHN0ZDo6c3RyaW5nIGZpbGVQYXRoID0gc3RkOjpzdHJpbmcod2Via2l0X3N1cHBvcnQ6 OkdldFdlYktpdFJvb3REaXIoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBmaWxlUGF0aC5hcHBlbmQo Ii9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL2RhdGEvIiArIGZpbGVOYW1lKTsKKworICAg IHdlYmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTCh0b0tVUkwodXJsU3RyaW5nLmNfc3Ry KCkpLCByZXNwb25zZSwgV2ViU3RyaW5nOjpmcm9tVVRGOChmaWxlUGF0aC5jX3N0cigpKSk7CisK KyAgICBEb2N1bWVudFVSTFdoZW5TY3JpcHRDcmVhdGVkV2ViRnJhbWVDbGllbnQgd2ViRnJhbWVD bGllbnQ7CisgICAgV2ViVmlldyogd2ViVmlldyA9IEZyYW1lVGVzdEhlbHBlcnM6OmNyZWF0ZVdl YlZpZXdBbmRMb2FkKHVybFN0cmluZywgdHJ1ZSwgJndlYkZyYW1lQ2xpZW50KTsKKworICAgIHdl YlZpZXctPmNsb3NlKCk7CisKKyAgICBFWFBFQ1RfVFJVRSghd2ViRnJhbWVDbGllbnQuZG9jdW1l bnRVUkwoKS5zcGVjKCkuY29tcGFyZShleHBlY3RlZFVSTCkpOworfQorCiAvLyBJbXBsZW1lbnRh dGlvbiBvZiBXZWJGcmFtZUNsaWVudCB0aGF0IHRyYWNrcyB0aGUgdjggY29udGV4dHMgdGhhdCBh cmUgY3JlYXRlZAogLy8gYW5kIGRlc3Ryb3llZCBmb3IgdmVyaWZpY2F0aW9uLgogY2xhc3MgQ29u dGV4dExpZmV0aW1lVGVzdFdlYkZyYW1lQ2xpZW50IDogcHVibGljIFdlYkZyYW1lQ2xpZW50IHsK 156480 2012-08-03 16:40:12 -0700 2012-08-03 17:34:24 -0700 Work in progress bug-92189-20120803163951.patch text/plain 4509 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUxNmQ3YTc1NDAxMjlm ODY3OGY4MGNjOTRmZmU2ZDRmNWZmMjczMC4uYmI2MjkxMTFjNzJlYjYwNWIyNGQwYmZhMTJiMDc1 OGFlN2YxZjA2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTA4LTAzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGlzYWJsaW5nIGV2YWwgY2hh bmdlcyB0aGUgdGltaW5nIG9mIERpZENyZWF0ZVNjcmlwdENvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMTg5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBkZWxheXMgZGlzYWJs aW5nIGV2YWwgdW50aWwgd2UgYWN0dWFsbHkgY3JlYXRlIHRoZSBzY3JpcHQKKyAgICAgICAgY29u dGV4dCwgd2hpY2ggcHJlc2VydmVzIHRoZSBvcmlnaW5hbCB0aW1pbmcuCisKKyAgICAgICAgKiBi aW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlw dENvbnRyb2xsZXI6OmluaXRTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJv bGxlcjo6ZGlzYWJsZUV2YWwpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCk6 CisgICAgICAgIChXZWJDb3JlOjpTY3JpcHRDb250cm9sbGVyOjpkaXNhYmxlRXZhbCk6CisgICAg ICAgICogYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpWOERPTVdpbmRvd1NoZWxsOjppbml0Q29udGV4dElmTmVlZGVkKToKKwogMjAxMi0wOC0wMyAg QWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJlc3RvcmUgV2ViIEluc3BlY3RvciBKUyBmcm9udGVuZCBjb21waWxhYmlsaXR5IGFm dGVyIHIxMjQ0ODQgKGZpeCBKU0RvYyBhbm5vdGF0aW9ucykuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDA2Yzc5OTY0MGE4ZmNhZGZm ZWVlYThkN2U1NTIzZmNhYmQ1OGM1ZDguLjFjZmI5ZDcwYmFiMGVhOGNhMDIxYzdlZTg3NTYxN2U4 NmRkOWRjMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENv bnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRy b2xsZXIuY3BwCkBAIC0yMSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVk ZSAiU2NyaXB0Q29udHJvbGxlci5oIgogCisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5 LmgiCiAjaW5jbHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVk ZSAiRnJhbWUuaCIKQEAgLTIxNSw2ICsyMTYsOSBAQCBKU0RPTVdpbmRvd1NoZWxsKiBTY3JpcHRD b250cm9sbGVyOjppbml0U2NyaXB0KERPTVdyYXBwZXJXb3JsZCogd29ybGQpCiAKICAgICB3aW5k b3dTaGVsbC0+d2luZG93KCktPnVwZGF0ZURvY3VtZW50KCk7CiAKKyAgICBpZiAobV9mcmFtZS0+ ZG9jdW1lbnQoKSkKKyAgICAgICAgd2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRFdmFsRW5hYmxl ZChtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dFdmFs KDAsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6U3VwcHJlc3NSZXBvcnQpKTsgICAKKwogICAgIGlm IChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7CiAgICAgICAgIGF0dGFjaERlYnVnZ2Vy KHdpbmRvd1NoZWxsLCBwYWdlLT5kZWJ1Z2dlcigpKTsKICAgICAgICAgd2luZG93U2hlbGwtPndp bmRvdygpLT5zZXRQcm9maWxlR3JvdXAocGFnZS0+Z3JvdXAoKS5pZGVudGlmaWVyKCkpOwpAQCAt MjQzLDcgKzI0NywxMCBAQCB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmVuYWJsZUV2YWwoKQogCiB2 b2lkIFNjcmlwdENvbnRyb2xsZXI6OmRpc2FibGVFdmFsKCkKIHsKLSAgICB3aW5kb3dTaGVsbCht YWluVGhyZWFkTm9ybWFsV29ybGQoKSktPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChmYWxzZSk7 CisgICAgSlNET01XaW5kb3dTaGVsbCogd2luZG93U2hlbGwgPSBleGlzdGluZ1dpbmRvd1NoZWxs KG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKKyAgICBpZiAoIXdpbmRvd1NoZWxsKQorICAgICAg ICByZXR1cm47IC8vIEV2YWwgaXMgZW5hYmxlZCBieSBkZWZhdWx0LgorICAgIHdpbmRvd1NoZWxs LT53aW5kb3coKS0+c2V0RXZhbEVuYWJsZWQoZmFsc2UpOwogfQogCiBib29sIFNjcmlwdENvbnRy b2xsZXI6OnByb2Nlc3NpbmdVc2VyR2VzdHVyZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IGM0ZTM4OWE5ODU2ZDc3MTZkOTBjYWNm ZTFiYWNmMTBmNzhiZTVhYTQuLjdlNDkwZDlmNTIxYzI3NDFiZWRjZDgyNDAyOTkwZjAzZWE3MzVh OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xs ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIu Y3BwCkBAIC0yNzQsOCArMjc0LDYgQEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjpoYXZlSW50ZXJw cmV0ZXIoKSBjb25zdAogCiB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmVuYWJsZUV2YWwoKQogewot ICAgIC8vIFdlIGRvbid0IGNhbGwgaW5pdENvbnRleHRJZk5lZWRlZCBiZWNhdXNlIGNvbnRleHRz IGhhdmUgZXZhbCBlbmFibGVkIGJ5IGRlZmF1bHQuCi0KICAgICB2ODo6SGFuZGxlU2NvcGUgaGFu ZGxlU2NvcGU7CiAgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gcHJveHko KS0+d2luZG93U2hlbGwoKS0+Y29udGV4dCgpOwogICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgp KQpAQCAtMjg2LDkgKzI4NCw2IEBAIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCgp CiAKIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZGlzYWJsZUV2YWwoKQogewotICAgIGlmICghcHJv eHkoKS0+d2luZG93U2hlbGwoKS0+aW5pdENvbnRleHRJZk5lZWRlZCgpKQotICAgICAgICByZXR1 cm47Ci0KICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgdjg6OkhhbmRsZTx2 ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gcHJveHkoKS0+d2luZG93U2hlbGwoKS0+Y29udGV4dCgp OwogICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvdjgvVjhET01XaW5kb3dTaGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAppbmRleCA0MDdhMWQ3MDBlZDNjNjcwMzdhNjNi YzBjMWY2OWRjNjVkNGM5YmFhLi5iNGJmOTQzMmRjZDI2ZjQzMTI1M2NhMWFmZmQzZGE1NDU1ZTAz ZDFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1No ZWxsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxs LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIlY4RE9NV2luZG93U2hlbGwuaCIKIAog I2luY2x1ZGUgIkJpbmRpbmdTdGF0ZS5oIgorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGlj eS5oIgogI2luY2x1ZGUgIkRhdGVFeHRlbnNpb24uaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRl ci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCkBAIC0zMzgsNiArMzM5LDkgQEAgYm9vbCBWOERPTVdp bmRvd1NoZWxsOjppbml0Q29udGV4dElmTmVlZGVkKCkKIAogICAgIHNldFNlY3VyaXR5VG9rZW4o KTsKIAorICAgIGlmIChtX2ZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICB2OENvbnRleHQtPkFs bG93Q29kZUdlbmVyYXRpb25Gcm9tU3RyaW5ncyhtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250ZW50 U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dFdmFsKDAsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6U3Vw cHJlc3NSZXBvcnQpKTsKKwogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+ZGlkQ3Jl YXRlU2NyaXB0Q29udGV4dChtX2NvbnRleHQsIDAsIDApOwogCiAgICAgLy8gRklYTUU6IFRoaXMg aXMgd3JvbmcuIFdlIHNob3VsZCBhY3R1YWxseSBkbyB0aGlzIGZvciB0aGUgcHJvcGVyIHdvcmxk IG9uY2UK 156486 2012-08-03 17:34:27 -0700 2012-08-03 17:34:56 -0700 Patch bug-92189-20120803173407.patch text/plain 5862 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUxNmQ3YTc1NDAxMjlm ODY3OGY4MGNjOTRmZmU2ZDRmNWZmMjczMC4uMjVlMzgxZmIwOTQyZmQxNjFjZjRiYTJjYjZlZTRj MGFmYzRhYjE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA4LTAzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGlzYWJsaW5nIGV2YWwgY2hh bmdlcyB0aGUgdGltaW5nIG9mIERpZENyZWF0ZVNjcmlwdENvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMTg5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB3ZSBpbXBsZW1lbnRlZCBDb250 ZW50LVNlY3VyaXR5LVBvbGljeSwgd2UgYWRkZWQgdGhlIGFiaWxpdHkgdG8KKyAgICAgICAgZGlz YWJsZSBldmFsIGluIHRoZSBKYXZhU2NyaXB0IGVuZ2luZS4gSG93ZXZlciwgd2hlbiB3ZSBwcm9j ZXNzIHRoZQorICAgICAgICBDb250ZW50LVNlY3VyaXR5LVBvbGljeSBoZWFkZXIsIHdlIG1pZ2h0 IG5vdCBoYXZlIGluaXRpYWxpemVkIHRoZQorICAgICAgICBzY3JpcHQgY29udGV4dCBmb3IgdGhl IGdpdmVuIGZyYW1lLgorCisgICAgICAgIFByZXZpb3VzbHksIHdlIHdvdWxkIGluaXRpYWxpemUg dGhlIGNvbnRleHQsIGJ1dCB0aGF0IGdlbmVyYXRlcyBhCisgICAgICAgIERpZENyZWF0ZVNjcmlw dENvbnRleHQgY2FsbGJhY2sgdG8gdGhlIGVtYmVkZGVyIGVhcmxpZXIgaW4gdGhlIERvY3VtZW50 J3MKKyAgICAgICAgbGlmZXRpbWUgdGhhdCBiZWZvcmUuIEEgbmF0dXJhbCB0aGluZyB0byBkbyBp biB0aGlzIGNhbGxiYWNrIGlzIHRvIHJ1bgorICAgICAgICBzY3JpcHQgdG8gY3VzdG9taXplIHRo ZSBzY3JpcHQgY29udGV4dCwgYnV0IERvY3VtZW50IGlzbid0IGZ1bGx5CisgICAgICAgIGluaXRp YWxpemVkIHlldCwgd2hpY2ggbGVhZHMgdG8gb2RkIGJ1Z3MgYW5kIGdlbmVyYWwgY29uZnVzaW9u LgorCisgICAgICAgIEluIHRoaXMgcGF0Y2gsIHdlIGRlbGF5IGFjdHVhbGx5IGRpc2FibGluZyBl dmFsIHVudGlsIHdlIHdvdWxkIGhhdmUKKyAgICAgICAgY3JlYXRlZCB0aGUgc2NyaXB0aW5nIGNv bnRleHQgcHJldmlvdXNseS4gRnJvbSB0aGUgcGVyc3BlY3RpdmUgb2YgdGhlCisgICAgICAgIHdl YiBwbGF0Zm9ybSwgdGhpcyBoYXMgdGhlIHNhbWUgYmVoYXZpb3IuIFRoZSBvbmx5IGRpZmZlcmVu Y2UgaXMgdGhhdAorICAgICAgICBub3cgdGhlIERpZENyZWF0ZVNjcmlwdENvbnRleHQgbm90aWZp Y2F0aW9uIG9jY3VycyBhdCB0aGUgc2FtZSB0aW1lCisgICAgICAgIHJlZ2FyZGxlc3Mgb2Ygd2hl dGhlciBDb250ZW50LVNlY3VyaXR5LVBvbGljeSBkaXNhYmxlcyBldmFsLgorCisgICAgICAgIEkg dHJpZWQgdG8gd3JpdGUgYSB0ZXN0IGZvciB0aGlzIGNoYW5nZSwgYnV0IGl0IHdhcyB1bmNsZWFy IHRvIG1lIGhvdworICAgICAgICB0byB3cml0ZSBhIGdvb2QgdGVzdC4gSSB0cmllZCB3cml0aW5n IGEgQ2hyb21pdW0gV2ViS2l0IHVuaXQgdGVzdCB0byBubworICAgICAgICBhdmFpbC4gVGhlIGdv b2QgbmV3cyBpcyB0aGF0IHRoaXMgcGF0Y2ggd2lsbCBiZSBjb3ZlcmVkIGJ5IHRoZQorICAgICAg ICBQbGF0Zm9ybUFwcEJyb3dzZXJUZXN0LklmcmFtZXMgdGVzdCBpbiBDaHJvbWl1bSBvbmNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzA3OSBsYW5k cy4gVGhhdCdzIG5vdCB0aGUKKyAgICAgICAgYmVzdCB3YXkgdG8gdGVzdCB0aGlzIGNoYW5nZSwg YnV0IGl0IG1pZ2h0IGJlIHN1ZmZpY2llbnQuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3Jp cHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6Omlu aXRTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZGlzYWJsZUV2 YWwpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHRDb250cm9sbGVyOjpkaXNhYmxlRXZhbCk6CisgICAgICAgICogYmluZGluZ3Mv djgvVjhET01XaW5kb3dTaGVsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRvd1No ZWxsOjppbml0Q29udGV4dElmTmVlZGVkKToKKwogMjAxMi0wOC0wMyAgQWxleGFuZGVyIFBhdmxv diAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJlc3RvcmUg V2ViIEluc3BlY3RvciBKUyBmcm9udGVuZCBjb21waWxhYmlsaXR5IGFmdGVyIHIxMjQ0ODQgKGZp eCBKU0RvYyBhbm5vdGF0aW9ucykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDA2Yzc5OTY0MGE4ZmNhZGZmZWVlYThkN2U1NTIzZmNh YmQ1OGM1ZDguLjFjZmI5ZDcwYmFiMGVhOGNhMDIxYzdlZTg3NTYxN2U4NmRkOWRjMzQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0y MSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q29udHJv bGxlci5oIgogCisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAi RXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAg LTIxNSw2ICsyMTYsOSBAQCBKU0RPTVdpbmRvd1NoZWxsKiBTY3JpcHRDb250cm9sbGVyOjppbml0 U2NyaXB0KERPTVdyYXBwZXJXb3JsZCogd29ybGQpCiAKICAgICB3aW5kb3dTaGVsbC0+d2luZG93 KCktPnVwZGF0ZURvY3VtZW50KCk7CiAKKyAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSkKKyAg ICAgICAgd2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChtX2ZyYW1lLT5kb2N1 bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dFdmFsKDAsIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6U3VwcHJlc3NSZXBvcnQpKTsgICAKKwogICAgIGlmIChQYWdlKiBwYWdlID0g bV9mcmFtZS0+cGFnZSgpKSB7CiAgICAgICAgIGF0dGFjaERlYnVnZ2VyKHdpbmRvd1NoZWxsLCBw YWdlLT5kZWJ1Z2dlcigpKTsKICAgICAgICAgd2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRQcm9m aWxlR3JvdXAocGFnZS0+Z3JvdXAoKS5pZGVudGlmaWVyKCkpOwpAQCAtMjQzLDcgKzI0NywxMCBA QCB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmVuYWJsZUV2YWwoKQogCiB2b2lkIFNjcmlwdENvbnRy b2xsZXI6OmRpc2FibGVFdmFsKCkKIHsKLSAgICB3aW5kb3dTaGVsbChtYWluVGhyZWFkTm9ybWFs V29ybGQoKSktPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChmYWxzZSk7CisgICAgSlNET01XaW5k b3dTaGVsbCogd2luZG93U2hlbGwgPSBleGlzdGluZ1dpbmRvd1NoZWxsKG1haW5UaHJlYWROb3Jt YWxXb3JsZCgpKTsKKyAgICBpZiAoIXdpbmRvd1NoZWxsKQorICAgICAgICByZXR1cm47IC8vIEV2 YWwgaXMgZW5hYmxlZCBieSBkZWZhdWx0LgorICAgIHdpbmRvd1NoZWxsLT53aW5kb3coKS0+c2V0 RXZhbEVuYWJsZWQoZmFsc2UpOwogfQogCiBib29sIFNjcmlwdENvbnRyb2xsZXI6OnByb2Nlc3Np bmdVc2VyR2VzdHVyZSgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9T Y3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENv bnRyb2xsZXIuY3BwCmluZGV4IGM0ZTM4OWE5ODU2ZDc3MTZkOTBjYWNmZTFiYWNmMTBmNzhiZTVh YTQuLjdlNDkwZDlmNTIxYzI3NDFiZWRjZDgyNDAyOTkwZjAzZWE3MzVhOWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0yNzQsOCAr Mjc0LDYgQEAgYm9vbCBTY3JpcHRDb250cm9sbGVyOjpoYXZlSW50ZXJwcmV0ZXIoKSBjb25zdAog CiB2b2lkIFNjcmlwdENvbnRyb2xsZXI6OmVuYWJsZUV2YWwoKQogewotICAgIC8vIFdlIGRvbid0 IGNhbGwgaW5pdENvbnRleHRJZk5lZWRlZCBiZWNhdXNlIGNvbnRleHRzIGhhdmUgZXZhbCBlbmFi bGVkIGJ5IGRlZmF1bHQuCi0KICAgICB2ODo6SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAg djg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhDb250ZXh0ID0gcHJveHkoKS0+d2luZG93U2hlbGwo KS0+Y29udGV4dCgpOwogICAgIGlmICh2OENvbnRleHQuSXNFbXB0eSgpKQpAQCAtMjg2LDkgKzI4 NCw2IEBAIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCgpCiAKIHZvaWQgU2NyaXB0 Q29udHJvbGxlcjo6ZGlzYWJsZUV2YWwoKQogewotICAgIGlmICghcHJveHkoKS0+d2luZG93U2hl bGwoKS0+aW5pdENvbnRleHRJZk5lZWRlZCgpKQotICAgICAgICByZXR1cm47Ci0KICAgICB2ODo6 SGFuZGxlU2NvcGUgaGFuZGxlU2NvcGU7CiAgICAgdjg6OkhhbmRsZTx2ODo6Q29udGV4dD4gdjhD b250ZXh0ID0gcHJveHkoKS0+d2luZG93U2hlbGwoKS0+Y29udGV4dCgpOwogICAgIGlmICh2OENv bnRleHQuSXNFbXB0eSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv VjhET01XaW5kb3dTaGVsbC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdp bmRvd1NoZWxsLmNwcAppbmRleCA0MDdhMWQ3MDBlZDNjNjcwMzdhNjNiYzBjMWY2OWRjNjVkNGM5 YmFhLi5iNGJmOTQzMmRjZDI2ZjQzMTI1M2NhMWFmZmQzZGE1NDU1ZTAzZDFmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcApAQCAtMzIsNiAr MzIsNyBAQAogI2luY2x1ZGUgIlY4RE9NV2luZG93U2hlbGwuaCIKIAogI2luY2x1ZGUgIkJpbmRp bmdTdGF0ZS5oIgorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUg IkRhdGVFeHRlbnNpb24uaCIKICNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUg IkZyYW1lLmgiCkBAIC0zMzgsNiArMzM5LDkgQEAgYm9vbCBWOERPTVdpbmRvd1NoZWxsOjppbml0 Q29udGV4dElmTmVlZGVkKCkKIAogICAgIHNldFNlY3VyaXR5VG9rZW4oKTsKIAorICAgIGlmICht X2ZyYW1lLT5kb2N1bWVudCgpKQorICAgICAgICB2OENvbnRleHQtPkFsbG93Q29kZUdlbmVyYXRp b25Gcm9tU3RyaW5ncyhtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3ko KS0+YWxsb3dFdmFsKDAsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6U3VwcHJlc3NSZXBvcnQpKTsK KwogICAgIG1fZnJhbWUtPmxvYWRlcigpLT5jbGllbnQoKS0+ZGlkQ3JlYXRlU2NyaXB0Q29udGV4 dChtX2NvbnRleHQsIDAsIDApOwogCiAgICAgLy8gRklYTUU6IFRoaXMgaXMgd3JvbmcuIFdlIHNo b3VsZCBhY3R1YWxseSBkbyB0aGlzIGZvciB0aGUgcHJvcGVyIHdvcmxkIG9uY2UK 156487 2012-08-03 17:35:03 -0700 2012-08-03 21:08:59 -0700 Patch bug-92189-20120803173442.patch text/plain 6059 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjUxNmQ3YTc1NDAxMjlm ODY3OGY4MGNjOTRmZmU2ZDRmNWZmMjczMC4uMjVlMzgxZmIwOTQyZmQxNjFjZjRiYTJjYjZlZTRj MGFmYzRhYjE4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDEyLTA4LTAzICBBZGFt IEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRGlzYWJsaW5nIGV2YWwgY2hh bmdlcyB0aGUgdGltaW5nIG9mIERpZENyZWF0ZVNjcmlwdENvbnRleHQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMTg5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiB3ZSBpbXBsZW1lbnRlZCBDb250 ZW50LVNlY3VyaXR5LVBvbGljeSwgd2UgYWRkZWQgdGhlIGFiaWxpdHkgdG8KKyAgICAgICAgZGlz YWJsZSBldmFsIGluIHRoZSBKYXZhU2NyaXB0IGVuZ2luZS4gSG93ZXZlciwgd2hlbiB3ZSBwcm9j ZXNzIHRoZQorICAgICAgICBDb250ZW50LVNlY3VyaXR5LVBvbGljeSBoZWFkZXIsIHdlIG1pZ2h0 IG5vdCBoYXZlIGluaXRpYWxpemVkIHRoZQorICAgICAgICBzY3JpcHQgY29udGV4dCBmb3IgdGhl IGdpdmVuIGZyYW1lLgorCisgICAgICAgIFByZXZpb3VzbHksIHdlIHdvdWxkIGluaXRpYWxpemUg dGhlIGNvbnRleHQsIGJ1dCB0aGF0IGdlbmVyYXRlcyBhCisgICAgICAgIERpZENyZWF0ZVNjcmlw dENvbnRleHQgY2FsbGJhY2sgdG8gdGhlIGVtYmVkZGVyIGVhcmxpZXIgaW4gdGhlIERvY3VtZW50 J3MKKyAgICAgICAgbGlmZXRpbWUgdGhhdCBiZWZvcmUuIEEgbmF0dXJhbCB0aGluZyB0byBkbyBp biB0aGlzIGNhbGxiYWNrIGlzIHRvIHJ1bgorICAgICAgICBzY3JpcHQgdG8gY3VzdG9taXplIHRo ZSBzY3JpcHQgY29udGV4dCwgYnV0IERvY3VtZW50IGlzbid0IGZ1bGx5CisgICAgICAgIGluaXRp YWxpemVkIHlldCwgd2hpY2ggbGVhZHMgdG8gb2RkIGJ1Z3MgYW5kIGdlbmVyYWwgY29uZnVzaW9u LgorCisgICAgICAgIEluIHRoaXMgcGF0Y2gsIHdlIGRlbGF5IGFjdHVhbGx5IGRpc2FibGluZyBl dmFsIHVudGlsIHdlIHdvdWxkIGhhdmUKKyAgICAgICAgY3JlYXRlZCB0aGUgc2NyaXB0aW5nIGNv bnRleHQgcHJldmlvdXNseS4gRnJvbSB0aGUgcGVyc3BlY3RpdmUgb2YgdGhlCisgICAgICAgIHdl YiBwbGF0Zm9ybSwgdGhpcyBoYXMgdGhlIHNhbWUgYmVoYXZpb3IuIFRoZSBvbmx5IGRpZmZlcmVu Y2UgaXMgdGhhdAorICAgICAgICBub3cgdGhlIERpZENyZWF0ZVNjcmlwdENvbnRleHQgbm90aWZp Y2F0aW9uIG9jY3VycyBhdCB0aGUgc2FtZSB0aW1lCisgICAgICAgIHJlZ2FyZGxlc3Mgb2Ygd2hl dGhlciBDb250ZW50LVNlY3VyaXR5LVBvbGljeSBkaXNhYmxlcyBldmFsLgorCisgICAgICAgIEkg dHJpZWQgdG8gd3JpdGUgYSB0ZXN0IGZvciB0aGlzIGNoYW5nZSwgYnV0IGl0IHdhcyB1bmNsZWFy IHRvIG1lIGhvdworICAgICAgICB0byB3cml0ZSBhIGdvb2QgdGVzdC4gSSB0cmllZCB3cml0aW5n IGEgQ2hyb21pdW0gV2ViS2l0IHVuaXQgdGVzdCB0byBubworICAgICAgICBhdmFpbC4gVGhlIGdv b2QgbmV3cyBpcyB0aGF0IHRoaXMgcGF0Y2ggd2lsbCBiZSBjb3ZlcmVkIGJ5IHRoZQorICAgICAg ICBQbGF0Zm9ybUFwcEJyb3dzZXJUZXN0LklmcmFtZXMgdGVzdCBpbiBDaHJvbWl1bSBvbmNlCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzA3OSBsYW5k cy4gVGhhdCdzIG5vdCB0aGUKKyAgICAgICAgYmVzdCB3YXkgdG8gdGVzdCB0aGlzIGNoYW5nZSwg YnV0IGl0IG1pZ2h0IGJlIHN1ZmZpY2llbnQuCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9TY3Jp cHRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcmlwdENvbnRyb2xsZXI6Omlu aXRTY3JpcHQpOgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZGlzYWJsZUV2 YWwpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6U2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxlRXZhbCk6CisgICAgICAgIChXZWJD b3JlOjpTY3JpcHRDb250cm9sbGVyOjpkaXNhYmxlRXZhbCk6CisgICAgICAgICogYmluZGluZ3Mv djgvVjhET01XaW5kb3dTaGVsbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOERPTVdpbmRvd1No ZWxsOjppbml0Q29udGV4dElmTmVlZGVkKToKKwogMjAxMi0wOC0wMyAgQWxleGFuZGVyIFBhdmxv diAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJlc3RvcmUg V2ViIEluc3BlY3RvciBKUyBmcm9udGVuZCBjb21waWxhYmlsaXR5IGFmdGVyIHIxMjQ0ODQgKGZp eCBKU0RvYyBhbm5vdGF0aW9ucykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9qcy9TY3JpcHRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1Nj cmlwdENvbnRyb2xsZXIuY3BwCmluZGV4IDA2Yzc5OTY0MGE4ZmNhZGZmZWVlYThkN2U1NTIzZmNh YmQ1OGM1ZDguLmE2ODViYWNhNWNiMTZkOTE1YTlhYjZjOTIzZTYxNmU4ZjAyNzAwOTUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdENvbnRyb2xsZXIuY3BwCkBAIC0y MSw2ICsyMSw3IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU2NyaXB0Q29udHJv bGxlci5oIgogCisjaW5jbHVkZSAiQ29udGVudFNlY3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAi RXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAg LTIxNSw2ICsyMTYsOSBAQCBKU0RPTVdpbmRvd1NoZWxsKiBTY3JpcHRDb250cm9sbGVyOjppbml0 U2NyaXB0KERPTVdyYXBwZXJXb3JsZCogd29ybGQpCiAKICAgICB3aW5kb3dTaGVsbC0+d2luZG93 KCktPnVwZGF0ZURvY3VtZW50KCk7CiAKKyAgICBpZiAobV9mcmFtZS0+ZG9jdW1lbnQoKSkKKyAg ICAgICAgd2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChtX2ZyYW1lLT5kb2N1 bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+YWxsb3dFdmFsKDAsIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6U3VwcHJlc3NSZXBvcnQpKTsgICAKKwogICAgIGlmIChQYWdlKiBwYWdlID0g bV9mcmFtZS0+cGFnZSgpKSB7CiAgICAgICAgIGF0dGFjaERlYnVnZ2VyKHdpbmRvd1NoZWxsLCBw YWdlLT5kZWJ1Z2dlcigpKTsKICAgICAgICAgd2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRQcm9m aWxlR3JvdXAocGFnZS0+Z3JvdXAoKS5pZGVudGlmaWVyKCkpOwpAQCAtMjM3LDEzICsyNDEsMTYg QEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjplbmFibGVFdmFsKCkKIHsKICAgICBKU0RPTVdpbmRv d1NoZWxsKiB3aW5kb3dTaGVsbCA9IGV4aXN0aW5nV2luZG93U2hlbGwobWFpblRocmVhZE5vcm1h bFdvcmxkKCkpOwogICAgIGlmICghd2luZG93U2hlbGwpCi0gICAgICAgIHJldHVybjsgLy8gRXZh bCBpcyBlbmFibGVkIGJ5IGRlZmF1bHQuCisgICAgICAgIHJldHVybjsKICAgICB3aW5kb3dTaGVs bC0+d2luZG93KCktPnNldEV2YWxFbmFibGVkKHRydWUpOwogfQogCiB2b2lkIFNjcmlwdENvbnRy b2xsZXI6OmRpc2FibGVFdmFsKCkKIHsKLSAgICB3aW5kb3dTaGVsbChtYWluVGhyZWFkTm9ybWFs V29ybGQoKSktPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChmYWxzZSk7CisgICAgSlNET01XaW5k b3dTaGVsbCogd2luZG93U2hlbGwgPSBleGlzdGluZ1dpbmRvd1NoZWxsKG1haW5UaHJlYWROb3Jt YWxXb3JsZCgpKTsKKyAgICBpZiAoIXdpbmRvd1NoZWxsKQorICAgICAgICByZXR1cm47CisgICAg d2luZG93U2hlbGwtPndpbmRvdygpLT5zZXRFdmFsRW5hYmxlZChmYWxzZSk7CiB9CiAKIGJvb2wg U2NyaXB0Q29udHJvbGxlcjo6cHJvY2Vzc2luZ1VzZXJHZXN0dXJlKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0Q29udHJvbGxlci5jcHAKaW5kZXggYzRlMzg5YTk4NTZk NzcxNmQ5MGNhY2ZlMWJhY2YxMGY3OGJlNWFhNC4uN2U0OTBkOWY1MjFjMjc0MWJlZGNkODI0MDI5 OTBmMDNlYTczNWE5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2Ny aXB0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0 Q29udHJvbGxlci5jcHAKQEAgLTI3NCw4ICsyNzQsNiBAQCBib29sIFNjcmlwdENvbnRyb2xsZXI6 OmhhdmVJbnRlcnByZXRlcigpIGNvbnN0CiAKIHZvaWQgU2NyaXB0Q29udHJvbGxlcjo6ZW5hYmxl RXZhbCgpCiB7Ci0gICAgLy8gV2UgZG9uJ3QgY2FsbCBpbml0Q29udGV4dElmTmVlZGVkIGJlY2F1 c2UgY29udGV4dHMgaGF2ZSBldmFsIGVuYWJsZWQgYnkgZGVmYXVsdC4KLQogICAgIHY4OjpIYW5k bGVTY29wZSBoYW5kbGVTY29wZTsKICAgICB2ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB2OENvbnRl eHQgPSBwcm94eSgpLT53aW5kb3dTaGVsbCgpLT5jb250ZXh0KCk7CiAgICAgaWYgKHY4Q29udGV4 dC5Jc0VtcHR5KCkpCkBAIC0yODYsOSArMjg0LDYgQEAgdm9pZCBTY3JpcHRDb250cm9sbGVyOjpl bmFibGVFdmFsKCkKIAogdm9pZCBTY3JpcHRDb250cm9sbGVyOjpkaXNhYmxlRXZhbCgpCiB7Ci0g ICAgaWYgKCFwcm94eSgpLT53aW5kb3dTaGVsbCgpLT5pbml0Q29udGV4dElmTmVlZGVkKCkpCi0g ICAgICAgIHJldHVybjsKLQogICAgIHY4OjpIYW5kbGVTY29wZSBoYW5kbGVTY29wZTsKICAgICB2 ODo6SGFuZGxlPHY4OjpDb250ZXh0PiB2OENvbnRleHQgPSBwcm94eSgpLT53aW5kb3dTaGVsbCgp LT5jb250ZXh0KCk7CiAgICAgaWYgKHY4Q29udGV4dC5Jc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxsLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCmluZGV4IDQwN2ExZDcwMGVk M2M2NzAzN2E2M2JjMGMxZjY5ZGM2NWQ0YzliYWEuLmI0YmY5NDMyZGNkMjZmNDMxMjUzY2ExYWZm ZDNkYTU0NTVlMDNkMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 RE9NV2luZG93U2hlbGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9N V2luZG93U2hlbGwuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiVjhET01XaW5kb3dT aGVsbC5oIgogCiAjaW5jbHVkZSAiQmluZGluZ1N0YXRlLmgiCisjaW5jbHVkZSAiQ29udGVudFNl Y3VyaXR5UG9saWN5LmgiCiAjaW5jbHVkZSAiRGF0ZUV4dGVuc2lvbi5oIgogI2luY2x1ZGUgIkRv Y3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAiRnJhbWUuaCIKQEAgLTMzOCw2ICszMzksOSBAQCBi b29sIFY4RE9NV2luZG93U2hlbGw6OmluaXRDb250ZXh0SWZOZWVkZWQoKQogCiAgICAgc2V0U2Vj dXJpdHlUb2tlbigpOwogCisgICAgaWYgKG1fZnJhbWUtPmRvY3VtZW50KCkpCisgICAgICAgIHY4 Q29udGV4dC0+QWxsb3dDb2RlR2VuZXJhdGlvbkZyb21TdHJpbmdzKG1fZnJhbWUtPmRvY3VtZW50 KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5hbGxvd0V2YWwoMCwgQ29udGVudFNlY3VyaXR5 UG9saWN5OjpTdXBwcmVzc1JlcG9ydCkpOworCiAgICAgbV9mcmFtZS0+bG9hZGVyKCktPmNsaWVu dCgpLT5kaWRDcmVhdGVTY3JpcHRDb250ZXh0KG1fY29udGV4dCwgMCwgMCk7CiAKICAgICAvLyBG SVhNRTogVGhpcyBpcyB3cm9uZy4gV2Ugc2hvdWxkIGFjdHVhbGx5IGRvIHRoaXMgZm9yIHRoZSBw cm9wZXIgd29ybGQgb25jZQo=