121683 2013-09-20 07:53:09 -0700 Fix a couple more CSS leaks 2013-09-20 10:17:12 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin ap commit-queue eflews.bot esprehn+autocc fpizlo glenn gyuyoung.kim kling koivisto macpherson menard rego+ews simon.fraser webkit-ews xan.lopez oldest_to_newest 931333 0 darin 2013-09-20 07:53:09 -0700 Fix a couple more CSS leaks 931334 1 212165 darin 2013-09-20 07:54:58 -0700 Created attachment 212165 Patch 931336 2 212165 eflews.bot 2013-09-20 07:59:26 -0700 Comment on attachment 212165 Patch Attachment 212165 did not pass efl-ews (efl): Output: http://webkit-queues.appspot.com/results/2019104 931337 3 212165 eflews.bot 2013-09-20 07:59:48 -0700 Comment on attachment 212165 Patch Attachment 212165 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1865171 931338 4 212165 webkit-ews 2013-09-20 08:00:16 -0700 Comment on attachment 212165 Patch Attachment 212165 did not pass qt-ews (qt): Output: http://webkit-queues.appspot.com/results/2018098 931339 5 212165 webkit-ews 2013-09-20 08:00:31 -0700 Comment on attachment 212165 Patch Attachment 212165 did not pass qt-wk2-ews (qt-wk2): Output: http://webkit-queues.appspot.com/results/1811294 931343 6 212166 darin 2013-09-20 08:04:26 -0700 Created attachment 212166 Patch 931368 7 212166 ap 2013-09-20 08:47:42 -0700 Comment on attachment 212166 Patch EWS starts to think no: Unexpected flakiness: timeouts (2) fast/css/dumpAsText/xml-stylesheet-pi-not-in-prolog.xml [ Crash Timeout Pass ] svg/hixie/error/dumpAsText/004.xml [ Crash Timeout Pass ] Regressions: Unexpected crashes (18) fast/encoding/dumpAsText/utf-16-no-bom.xml [ Crash ] fast/frames/viewsource-attribute.html [ Crash ] fast/frames/viewsource-empty-attribute-value.html [ Crash ] fast/frames/viewsource-linebreak.html [ Crash ] fast/frames/viewsource-link-on-href-value.html [ Crash ] fast/frames/viewsource-on-image-file.html [ Crash ] fast/frames/viewsource-plain-text-tags.html [ Crash ] fast/frames/viewsource-unfinished-tags.html [ Crash ] fast/frames/viewsource-xml.html [ Crash ] http/tests/security/view-source-no-javascript-url.html [ Crash ] http/tests/security/view-source-no-refresh.html [ Crash ] http/tests/xmlviewer/dumpAsText/existing-tree-element-crash.xml [ Crash ] http/tests/xmlviewer/dumpAsText/xlink.xml [ Crash ] http/tests/xmlviewer/dumpAsText/xmlviewer-charset-cp1251.xml [ Crash ] http/tests/xmlviewer/dumpAsText/xmlviewer-charset-utf8.xml [ Crash ] http/tests/xmlviewer/dumpAsText/xmlviewer.xml [ Crash ] http/tests/xmlviewer/dumpAsText/xul.xml [ Crash ] svg/hixie/error/dumpAsText/005.xml [ Crash ] 931384 8 darin 2013-09-20 09:09:12 -0700 Checking into the crashes now. 931388 9 212179 darin 2013-09-20 09:13:57 -0700 Created attachment 212179 Patch 931389 10 darin 2013-09-20 09:14:26 -0700 I uploaded this new patch while I am testing it locally to give the bots a chance to get a crack at it too. 931431 11 212179 ap 2013-09-20 10:10:58 -0700 Comment on attachment 212179 Patch EWS is happy, and so am I. 931437 12 212179 commit-queue 2013-09-20 10:17:08 -0700 Comment on attachment 212179 Patch Clearing flags on attachment: 212179 Committed r156178: <http://trac.webkit.org/changeset/156178> 931438 13 commit-queue 2013-09-20 10:17:12 -0700 All reviewed patches have been landed. Closing bug. 212165 2013-09-20 07:54:58 -0700 2013-09-20 08:04:20 -0700 Patch bug-121683-20130920075457.patch text/plain 8292 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJhNGU1MDRlYjkwMjY4 MmFjZGQ0YTI2YjA3MDg0ZjBkYmFmYTRjNS4uMDVjZDgyOTY5YzBiMThkMjNlZDUzNWIwYzgzMDAw MGRkZGEzNDU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA5LTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggYSBjb3VwbGUgbW9yZSBD U1MgbGVha3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMTY4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYXJz ZVVBU2hlZXQpOiBSZXR1cm4gYSBQYXNzUmVmUHRyLiBPbmUgb2YgdGhlIGNhbGwgc2l0ZXMgZGlk IG5vdAorICAgICAgICB3YW50IGEgbGVha1B0ci4KKyAgICAgICAgKFdlYkNvcmU6OkNTU0RlZmF1 bHRTdHlsZVNoZWV0czo6bG9hZEZ1bGxEZWZhdWx0U3R5bGUpOiBEbyB0aGUgbGVha1B0ciBoZXJl LAorICAgICAgICB3aGVyZSB0aGUgZmFjdCB0aGF0IHdlIGFyZSBzdG9yaW5nIGludG8gYSBnbG9i YWwgdmFyaWFibGUgaXMgbW9yZSBvYnZpb3VzLgorICAgICAgICAoV2ViQ29yZTo6Q1NTRGVmYXVs dFN0eWxlU2hlZXRzOjpsb2FkU2ltcGxlRGVmYXVsdFN0eWxlKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpDU1NEZWZhdWx0U3R5bGVTaGVldHM6OnZpZXdTb3VyY2VTdHlsZSk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRGVmYXVsdFN0eWxlU2hlZXRzOjplbnN1cmVEZWZhdWx0U3R5 bGVTaGVldHNGb3JFbGVtZW50KTogRGl0dG8uCisKKyAgICAgICAgKiBjc3MvQ1NTR3JhbW1hci55 LmluOiBBZGRlZCBhIG1pc3NpbmcgYWRvcHRSZWYuIFRoaXMgd2FzIGxlYWtpbmcgYW55IHJ1bGUK KyAgICAgICAgd2UgcGFyc2VkIGluZGl2aWR1YWxseS4KKwogMjAxMy0wOS0yMCAgUGF0cmljayBH YW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbQ01ha2VdIFVzZSBDT01Q SUxFX0RFRklOSVRJT05TIHRhcmdldCBwcm9wZXJ0eSBmb3Igc2V0dGluZyBCVUlMRElOR18qIGRl ZmluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NEZWZhdWx0U3R5bGVTaGVl dHMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKaW5k ZXggNTFjMDVkMzA4YzYyNTFiZDhiMTQ0NmYzYzIyNTFlZjc5MGJjMTg2My4uNTZjZTM4Mjk3MzFh OTBjMTFhOGMyZGFiYTIyMTYwNjYzMWNkZDBhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKQEAgLTc4LDE0ICs3OCwxNCBAQCBzdGF0aWMgY29uc3Qg TWVkaWFRdWVyeUV2YWx1YXRvciYgcHJpbnRFdmFsKCkKICAgICByZXR1cm4gc3RhdGljUHJpbnRF dmFsOwogfQogCi1zdGF0aWMgU3R5bGVTaGVldENvbnRlbnRzKiBwYXJzZVVBU2hlZXQoY29uc3Qg U3RyaW5nJiBzdHIpCitzdGF0aWMgUGFzc1JlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IHBhcnNl VUFTaGVldChjb25zdCBTdHJpbmcmIHN0cmluZykKIHsKLSAgICBTdHlsZVNoZWV0Q29udGVudHMq IHNoZWV0ID0gU3R5bGVTaGVldENvbnRlbnRzOjpjcmVhdGUoKS5sZWFrUmVmKCk7IC8vIGxlYWsg dGhlIHNoZWV0IG9uIHB1cnBvc2UKLSAgICBzaGVldC0+cGFyc2VTdHJpbmcoc3RyKTsKLSAgICBy ZXR1cm4gc2hlZXQ7CisgICAgUmVmUHRyPFN0eWxlU2hlZXRDb250ZW50cz4gc2hlZXQgPSBTdHls ZVNoZWV0Q29udGVudHM6OmNyZWF0ZSgpOworICAgIHNoZWV0LT5wYXJzZVN0cmluZyhzdHJpbmcp OworICAgIHJldHVybiBzaGVldC5yZWxlYXNlKCk7CiB9CiAKLXN0YXRpYyBTdHlsZVNoZWV0Q29u dGVudHMqIHBhcnNlVUFTaGVldChjb25zdCBjaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBzaXpl KQorc3RhdGljIFBhc3NSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRzPiBwYXJzZVVBU2hlZXQoY29u c3QgY2hhciogY2hhcmFjdGVycywgdW5zaWduZWQgc2l6ZSkKIHsKICAgICByZXR1cm4gcGFyc2VV QVNoZWV0KFN0cmluZyhjaGFyYWN0ZXJzLCBzaXplKSk7CiB9CkBAIC0xMTksMTMgKzExOSwxMyBA QCB2b2lkIENTU0RlZmF1bHRTdHlsZVNoZWV0czo6bG9hZEZ1bGxEZWZhdWx0U3R5bGUoKQogCiAg ICAgLy8gU3RyaWN0LW1vZGUgcnVsZXMuCiAgICAgU3RyaW5nIGRlZmF1bHRSdWxlcyA9IFN0cmlu ZyhodG1sVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKGh0bWxVc2VyQWdlbnRTdHlsZVNoZWV0 KSkgKyBSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPmV4dHJhRGVmYXVsdFN0eWxlU2hlZXQo KTsKLSAgICBkZWZhdWx0U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChkZWZhdWx0UnVsZXMpOwor ICAgIGRlZmF1bHRTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KGRlZmF1bHRSdWxlcykubGVha1B0 cigpOwogICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZGVmYXVsdFN0eWxlU2hl ZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgZGVmYXVsdFByaW50U3R5bGUtPmFkZFJ1bGVzRnJvbVNo ZWV0KGRlZmF1bHRTdHlsZVNoZWV0LCBwcmludEV2YWwoKSk7CiAKICAgICAvLyBRdWlya3MtbW9k ZSBydWxlcy4KICAgICBTdHJpbmcgcXVpcmtzUnVsZXMgPSBTdHJpbmcocXVpcmtzVXNlckFnZW50 U3R5bGVTaGVldCwgc2l6ZW9mKHF1aXJrc1VzZXJBZ2VudFN0eWxlU2hlZXQpKSArIFJlbmRlclRo ZW1lOjpkZWZhdWx0VGhlbWUoKS0+ZXh0cmFRdWlya3NTdHlsZVNoZWV0KCk7Ci0gICAgcXVpcmtz U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChxdWlya3NSdWxlcyk7CisgICAgcXVpcmtzU3R5bGVT aGVldCA9IHBhcnNlVUFTaGVldChxdWlya3NSdWxlcykubGVha1B0cigpOwogICAgIGRlZmF1bHRR dWlya3NTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocXVpcmtzU3R5bGVTaGVldCwgc2NyZWVuRXZh bCgpKTsKIH0KIApAQCAtMTM5LDcgKzEzOSw3IEBAIHZvaWQgQ1NTRGVmYXVsdFN0eWxlU2hlZXRz Ojpsb2FkU2ltcGxlRGVmYXVsdFN0eWxlKCkKICAgICBkZWZhdWx0UHJpbnRTdHlsZSA9IGRlZmF1 bHRTdHlsZTsKICAgICBkZWZhdWx0UXVpcmtzU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKS5sZWFr UHRyKCk7CiAKLSAgICBzaW1wbGVEZWZhdWx0U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChzaW1w bGVVc2VyQWdlbnRTdHlsZVNoZWV0LCBzdHJsZW4oc2ltcGxlVXNlckFnZW50U3R5bGVTaGVldCkp OworICAgIHNpbXBsZURlZmF1bHRTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHNpbXBsZVVzZXJB Z2VudFN0eWxlU2hlZXQsIHN0cmxlbihzaW1wbGVVc2VyQWdlbnRTdHlsZVNoZWV0KSkubGVha1B0 cigpOwogICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoc2ltcGxlRGVmYXVsdFN0 eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAKICAgICAvLyBObyBuZWVkIHRvIGluaXRpYWxpemUg cXVpcmtzIHNoZWV0IHlldCBhcyB0aGVyZSBhcmUgbm8gcXVpcmsgcnVsZXMgZm9yIGVsZW1lbnRz IGFsbG93ZWQgaW4gc2ltcGxlIGRlZmF1bHQgc3R5bGUuCkBAIC0xNDksNyArMTQ5LDcgQEAgUnVs ZVNldCogQ1NTRGVmYXVsdFN0eWxlU2hlZXRzOjp2aWV3U291cmNlU3R5bGUoKQogewogICAgIGlm ICghZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSkgewogICAgICAgICBkZWZhdWx0Vmlld1NvdXJjZVN0 eWxlID0gUnVsZVNldDo6Y3JlYXRlKCkubGVha1B0cigpOwotICAgICAgICBkZWZhdWx0Vmlld1Nv dXJjZVN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChwYXJzZVVBU2hlZXQoc291cmNlVXNlckFnZW50 U3R5bGVTaGVldCwgc2l6ZW9mKHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQpKSwgc2NyZWVuRXZh bCgpKTsKKyAgICAgICAgZGVmYXVsdFZpZXdTb3VyY2VTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQo cGFyc2VVQVNoZWV0KHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihzb3VyY2VVc2Vy QWdlbnRTdHlsZVNoZWV0KSkuZ2V0KCksIHNjcmVlbkV2YWwoKSk7CiAgICAgfQogICAgIHJldHVy biBkZWZhdWx0Vmlld1NvdXJjZVN0eWxlOwogfQpAQCAtMTY1LDcgKzE2NSw3IEBAIHZvaWQgQ1NT RGVmYXVsdFN0eWxlU2hlZXRzOjplbnN1cmVEZWZhdWx0U3R5bGVTaGVldHNGb3JFbGVtZW50KEVs ZW1lbnQqIGVsZW1lbnQsCiAjaWYgRU5BQkxFKFNWRykKICAgICBpZiAoZWxlbWVudC0+aXNTVkdF bGVtZW50KCkgJiYgIXN2Z1N0eWxlU2hlZXQpIHsKICAgICAgICAgLy8gU1ZHIHJ1bGVzLgotICAg ICAgICBzdmdTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHN2Z1VzZXJBZ2VudFN0eWxlU2hlZXQs IHNpemVvZihzdmdVc2VyQWdlbnRTdHlsZVNoZWV0KSk7CisgICAgICAgIHN2Z1N0eWxlU2hlZXQg PSBwYXJzZVVBU2hlZXQoc3ZnVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKHN2Z1VzZXJBZ2Vu dFN0eWxlU2hlZXQpKS5sZWFrUHRyKCk7CiAgICAgICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNG cm9tU2hlZXQoc3ZnU3R5bGVTaGVldCwgc2NyZWVuRXZhbCgpKTsKICAgICAgICAgZGVmYXVsdFBy aW50U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHN2Z1N0eWxlU2hlZXQsIHByaW50RXZhbCgpKTsK ICAgICAgICAgY2hhbmdlZERlZmF1bHRTdHlsZSA9IHRydWU7CkBAIC0xNzUsNyArMTc1LDcgQEAg dm9pZCBDU1NEZWZhdWx0U3R5bGVTaGVldHM6OmVuc3VyZURlZmF1bHRTdHlsZVNoZWV0c0ZvckVs ZW1lbnQoRWxlbWVudCogZWxlbWVudCwKICNpZiBFTkFCTEUoTUFUSE1MKQogICAgIGlmIChlbGVt ZW50LT5pc01hdGhNTEVsZW1lbnQoKSAmJiAhbWF0aE1MU3R5bGVTaGVldCkgewogICAgICAgICAv LyBNYXRoTUwgcnVsZXMuCi0gICAgICAgIG1hdGhNTFN0eWxlU2hlZXQgPSBwYXJzZVVBU2hlZXQo bWF0aG1sVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKG1hdGhtbFVzZXJBZ2VudFN0eWxlU2hl ZXQpKTsKKyAgICAgICAgbWF0aE1MU3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChtYXRobWxVc2Vy QWdlbnRTdHlsZVNoZWV0LCBzaXplb2YobWF0aG1sVXNlckFnZW50U3R5bGVTaGVldCkpLmxlYWtQ dHIoKTsKICAgICAgICAgZGVmYXVsdFN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtYXRoTUxTdHls ZVNoZWV0LCBzY3JlZW5FdmFsKCkpOwogICAgICAgICBkZWZhdWx0UHJpbnRTdHlsZS0+YWRkUnVs ZXNGcm9tU2hlZXQobWF0aE1MU3R5bGVTaGVldCwgcHJpbnRFdmFsKCkpOwogICAgICAgICBjaGFu Z2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIENTU0RlZmF1 bHRTdHlsZVNoZWV0czo6ZW5zdXJlRGVmYXVsdFN0eWxlU2hlZXRzRm9yRWxlbWVudChFbGVtZW50 KiBlbGVtZW50LAogI2lmIEVOQUJMRShWSURFTykKICAgICBpZiAoIW1lZGlhQ29udHJvbHNTdHls ZVNoZWV0ICYmIChlbGVtZW50LT5oYXNUYWdOYW1lKHZpZGVvVGFnKSB8fCBpc0hUTUxBdWRpb0Vs ZW1lbnQoZWxlbWVudCkpKSB7CiAgICAgICAgIFN0cmluZyBtZWRpYVJ1bGVzID0gU3RyaW5nKG1l ZGlhQ29udHJvbHNVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2YobWVkaWFDb250cm9sc1VzZXJB Z2VudFN0eWxlU2hlZXQpKSArIFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoZWxlbWVudC0+ZG9j dW1lbnQoKS5wYWdlKCkpLT5leHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KCk7Ci0gICAgICAg IG1lZGlhQ29udHJvbHNTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KG1lZGlhUnVsZXMpOworICAg ICAgICBtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChtZWRpYVJ1bGVzKS5s ZWFrUHRyKCk7CiAgICAgICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQobWVkaWFD b250cm9sc1N0eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgICAgIGRlZmF1bHRQcmludFN0 eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCwgcHJpbnRFdmFs KCkpOwogICAgICAgICBjaGFuZ2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKQEAgLTE5NSw3ICsxOTUs NyBAQCB2b2lkIENTU0RlZmF1bHRTdHlsZVNoZWV0czo6ZW5zdXJlRGVmYXVsdFN0eWxlU2hlZXRz Rm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50LAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkK ICAgICBpZiAoIWZ1bGxzY3JlZW5TdHlsZVNoZWV0ICYmIGVsZW1lbnQtPmRvY3VtZW50KCkud2Vi a2l0SXNGdWxsU2NyZWVuKCkpIHsKICAgICAgICAgU3RyaW5nIGZ1bGxzY3JlZW5SdWxlcyA9IFN0 cmluZyhmdWxsc2NyZWVuVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKGZ1bGxzY3JlZW5Vc2Vy QWdlbnRTdHlsZVNoZWV0KSkgKyBSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPmV4dHJhRnVs bFNjcmVlblN0eWxlU2hlZXQoKTsKLSAgICAgICAgZnVsbHNjcmVlblN0eWxlU2hlZXQgPSBwYXJz ZVVBU2hlZXQoZnVsbHNjcmVlblJ1bGVzKTsKKyAgICAgICAgZnVsbHNjcmVlblN0eWxlU2hlZXQg PSBwYXJzZVVBU2hlZXQoZnVsbHNjcmVlblJ1bGVzKS5sZWFrUHRyKCk7CiAgICAgICAgIGRlZmF1 bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZnVsbHNjcmVlblN0eWxlU2hlZXQsIHNjcmVlbkV2 YWwoKSk7CiAgICAgICAgIGRlZmF1bHRRdWlya3NTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZnVs bHNjcmVlblN0eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgICAgIGNoYW5nZWREZWZhdWx0 U3R5bGUgPSB0cnVlOwpAQCAtMjA2LDcgKzIwNiw3IEBAIHZvaWQgQ1NTRGVmYXVsdFN0eWxlU2hl ZXRzOjplbnN1cmVEZWZhdWx0U3R5bGVTaGVldHNGb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQs CiAgICAgICAgIFN0cmluZyBwbHVnSW5zUnVsZXMgPSBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdl KGVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpKS0+ZXh0cmFQbHVnSW5zU3R5bGVTaGVldCgpICsg ZWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLnBsdWdJbkV4dHJh U3R5bGVTaGVldCgpOwogICAgICAgICBpZiAocGx1Z0luc1J1bGVzLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIHBsdWdJbnNSdWxlcyA9IFN0cmluZyhwbHVnSW5zVXNlckFnZW50U3R5bGVTaGVldCwg c2l6ZW9mKHBsdWdJbnNVc2VyQWdlbnRTdHlsZVNoZWV0KSk7Ci0gICAgICAgIHBsdWdJbnNTdHls ZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHBsdWdJbnNSdWxlcyk7CisgICAgICAgIHBsdWdJbnNTdHls ZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHBsdWdJbnNSdWxlcykubGVha1B0cigpOwogICAgICAgICBk ZWZhdWx0U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBsdWdJbnNTdHlsZVNoZWV0LCBzY3JlZW5F dmFsKCkpOwogICAgICAgICBjaGFuZ2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0dyYW1tYXIueS5pbgppbmRleCAzZDFjM2M3YjUwZjI1NWNlNTc0MjRhYzdkZDUx YWY0YWFhMjhjZDQwLi45YzFkZjNmNmQwZTdiMWJjNzNlODg0ODU1NjRjZDljYmQ4ZjYwMjc3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkuaW4KQEAgLTMyOCw3ICszMjgsNyBAQCBzdHlsZXNo ZWV0OgogI2VuZGlmCiAgIDsKIAotd2Via2l0X3J1bGU6IFdFQktJVF9SVUxFX1NZTSAneycgbWF5 YmVfc3BhY2UgdmFsaWRfcnVsZSBtYXliZV9zcGFjZSAnfScgeyBwYXJzZXItPm1fcnVsZSA9ICQ0 OyB9IDsKK3dlYmtpdF9ydWxlOiBXRUJLSVRfUlVMRV9TWU0gJ3snIG1heWJlX3NwYWNlIHZhbGlk X3J1bGUgbWF5YmVfc3BhY2UgJ30nIHsgcGFyc2VyLT5tX3J1bGUgPSBhZG9wdFJlZigkNCk7IH0g OwogCiB3ZWJraXRfa2V5ZnJhbWVfcnVsZTogV0VCS0lUX0tFWUZSQU1FX1JVTEVfU1lNICd7JyBt YXliZV9zcGFjZSBrZXlmcmFtZV9ydWxlIG1heWJlX3NwYWNlICd9JyB7IHBhcnNlci0+bV9rZXlm cmFtZSA9IGFkb3B0UmVmKCQ0KTsgfSA7CiAK 212166 2013-09-20 08:04:26 -0700 2013-09-20 09:13:50 -0700 Patch bug-121683-20130920080425.patch text/plain 8292 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJhNGU1MDRlYjkwMjY4 MmFjZGQ0YTI2YjA3MDg0ZjBkYmFmYTRjNS4uMDVjZDgyOTY5YzBiMThkMjNlZDUzNWIwYzgzMDAw MGRkZGEzNDU4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA5LTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggYSBjb3VwbGUgbW9yZSBD U1MgbGVha3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMTY4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpwYXJz ZVVBU2hlZXQpOiBSZXR1cm4gYSBQYXNzUmVmUHRyLiBPbmUgb2YgdGhlIGNhbGwgc2l0ZXMgZGlk IG5vdAorICAgICAgICB3YW50IGEgbGVha1B0ci4KKyAgICAgICAgKFdlYkNvcmU6OkNTU0RlZmF1 bHRTdHlsZVNoZWV0czo6bG9hZEZ1bGxEZWZhdWx0U3R5bGUpOiBEbyB0aGUgbGVha1B0ciBoZXJl LAorICAgICAgICB3aGVyZSB0aGUgZmFjdCB0aGF0IHdlIGFyZSBzdG9yaW5nIGludG8gYSBnbG9i YWwgdmFyaWFibGUgaXMgbW9yZSBvYnZpb3VzLgorICAgICAgICAoV2ViQ29yZTo6Q1NTRGVmYXVs dFN0eWxlU2hlZXRzOjpsb2FkU2ltcGxlRGVmYXVsdFN0eWxlKTogRGl0dG8uCisgICAgICAgIChX ZWJDb3JlOjpDU1NEZWZhdWx0U3R5bGVTaGVldHM6OnZpZXdTb3VyY2VTdHlsZSk6IERpdHRvLgor ICAgICAgICAoV2ViQ29yZTo6Q1NTRGVmYXVsdFN0eWxlU2hlZXRzOjplbnN1cmVEZWZhdWx0U3R5 bGVTaGVldHNGb3JFbGVtZW50KTogRGl0dG8uCisKKyAgICAgICAgKiBjc3MvQ1NTR3JhbW1hci55 LmluOiBBZGRlZCBhIG1pc3NpbmcgYWRvcHRSZWYuIFRoaXMgd2FzIGxlYWtpbmcgYW55IHJ1bGUK KyAgICAgICAgd2UgcGFyc2VkIGluZGl2aWR1YWxseS4KKwogMjAxMy0wOS0yMCAgUGF0cmljayBH YW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbQ01ha2VdIFVzZSBDT01Q SUxFX0RFRklOSVRJT05TIHRhcmdldCBwcm9wZXJ0eSBmb3Igc2V0dGluZyBCVUlMRElOR18qIGRl ZmluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NEZWZhdWx0U3R5bGVTaGVl dHMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKaW5k ZXggNTFjMDVkMzA4YzYyNTFiZDhiMTQ0NmYzYzIyNTFlZjc5MGJjMTg2My4uMTFjYzllYmFjNTRk MzY1MDg4MDhhYjM2ZGZkMWQ2Y2Y3MDc3ZmE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKQEAgLTc4LDE0ICs3OCwxNCBAQCBzdGF0aWMgY29uc3Qg TWVkaWFRdWVyeUV2YWx1YXRvciYgcHJpbnRFdmFsKCkKICAgICByZXR1cm4gc3RhdGljUHJpbnRF dmFsOwogfQogCi1zdGF0aWMgU3R5bGVTaGVldENvbnRlbnRzKiBwYXJzZVVBU2hlZXQoY29uc3Qg U3RyaW5nJiBzdHIpCitzdGF0aWMgUGFzc1JlZlB0cjxTdHlsZVNoZWV0Q29udGVudHM+IHBhcnNl VUFTaGVldChjb25zdCBTdHJpbmcmIHN0cmluZykKIHsKLSAgICBTdHlsZVNoZWV0Q29udGVudHMq IHNoZWV0ID0gU3R5bGVTaGVldENvbnRlbnRzOjpjcmVhdGUoKS5sZWFrUmVmKCk7IC8vIGxlYWsg dGhlIHNoZWV0IG9uIHB1cnBvc2UKLSAgICBzaGVldC0+cGFyc2VTdHJpbmcoc3RyKTsKLSAgICBy ZXR1cm4gc2hlZXQ7CisgICAgUmVmUHRyPFN0eWxlU2hlZXRDb250ZW50cz4gc2hlZXQgPSBTdHls ZVNoZWV0Q29udGVudHM6OmNyZWF0ZSgpOworICAgIHNoZWV0LT5wYXJzZVN0cmluZyhzdHJpbmcp OworICAgIHJldHVybiBzaGVldC5yZWxlYXNlKCk7CiB9CiAKLXN0YXRpYyBTdHlsZVNoZWV0Q29u dGVudHMqIHBhcnNlVUFTaGVldChjb25zdCBjaGFyKiBjaGFyYWN0ZXJzLCB1bnNpZ25lZCBzaXpl KQorc3RhdGljIFBhc3NSZWZQdHI8U3R5bGVTaGVldENvbnRlbnRzPiBwYXJzZVVBU2hlZXQoY29u c3QgY2hhciogY2hhcmFjdGVycywgdW5zaWduZWQgc2l6ZSkKIHsKICAgICByZXR1cm4gcGFyc2VV QVNoZWV0KFN0cmluZyhjaGFyYWN0ZXJzLCBzaXplKSk7CiB9CkBAIC0xMTksMTMgKzExOSwxMyBA QCB2b2lkIENTU0RlZmF1bHRTdHlsZVNoZWV0czo6bG9hZEZ1bGxEZWZhdWx0U3R5bGUoKQogCiAg ICAgLy8gU3RyaWN0LW1vZGUgcnVsZXMuCiAgICAgU3RyaW5nIGRlZmF1bHRSdWxlcyA9IFN0cmlu ZyhodG1sVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKGh0bWxVc2VyQWdlbnRTdHlsZVNoZWV0 KSkgKyBSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPmV4dHJhRGVmYXVsdFN0eWxlU2hlZXQo KTsKLSAgICBkZWZhdWx0U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChkZWZhdWx0UnVsZXMpOwor ICAgIGRlZmF1bHRTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KGRlZmF1bHRSdWxlcykubGVha1Jl ZigpOwogICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZGVmYXVsdFN0eWxlU2hl ZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgZGVmYXVsdFByaW50U3R5bGUtPmFkZFJ1bGVzRnJvbVNo ZWV0KGRlZmF1bHRTdHlsZVNoZWV0LCBwcmludEV2YWwoKSk7CiAKICAgICAvLyBRdWlya3MtbW9k ZSBydWxlcy4KICAgICBTdHJpbmcgcXVpcmtzUnVsZXMgPSBTdHJpbmcocXVpcmtzVXNlckFnZW50 U3R5bGVTaGVldCwgc2l6ZW9mKHF1aXJrc1VzZXJBZ2VudFN0eWxlU2hlZXQpKSArIFJlbmRlclRo ZW1lOjpkZWZhdWx0VGhlbWUoKS0+ZXh0cmFRdWlya3NTdHlsZVNoZWV0KCk7Ci0gICAgcXVpcmtz U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChxdWlya3NSdWxlcyk7CisgICAgcXVpcmtzU3R5bGVT aGVldCA9IHBhcnNlVUFTaGVldChxdWlya3NSdWxlcykubGVha1JlZigpOwogICAgIGRlZmF1bHRR dWlya3NTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQocXVpcmtzU3R5bGVTaGVldCwgc2NyZWVuRXZh bCgpKTsKIH0KIApAQCAtMTM5LDcgKzEzOSw3IEBAIHZvaWQgQ1NTRGVmYXVsdFN0eWxlU2hlZXRz Ojpsb2FkU2ltcGxlRGVmYXVsdFN0eWxlKCkKICAgICBkZWZhdWx0UHJpbnRTdHlsZSA9IGRlZmF1 bHRTdHlsZTsKICAgICBkZWZhdWx0UXVpcmtzU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKS5sZWFr UHRyKCk7CiAKLSAgICBzaW1wbGVEZWZhdWx0U3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChzaW1w bGVVc2VyQWdlbnRTdHlsZVNoZWV0LCBzdHJsZW4oc2ltcGxlVXNlckFnZW50U3R5bGVTaGVldCkp OworICAgIHNpbXBsZURlZmF1bHRTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHNpbXBsZVVzZXJB Z2VudFN0eWxlU2hlZXQsIHN0cmxlbihzaW1wbGVVc2VyQWdlbnRTdHlsZVNoZWV0KSkubGVha1Jl ZigpOwogICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoc2ltcGxlRGVmYXVsdFN0 eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAKICAgICAvLyBObyBuZWVkIHRvIGluaXRpYWxpemUg cXVpcmtzIHNoZWV0IHlldCBhcyB0aGVyZSBhcmUgbm8gcXVpcmsgcnVsZXMgZm9yIGVsZW1lbnRz IGFsbG93ZWQgaW4gc2ltcGxlIGRlZmF1bHQgc3R5bGUuCkBAIC0xNDksNyArMTQ5LDcgQEAgUnVs ZVNldCogQ1NTRGVmYXVsdFN0eWxlU2hlZXRzOjp2aWV3U291cmNlU3R5bGUoKQogewogICAgIGlm ICghZGVmYXVsdFZpZXdTb3VyY2VTdHlsZSkgewogICAgICAgICBkZWZhdWx0Vmlld1NvdXJjZVN0 eWxlID0gUnVsZVNldDo6Y3JlYXRlKCkubGVha1B0cigpOwotICAgICAgICBkZWZhdWx0Vmlld1Nv dXJjZVN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChwYXJzZVVBU2hlZXQoc291cmNlVXNlckFnZW50 U3R5bGVTaGVldCwgc2l6ZW9mKHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQpKSwgc2NyZWVuRXZh bCgpKTsKKyAgICAgICAgZGVmYXVsdFZpZXdTb3VyY2VTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQo cGFyc2VVQVNoZWV0KHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hlZXQsIHNpemVvZihzb3VyY2VVc2Vy QWdlbnRTdHlsZVNoZWV0KSkuZ2V0KCksIHNjcmVlbkV2YWwoKSk7CiAgICAgfQogICAgIHJldHVy biBkZWZhdWx0Vmlld1NvdXJjZVN0eWxlOwogfQpAQCAtMTY1LDcgKzE2NSw3IEBAIHZvaWQgQ1NT RGVmYXVsdFN0eWxlU2hlZXRzOjplbnN1cmVEZWZhdWx0U3R5bGVTaGVldHNGb3JFbGVtZW50KEVs ZW1lbnQqIGVsZW1lbnQsCiAjaWYgRU5BQkxFKFNWRykKICAgICBpZiAoZWxlbWVudC0+aXNTVkdF bGVtZW50KCkgJiYgIXN2Z1N0eWxlU2hlZXQpIHsKICAgICAgICAgLy8gU1ZHIHJ1bGVzLgotICAg ICAgICBzdmdTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHN2Z1VzZXJBZ2VudFN0eWxlU2hlZXQs IHNpemVvZihzdmdVc2VyQWdlbnRTdHlsZVNoZWV0KSk7CisgICAgICAgIHN2Z1N0eWxlU2hlZXQg PSBwYXJzZVVBU2hlZXQoc3ZnVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKHN2Z1VzZXJBZ2Vu dFN0eWxlU2hlZXQpKS5sZWFrUmVmKCk7CiAgICAgICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNG cm9tU2hlZXQoc3ZnU3R5bGVTaGVldCwgc2NyZWVuRXZhbCgpKTsKICAgICAgICAgZGVmYXVsdFBy aW50U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHN2Z1N0eWxlU2hlZXQsIHByaW50RXZhbCgpKTsK ICAgICAgICAgY2hhbmdlZERlZmF1bHRTdHlsZSA9IHRydWU7CkBAIC0xNzUsNyArMTc1LDcgQEAg dm9pZCBDU1NEZWZhdWx0U3R5bGVTaGVldHM6OmVuc3VyZURlZmF1bHRTdHlsZVNoZWV0c0ZvckVs ZW1lbnQoRWxlbWVudCogZWxlbWVudCwKICNpZiBFTkFCTEUoTUFUSE1MKQogICAgIGlmIChlbGVt ZW50LT5pc01hdGhNTEVsZW1lbnQoKSAmJiAhbWF0aE1MU3R5bGVTaGVldCkgewogICAgICAgICAv LyBNYXRoTUwgcnVsZXMuCi0gICAgICAgIG1hdGhNTFN0eWxlU2hlZXQgPSBwYXJzZVVBU2hlZXQo bWF0aG1sVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKG1hdGhtbFVzZXJBZ2VudFN0eWxlU2hl ZXQpKTsKKyAgICAgICAgbWF0aE1MU3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChtYXRobWxVc2Vy QWdlbnRTdHlsZVNoZWV0LCBzaXplb2YobWF0aG1sVXNlckFnZW50U3R5bGVTaGVldCkpLmxlYWtS ZWYoKTsKICAgICAgICAgZGVmYXVsdFN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtYXRoTUxTdHls ZVNoZWV0LCBzY3JlZW5FdmFsKCkpOwogICAgICAgICBkZWZhdWx0UHJpbnRTdHlsZS0+YWRkUnVs ZXNGcm9tU2hlZXQobWF0aE1MU3R5bGVTaGVldCwgcHJpbnRFdmFsKCkpOwogICAgICAgICBjaGFu Z2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKQEAgLTE4NSw3ICsxODUsNyBAQCB2b2lkIENTU0RlZmF1 bHRTdHlsZVNoZWV0czo6ZW5zdXJlRGVmYXVsdFN0eWxlU2hlZXRzRm9yRWxlbWVudChFbGVtZW50 KiBlbGVtZW50LAogI2lmIEVOQUJMRShWSURFTykKICAgICBpZiAoIW1lZGlhQ29udHJvbHNTdHls ZVNoZWV0ICYmIChlbGVtZW50LT5oYXNUYWdOYW1lKHZpZGVvVGFnKSB8fCBpc0hUTUxBdWRpb0Vs ZW1lbnQoZWxlbWVudCkpKSB7CiAgICAgICAgIFN0cmluZyBtZWRpYVJ1bGVzID0gU3RyaW5nKG1l ZGlhQ29udHJvbHNVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2YobWVkaWFDb250cm9sc1VzZXJB Z2VudFN0eWxlU2hlZXQpKSArIFJlbmRlclRoZW1lOjp0aGVtZUZvclBhZ2UoZWxlbWVudC0+ZG9j dW1lbnQoKS5wYWdlKCkpLT5leHRyYU1lZGlhQ29udHJvbHNTdHlsZVNoZWV0KCk7Ci0gICAgICAg IG1lZGlhQ29udHJvbHNTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KG1lZGlhUnVsZXMpOworICAg ICAgICBtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCA9IHBhcnNlVUFTaGVldChtZWRpYVJ1bGVzKS5s ZWFrUmVmKCk7CiAgICAgICAgIGRlZmF1bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQobWVkaWFD b250cm9sc1N0eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgICAgIGRlZmF1bHRQcmludFN0 eWxlLT5hZGRSdWxlc0Zyb21TaGVldChtZWRpYUNvbnRyb2xzU3R5bGVTaGVldCwgcHJpbnRFdmFs KCkpOwogICAgICAgICBjaGFuZ2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKQEAgLTE5NSw3ICsxOTUs NyBAQCB2b2lkIENTU0RlZmF1bHRTdHlsZVNoZWV0czo6ZW5zdXJlRGVmYXVsdFN0eWxlU2hlZXRz Rm9yRWxlbWVudChFbGVtZW50KiBlbGVtZW50LAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkK ICAgICBpZiAoIWZ1bGxzY3JlZW5TdHlsZVNoZWV0ICYmIGVsZW1lbnQtPmRvY3VtZW50KCkud2Vi a2l0SXNGdWxsU2NyZWVuKCkpIHsKICAgICAgICAgU3RyaW5nIGZ1bGxzY3JlZW5SdWxlcyA9IFN0 cmluZyhmdWxsc2NyZWVuVXNlckFnZW50U3R5bGVTaGVldCwgc2l6ZW9mKGZ1bGxzY3JlZW5Vc2Vy QWdlbnRTdHlsZVNoZWV0KSkgKyBSZW5kZXJUaGVtZTo6ZGVmYXVsdFRoZW1lKCktPmV4dHJhRnVs bFNjcmVlblN0eWxlU2hlZXQoKTsKLSAgICAgICAgZnVsbHNjcmVlblN0eWxlU2hlZXQgPSBwYXJz ZVVBU2hlZXQoZnVsbHNjcmVlblJ1bGVzKTsKKyAgICAgICAgZnVsbHNjcmVlblN0eWxlU2hlZXQg PSBwYXJzZVVBU2hlZXQoZnVsbHNjcmVlblJ1bGVzKS5sZWFrUmVmKCk7CiAgICAgICAgIGRlZmF1 bHRTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZnVsbHNjcmVlblN0eWxlU2hlZXQsIHNjcmVlbkV2 YWwoKSk7CiAgICAgICAgIGRlZmF1bHRRdWlya3NTdHlsZS0+YWRkUnVsZXNGcm9tU2hlZXQoZnVs bHNjcmVlblN0eWxlU2hlZXQsIHNjcmVlbkV2YWwoKSk7CiAgICAgICAgIGNoYW5nZWREZWZhdWx0 U3R5bGUgPSB0cnVlOwpAQCAtMjA2LDcgKzIwNiw3IEBAIHZvaWQgQ1NTRGVmYXVsdFN0eWxlU2hl ZXRzOjplbnN1cmVEZWZhdWx0U3R5bGVTaGVldHNGb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQs CiAgICAgICAgIFN0cmluZyBwbHVnSW5zUnVsZXMgPSBSZW5kZXJUaGVtZTo6dGhlbWVGb3JQYWdl KGVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpKS0+ZXh0cmFQbHVnSW5zU3R5bGVTaGVldCgpICsg ZWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCktPmNocm9tZSgpLmNsaWVudCgpLnBsdWdJbkV4dHJh U3R5bGVTaGVldCgpOwogICAgICAgICBpZiAocGx1Z0luc1J1bGVzLmlzRW1wdHkoKSkKICAgICAg ICAgICAgIHBsdWdJbnNSdWxlcyA9IFN0cmluZyhwbHVnSW5zVXNlckFnZW50U3R5bGVTaGVldCwg c2l6ZW9mKHBsdWdJbnNVc2VyQWdlbnRTdHlsZVNoZWV0KSk7Ci0gICAgICAgIHBsdWdJbnNTdHls ZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHBsdWdJbnNSdWxlcyk7CisgICAgICAgIHBsdWdJbnNTdHls ZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHBsdWdJbnNSdWxlcykubGVha1JlZigpOwogICAgICAgICBk ZWZhdWx0U3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBsdWdJbnNTdHlsZVNoZWV0LCBzY3JlZW5F dmFsKCkpOwogICAgICAgICBjaGFuZ2VkRGVmYXVsdFN0eWxlID0gdHJ1ZTsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0dyYW1tYXIueS5pbgppbmRleCAzZDFjM2M3YjUwZjI1NWNlNTc0MjRhYzdkZDUx YWY0YWFhMjhjZDQwLi45YzFkZjNmNmQwZTdiMWJjNzNlODg0ODU1NjRjZDljYmQ4ZjYwMjc3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NHcmFtbWFyLnkuaW4KQEAgLTMyOCw3ICszMjgsNyBAQCBzdHlsZXNo ZWV0OgogI2VuZGlmCiAgIDsKIAotd2Via2l0X3J1bGU6IFdFQktJVF9SVUxFX1NZTSAneycgbWF5 YmVfc3BhY2UgdmFsaWRfcnVsZSBtYXliZV9zcGFjZSAnfScgeyBwYXJzZXItPm1fcnVsZSA9ICQ0 OyB9IDsKK3dlYmtpdF9ydWxlOiBXRUJLSVRfUlVMRV9TWU0gJ3snIG1heWJlX3NwYWNlIHZhbGlk X3J1bGUgbWF5YmVfc3BhY2UgJ30nIHsgcGFyc2VyLT5tX3J1bGUgPSBhZG9wdFJlZigkNCk7IH0g OwogCiB3ZWJraXRfa2V5ZnJhbWVfcnVsZTogV0VCS0lUX0tFWUZSQU1FX1JVTEVfU1lNICd7JyBt YXliZV9zcGFjZSBrZXlmcmFtZV9ydWxlIG1heWJlX3NwYWNlICd9JyB7IHBhcnNlci0+bV9rZXlm cmFtZSA9IGFkb3B0UmVmKCQ0KTsgfSA7CiAK 212179 2013-09-20 09:13:57 -0700 2013-09-20 10:17:08 -0700 Patch bug-121683-20130920091356.patch text/plain 2520 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTU2MTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGJhNGU1MDRlYjkwMjY4 MmFjZGQ0YTI2YjA3MDg0ZjBkYmFmYTRjNS4uYjlkNGZlNjViNDg3ODllZTA0NDM0ODM0YmVmMGNl YmYwNTg5YTBhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA5LTIwICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggYSBjb3VwbGUgbW9yZSBD U1MgbGVha3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyMTY4MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NE ZWZhdWx0U3R5bGVTaGVldHM6OnZpZXdTb3VyY2VTdHlsZSk6IFB1dCB0aGUgcmVzdWx0IG9mIHRo ZQorICAgICAgICBwYXJzZVVBU2hlZXQgaW50byBhIGdsb2JhbCB2YXJpYWJsZSBzbyBpdCBkb2Vz bid0IHNob3cgdXAgYXMgYSBzdG9yYWdlIGxlYWsuCisKKyAgICAgICAgKiBjc3MvQ1NTR3JhbW1h ci55LmluOiBBZGRlZCBhIG1pc3NpbmcgYWRvcHRSZWYuIFRoaXMgd2FzIGxlYWtpbmcgYW55IHJ1 bGUKKyAgICAgICAgd2UgcGFyc2VkIGluZGl2aWR1YWxseS4KKwogMjAxMy0wOS0yMCAgUGF0cmlj ayBHYW5zdGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBbQ01ha2VdIFVzZSBD T01QSUxFX0RFRklOSVRJT05TIHRhcmdldCBwcm9wZXJ0eSBmb3Igc2V0dGluZyBCVUlMRElOR18q IGRlZmluZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NEZWZhdWx0U3R5bGVT aGVldHMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAK aW5kZXggNTFjMDVkMzA4YzYyNTFiZDhiMTQ0NmYzYzIyNTFlZjc5MGJjMTg2My4uMDEwNTVmZmYz YWZiNjE4NzRlMzYwNmNmMGM1NDEzYTU4ZmQwNGMzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU0RlZmF1bHRTdHlsZVNoZWV0cy5jcHAKQEAgLTE0OCw4ICsxNDgsOSBAQCB2b2lkIENTU0Rl ZmF1bHRTdHlsZVNoZWV0czo6bG9hZFNpbXBsZURlZmF1bHRTdHlsZSgpCiBSdWxlU2V0KiBDU1NE ZWZhdWx0U3R5bGVTaGVldHM6OnZpZXdTb3VyY2VTdHlsZSgpCiB7CiAgICAgaWYgKCFkZWZhdWx0 Vmlld1NvdXJjZVN0eWxlKSB7CisgICAgICAgIHN0YXRpYyBTdHlsZVNoZWV0Q29udGVudHMqIHZp ZXdTb3VyY2VTdHlsZVNoZWV0ID0gcGFyc2VVQVNoZWV0KHNvdXJjZVVzZXJBZ2VudFN0eWxlU2hl ZXQsIHNpemVvZihzb3VyY2VVc2VyQWdlbnRTdHlsZVNoZWV0KSk7CiAgICAgICAgIGRlZmF1bHRW aWV3U291cmNlU3R5bGUgPSBSdWxlU2V0OjpjcmVhdGUoKS5sZWFrUHRyKCk7Ci0gICAgICAgIGRl ZmF1bHRWaWV3U291cmNlU3R5bGUtPmFkZFJ1bGVzRnJvbVNoZWV0KHBhcnNlVUFTaGVldChzb3Vy Y2VVc2VyQWdlbnRTdHlsZVNoZWV0LCBzaXplb2Yoc291cmNlVXNlckFnZW50U3R5bGVTaGVldCkp LCBzY3JlZW5FdmFsKCkpOworICAgICAgICBkZWZhdWx0Vmlld1NvdXJjZVN0eWxlLT5hZGRSdWxl c0Zyb21TaGVldCh2aWV3U291cmNlU3R5bGVTaGVldCwgc2NyZWVuRXZhbCgpKTsKICAgICB9CiAg ICAgcmV0dXJuIGRlZmF1bHRWaWV3U291cmNlU3R5bGU7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0dyYW1t YXIueS5pbgppbmRleCAzZDFjM2M3YjUwZjI1NWNlNTc0MjRhYzdkZDUxYWY0YWFhMjhjZDQwLi45 YzFkZjNmNmQwZTdiMWJjNzNlODg0ODU1NjRjZDljYmQ4ZjYwMjc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTR3JhbW1hci55LmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NHcmFtbWFyLnkuaW4KQEAgLTMyOCw3ICszMjgsNyBAQCBzdHlsZXNoZWV0OgogI2VuZGlmCiAg IDsKIAotd2Via2l0X3J1bGU6IFdFQktJVF9SVUxFX1NZTSAneycgbWF5YmVfc3BhY2UgdmFsaWRf cnVsZSBtYXliZV9zcGFjZSAnfScgeyBwYXJzZXItPm1fcnVsZSA9ICQ0OyB9IDsKK3dlYmtpdF9y dWxlOiBXRUJLSVRfUlVMRV9TWU0gJ3snIG1heWJlX3NwYWNlIHZhbGlkX3J1bGUgbWF5YmVfc3Bh Y2UgJ30nIHsgcGFyc2VyLT5tX3J1bGUgPSBhZG9wdFJlZigkNCk7IH0gOwogCiB3ZWJraXRfa2V5 ZnJhbWVfcnVsZTogV0VCS0lUX0tFWUZSQU1FX1JVTEVfU1lNICd7JyBtYXliZV9zcGFjZSBrZXlm cmFtZV9ydWxlIG1heWJlX3NwYWNlICd9JyB7IHBhcnNlci0+bV9rZXlmcmFtZSA9IGFkb3B0UmVm KCQ0KTsgfSA7CiAK