68551 2011-09-21 11:28:19 -0700 border-width: initial and border-color: initial cannot be removed via CSSOM 2012-01-09 13:14:49 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ayg webkit-unassigned ap dglazkov kling koivisto macpherson webkit.review.bot oldest_to_newest 470980 0 ayg 2011-09-21 11:28:19 -0700 Test case: data:text/html,<!doctype html> <span style="border-width: initial"></span> <script> var span = document.querySelector("span"); span.style.borderWidth = ""; span.style.removeProperty("border-width"); span.style.removeProperty("borderWidth"); alert(span.style.cssText); </script> In Chrome 15 dev, this alerts "border-width: initial; ". Opera 11.50 does something similar. Firefox 8.0a2 alerts the empty string, as expected. A similar test in IE9 (it doesn't like the data URL, so I used Live DOM Viewer) also alerts the empty string. Chrome's behavior is very unexpected. Chrome behaves the same for border-color. In fact, if you do data:text/html,<!doctype html> <span style="border: 0"></span> <script> var span = document.querySelector("span"); span.style.border = ""; alert(span.style.cssText); </script> it alerts "border-style: initial; border-color: initial; ", which suggests these two properties have some peculiar bug. 514690 1 117789 kling 2011-12-04 08:02:55 -0800 Created attachment 117789 Proposed patch 514699 2 117789 webkit.review.bot 2011-12-04 09:00:20 -0800 Comment on attachment 117789 Proposed patch Attachment 117789 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10701556 New failing tests: fast/dom/HTMLMeterElement/meter-element-markup.html fast/dom/HTMLProgressElement/progress-element-markup.html 514727 3 117800 kling 2011-12-04 11:41:34 -0800 Created attachment 117800 Patch 514815 4 117800 kling 2011-12-04 18:29:41 -0800 Comment on attachment 117800 Patch Clearing flags on attachment: 117800 Committed r101970: <http://trac.webkit.org/changeset/101970> 514816 5 kling 2011-12-04 18:29:50 -0800 All reviewed patches have been landed. Closing bug. 532438 6 ayg 2012-01-09 12:54:22 -0800 The test-cases from comment #0 still fail in Google Chrome 17.0.963.26 (Official Build 116225) dev. about:version reports WebKit 535.11 (@103967), and 103967 is greater than 101970. Do the test-cases in comment #0 actually work correctly in WebKit trunk? 532447 7 kling 2012-01-09 13:00:45 -0800 (In reply to comment #6) > The test-cases from comment #0 still fail in Google Chrome 17.0.963.26 (Official Build 116225) dev. about:version reports WebKit 535.11 (@103967), and 103967 is greater than 101970. Do the test-cases in comment #0 actually work correctly in WebKit trunk? I'm not familiar enough with the Chrome release process to know what's up with that. FWIW it works in WebKit trunk with Safari, and with the latest Chrome Canary build. :) 532464 8 ap 2012-01-09 13:14:49 -0800 So, marking RESOLVED again. 117789 2011-12-04 08:02:55 -0800 2011-12-04 09:06:35 -0800 Proposed patch bug-68551.diff text/plain 9309 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMjEzNzE4Li4wODZjNDM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTIt MDQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIGJvcmRlci13 aWR0aDogaW5pdGlhbCBhbmQgYm9yZGVyLWNvbG9yOiBpbml0aWFsIGNhbm5vdCBiZSByZW1vdmVk IHZpYSBDU1NPTS4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjg1NTE+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgdGVzdCB2ZXJp ZnlpbmcgdGhhdCBzaG9ydGhhbmQgcHJvcGVydGllcyBjYW4gYmUgYWRkZWQvcmVtb3ZlZAorICAg ICAgICB2aWEgQ1NTT00nUyBDU1NTdHlsZURlY2xhcmF0aW9uIGludGVyZmFjZS4KKworICAgICAg ICAqIGZhc3QvY3NzL2Nzc29tLXJlbW92ZS1zaG9ydGhhbmQtcHJvcGVydHktZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5kLXByb3Bl cnR5Lmh0bWw6IEFkZGVkLgorCiAyMDExLTEyLTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBVcGRhdGUgc29tZSBsYXlvdXQgdGVzdCBleHBlY3RlZCByZXN1bHRz CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5k LXByb3BlcnR5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Nzc29tLXJlbW92 ZS1zaG9ydGhhbmQtcHJvcGVydHktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmM4Yzg3NTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5kLXByb3BlcnR5LWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDQ3IEBACitUZXN0cyB0aGF0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGNhbiBiZSByZW1vdmVk IHZpYSBDU1NPTS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNT IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgY2FuU2V0 UHJvcGVydHkoJ2ZvbnQnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdmb250Jykg aXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYm9yZGVyLXRvcCcpIGlzIHRydWUKK1BBU1Mg Y2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci10b3AnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3Bl cnR5KCdib3JkZXItcmlnaHQnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3Jk ZXItcmlnaHQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItYm90dG9tJykg aXMgdHJ1ZQorUEFTUyBjYW5SZW1vdmVQcm9wZXJ0eSgnYm9yZGVyLWJvdHRvbScpIGlzIHRydWUK K1BBU1MgY2FuU2V0UHJvcGVydHkoJ2JvcmRlci1sZWZ0JykgaXMgdHJ1ZQorUEFTUyBjYW5SZW1v dmVQcm9wZXJ0eSgnYm9yZGVyLWxlZnQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdi b3JkZXInKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXInKSBpcyB0cnVl CitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItY29sb3InKSBpcyB0cnVlCitQQVNTIGNhblJl bW92ZVByb3BlcnR5KCdib3JkZXItY29sb3InKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5 KCdib3JkZXItc3R5bGUnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXIt c3R5bGUnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItd2lkdGgnKSBpcyB0 cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXItd2lkdGgnKSBpcyB0cnVlCitQQVNT IGNhblNldFByb3BlcnR5KCdiYWNrZ3JvdW5kLXBvc2l0aW9uJykgaXMgdHJ1ZQorUEFTUyBjYW5S ZW1vdmVQcm9wZXJ0eSgnYmFja2dyb3VuZC1wb3NpdGlvbicpIGlzIHRydWUKK1BBU1MgY2FuU2V0 UHJvcGVydHkoJ2JhY2tncm91bmQtcmVwZWF0JykgaXMgdHJ1ZQorUEFTUyBjYW5SZW1vdmVQcm9w ZXJ0eSgnYmFja2dyb3VuZC1yZXBlYXQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdi b3JkZXItc3BhY2luZycpIGlzIHRydWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci1z cGFjaW5nJykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnbGlzdC1zdHlsZScpIGlzIHRy dWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2xpc3Qtc3R5bGUnKSBpcyB0cnVlCitQQVNTIGNh blNldFByb3BlcnR5KCdtYXJnaW4nKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdt YXJnaW4nKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdvdXRsaW5lJykgaXMgdHJ1ZQor UEFTUyBjYW5SZW1vdmVQcm9wZXJ0eSgnb3V0bGluZScpIGlzIHRydWUKK1BBU1MgY2FuU2V0UHJv cGVydHkoJ3BhZGRpbmcnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdwYWRkaW5n JykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYmFja2dyb3VuZCcpIGlzIHRydWUKK1BB U1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JhY2tncm91bmQnKSBpcyB0cnVlCitQQVNTIGNhblNldFBy b3BlcnR5KCdvdmVyZmxvdycpIGlzIHRydWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ292ZXJm bG93JykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYm9yZGVyLXJhZGl1cycpIGlzIHRy dWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci1yYWRpdXMnKSBpcyB0cnVlCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY3Nzb20tcmVtb3ZlLXNob3J0aGFuZC1wcm9wZXJ0eS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY3Nzb20tcmVtb3ZlLXNob3J0aGFuZC1wcm9wZXJ0 eS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJmOGY5MzUKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5k LXByb3BlcnR5Lmh0bWwKQEAgLTAsMCArMSw1NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+ CisKK3Nob3J0aGFuZFByb3BlcnRpZXMgPSBbCisgICAgImZvbnQiLAorICAgICJib3JkZXItdG9w IiwKKyAgICAiYm9yZGVyLXJpZ2h0IiwKKyAgICAiYm9yZGVyLWJvdHRvbSIsCisgICAgImJvcmRl ci1sZWZ0IiwKKyAgICAiYm9yZGVyIiwKKyAgICAiYm9yZGVyLWNvbG9yIiwKKyAgICAiYm9yZGVy LXN0eWxlIiwKKyAgICAiYm9yZGVyLXdpZHRoIiwKKyAgICAiYmFja2dyb3VuZC1wb3NpdGlvbiIs CisgICAgImJhY2tncm91bmQtcmVwZWF0IiwKKyAgICAiYm9yZGVyLXNwYWNpbmciLAorICAgICJs aXN0LXN0eWxlIiwKKyAgICAibWFyZ2luIiwKKyAgICAib3V0bGluZSIsCisgICAgInBhZGRpbmci LAorICAgICJiYWNrZ3JvdW5kIiwKKyAgICAib3ZlcmZsb3ciLAorICAgICJib3JkZXItcmFkaXVz IgorXTsKKworZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3NwYW4nKTsKKworZnVu Y3Rpb24gY2FuU2V0UHJvcGVydHkocHJvcGVydHlOYW1lKSB7CisgICAgZWxlbWVudC5zdHlsZS5z ZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsICdpbml0aWFsJyk7CisgICAgcmV0dXJuIGVsZW1lbnQu c3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShwcm9wZXJ0eU5hbWUpID09ICdpbml0aWFsJzsKK30KKwor ZnVuY3Rpb24gY2FuUmVtb3ZlUHJvcGVydHkocHJvcGVydHlOYW1lKSB7CisgICAgZWxlbWVudC5z dHlsZS5yZW1vdmVQcm9wZXJ0eShwcm9wZXJ0eU5hbWUpOworICAgIHJldHVybiBlbGVtZW50LnN0 eWxlLmdldFByb3BlcnR5VmFsdWUocHJvcGVydHlOYW1lKSAhPSAnaW5pdGlhbCc7Cit9CisKK2Rl c2NyaXB0aW9uKCJUZXN0cyB0aGF0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGNhbiBiZSByZW1vdmVk IHZpYSBDU1NPTS4iKTsKKworZm9yIChpID0gMDsgaSA8IHNob3J0aGFuZFByb3BlcnRpZXMubGVu Z3RoOyArK2kpIHsKKyAgICB2YXIgcHJvcGVydHlOYW1lID0gc2hvcnRoYW5kUHJvcGVydGllc1tp XTsKKworICAgIHNob3VsZEJlKCJjYW5TZXRQcm9wZXJ0eSgnIiArIHByb3BlcnR5TmFtZSArICIn KSIsICJ0cnVlIik7CisgICAgc2hvdWxkQmUoImNhblJlbW92ZVByb3BlcnR5KCciICsgcHJvcGVy dHlOYW1lICsgIicpIiwgInRydWUiKTsKK30KKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4v anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYzI4NDIyNi4uYmIzNDBkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDExLTEyLTA0ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKworICAg ICAgICBib3JkZXItd2lkdGg6IGluaXRpYWwgYW5kIGJvcmRlci1jb2xvcjogaW5pdGlhbCBjYW5u b3QgYmUgcmVtb3ZlZCB2aWEgQ1NTT00uCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzY4 NTUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRl c3Q6IGZhc3QvY3NzL2Nzc29tLXJlbW92ZS1zaG9ydGhhbmQtcHJvcGVydHkuaHRtbAorCisgICAg ICAgIFdoZW4gYXNrZWQgdG8gcmVtb3ZlIGEgc2hvcnRoYW5kIHByb3BlcnR5LCB3ZSBzaG91bGQg dG9zcyBvdXQgYm90aCB0aGUKKyAgICAgICAgc3ViLXByb3BlcnRpZXMgb2YgdGhhdCBzaG9ydGhh bmQgYXMgd2VsbCBhcyB0aGUgc2hvcnRoYW5kIGl0c2VsZiwgc2hvdWxkIHRoZQorICAgICAgICBk ZWNsYXJhdGlvbiBjb250YWluIGl0LiBUaGUgbGF0dGVyIHBhcnQgd2FzIG1pc3NpbmcgaW4gb3Vy IGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uLmg6CisgICAgICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpyZW1vdmVQcm9wZXJ0 aWVzSW5TZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246 OnJlbW92ZVNob3J0aGFuZFByb3BlcnR5KToKKworICAgICAgICAgICAgQ2hhbmdlZCB0byByZXR1 cm4gdHJ1ZSBvbmx5IGlmIHNvbWV0aGluZyB3YXMgYWN0dWFsbHkgcmVtb3ZlZC4KKworICAgICAg ICAoV2ViQ29yZTo6Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OnNldFByb3BlcnR5SW50ZXJu YWwpOgorCisgICAgICAgICAgICBBdm9pZCBzb21lIHVubmVjZXNzYXJ5IHdvcmsgbm93IHRoYXQg d2Uga25vdyBpZiByZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eSgpCisgICAgICAgICAgICBhY3R1YWxs eSByZW1vdmVkIHNvbWV0aGluZyBvciBub3QuCisKIDIwMTEtMTItMDMgIEFuZHJlYXMgS2xpbmcg IDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFVzZSBIYXNoTWFwPE93blB0cj4gZm9yIEV2 ZW50TGlzdGVuZXJNYXAncyBpbnRlcm5hbCBtYXAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvY3Nz L0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCAyZjA0NTQxLi4wOGRkMTRkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5j cHAKQEAgLTU3MywxMSArNTczLDkgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb246OmdldFByb3BlcnR5Q1NTVmFsdWUoaW50IHByb3BlcnQKIGJvb2wgQ1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OnJlbW92ZVNob3J0aGFuZFByb3BlcnR5KGludCBwcm9w ZXJ0eUlELCBib29sIG5vdGlmeUNoYW5nZWQpCiB7CiAgICAgQ1NTUHJvcGVydHlMb25naGFuZCBs b25naGFuZCA9IGxvbmdoYW5kRm9yUHJvcGVydHkocHJvcGVydHlJRCk7Ci0gICAgaWYgKGxvbmdo YW5kLmxlbmd0aCgpKSB7Ci0gICAgICAgIHJlbW92ZVByb3BlcnRpZXNJblNldChsb25naGFuZC5w cm9wZXJ0aWVzKCksIGxvbmdoYW5kLmxlbmd0aCgpLCBub3RpZnlDaGFuZ2VkKTsKLSAgICAgICAg cmV0dXJuIHRydWU7Ci0gICAgfQotICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWxvbmdoYW5k Lmxlbmd0aCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgcmV0dXJuIHJlbW92ZVByb3Bl cnRpZXNJblNldChsb25naGFuZC5wcm9wZXJ0aWVzKCksIGxvbmdoYW5kLmxlbmd0aCgpLCBub3Rp ZnlDaGFuZ2VkKTsKIH0KIAogU3RyaW5nIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpyZW1v dmVQcm9wZXJ0eShpbnQgcHJvcGVydHlJRCwgYm9vbCBub3RpZnlDaGFuZ2VkLCBib29sIHJldHVy blRleHQpCkBAIC03MDcsOSArNzA1LDkgQEAgdm9pZCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlv bjo6c2V0UHJvcGVydHlJbnRlcm5hbChjb25zdCBDU1NQcm9wZXJ0eSYgcHJvcGVydHkKICNlbmRp ZgogCiAgICAgaWYgKCFyZW1vdmVTaG9ydGhhbmRQcm9wZXJ0eShwcm9wZXJ0eS5pZCgpLCBmYWxz ZSkpIHsKLSAgICAgICAgQ1NTUHJvcGVydHkqIHRvUmVwbGFjZSA9IHNsb3QgPyBzbG90IDogZmlu ZFByb3BlcnR5V2l0aElkKHByb3BlcnR5LmlkKCkpOwotICAgICAgICBpZiAodG9SZXBsYWNlKSB7 Ci0gICAgICAgICAgICAqdG9SZXBsYWNlID0gcHJvcGVydHk7CisgICAgICAgIGlmIChzbG90KSB7 CisgICAgICAgICAgICAqc2xvdCA9IHByb3BlcnR5OworICAgICAgICAgICAgLy8gRklYTUU6IFNo b3VsZCB3ZSBlbnF1ZXVlTXV0YXRpb25SZWNvcmQoKSBoZXJlPwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgfQpAQCAtOTY5LDEyICs5NjcsMTIgQEAgdm9pZCBDU1NNdXRhYmxl U3R5bGVEZWNsYXJhdGlvbjo6cmVtb3ZlQmxvY2tQcm9wZXJ0aWVzKCkKICAgICByZW1vdmVQcm9w ZXJ0aWVzSW5TZXQoYmxvY2tQcm9wZXJ0aWVzLCBudW1CbG9ja1Byb3BlcnRpZXMpOwogfQogCi12 b2lkIENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpyZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29u c3QgaW50KiBzZXQsIHVuc2lnbmVkIGxlbmd0aCwgYm9vbCBub3RpZnlDaGFuZ2VkKQorYm9vbCBD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6cmVtb3ZlUHJvcGVydGllc0luU2V0KGNvbnN0IGlu dCogc2V0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgbm90aWZ5Q2hhbmdlZCkKIHsKICAgICBBU1NF UlQoIW1faXRlcmF0b3JDb3VudCk7CiAKICAgICBpZiAobV9wcm9wZXJ0aWVzLmlzRW1wdHkoKSkK LSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gZmFsc2U7CiAKICNpZiBFTkFCTEUoTVVU QVRJT05fT0JTRVJWRVJTKQogICAgIFN0eWxlQXR0cmlidXRlTXV0YXRpb25TY29wZSBtdXRhdGlv blNjb3BlKHRoaXMpOwpAQCAtMTAwMiwxNCArMTAwMCwxNCBAQCB2b2lkIENTU011dGFibGVTdHls ZURlY2xhcmF0aW9uOjpyZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgaW50KiBzZXQsIHVuc2ln bmVkCiAgICAgYm9vbCBjaGFuZ2VkID0gbmV3UHJvcGVydGllcy5zaXplKCkgIT0gbV9wcm9wZXJ0 aWVzLnNpemUoKTsKICAgICBtX3Byb3BlcnRpZXMgPSBuZXdQcm9wZXJ0aWVzOwogCi0gICAgaWYg KCFjaGFuZ2VkIHx8ICFub3RpZnlDaGFuZ2VkKQotICAgICAgICByZXR1cm47Ci0KKyAgICBpZiAo bm90aWZ5Q2hhbmdlZCkgewogI2lmIEVOQUJMRShNVVRBVElPTl9PQlNFUlZFUlMpCi0gICAgbXV0 YXRpb25TY29wZS5lbnF1ZXVlTXV0YXRpb25SZWNvcmQoKTsKKyAgICAgICAgbXV0YXRpb25TY29w ZS5lbnF1ZXVlTXV0YXRpb25SZWNvcmQoKTsKICNlbmRpZgorICAgICAgICBzZXROZWVkc1N0eWxl UmVjYWxjKCk7CisgICAgfQogCi0gICAgc2V0TmVlZHNTdHlsZVJlY2FsYygpOworICAgIHJldHVy biBjaGFuZ2VkOwogfQogCiBQYXNzUmVmUHRyPENTU011dGFibGVTdHlsZURlY2xhcmF0aW9uPiBD U1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6bWFrZU11dGFibGUoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmggYi9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uaAppbmRleCA2Y2IxZTQyLi45ZmM4 MDI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFy YXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRp b24uaApAQCAtMTY1LDcgKzE2NSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBzZXRQcm9wZXJ0eUlu dGVybmFsKGNvbnN0IENTU1Byb3BlcnR5JiwgQ1NTUHJvcGVydHkqIHNsb3QgPSAwKTsKICAgICBT dHJpbmcgcmVtb3ZlUHJvcGVydHkoaW50IHByb3BlcnR5SUQsIGJvb2wgbm90aWZ5Q2hhbmdlZCwg Ym9vbCByZXR1cm5UZXh0KTsKICAgICBib29sIHJlbW92ZVNob3J0aGFuZFByb3BlcnR5KGludCBw cm9wZXJ0eUlELCBib29sIG5vdGlmeUNoYW5nZWQpOwotICAgIHZvaWQgcmVtb3ZlUHJvcGVydGll c0luU2V0KGNvbnN0IGludCogc2V0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgbm90aWZ5Q2hhbmdl ZCk7CisgICAgYm9vbCByZW1vdmVQcm9wZXJ0aWVzSW5TZXQoY29uc3QgaW50KiBzZXQsIHVuc2ln bmVkIGxlbmd0aCwgYm9vbCBub3RpZnlDaGFuZ2VkKTsKIAogICAgIFZlY3RvcjxDU1NQcm9wZXJ0 eT46OmNvbnN0X2l0ZXJhdG9yIGZpbmRQcm9wZXJ0eVdpdGhJZChpbnQgcHJvcGVydHlJZCkgY29u c3Q7CiAgICAgVmVjdG9yPENTU1Byb3BlcnR5Pjo6aXRlcmF0b3IgZmluZFByb3BlcnR5V2l0aElk KGludCBwcm9wZXJ0eUlkKTsK 117800 2011-12-04 11:41:34 -0800 2011-12-04 18:29:41 -0800 Patch bug-68551-v2.diff text/plain 8632 kling ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMjEzNzE4Li4wODZjNDM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMTIt MDQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAgIGJvcmRlci13 aWR0aDogaW5pdGlhbCBhbmQgYm9yZGVyLWNvbG9yOiBpbml0aWFsIGNhbm5vdCBiZSByZW1vdmVk IHZpYSBDU1NPTS4KKyAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNjg1NTE+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgdGVzdCB2ZXJp ZnlpbmcgdGhhdCBzaG9ydGhhbmQgcHJvcGVydGllcyBjYW4gYmUgYWRkZWQvcmVtb3ZlZAorICAg ICAgICB2aWEgQ1NTT00nUyBDU1NTdHlsZURlY2xhcmF0aW9uIGludGVyZmFjZS4KKworICAgICAg ICAqIGZhc3QvY3NzL2Nzc29tLXJlbW92ZS1zaG9ydGhhbmQtcHJvcGVydHktZXhwZWN0ZWQudHh0 OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5kLXByb3Bl cnR5Lmh0bWw6IEFkZGVkLgorCiAyMDExLTEyLTAzICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxl LmNvbT4KIAogICAgICAgICBVcGRhdGUgc29tZSBsYXlvdXQgdGVzdCBleHBlY3RlZCByZXN1bHRz CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5k LXByb3BlcnR5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2Nzc29tLXJlbW92 ZS1zaG9ydGhhbmQtcHJvcGVydHktZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmM4Yzg3NTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5kLXByb3BlcnR5LWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDQ3IEBACitUZXN0cyB0aGF0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGNhbiBiZSByZW1vdmVk IHZpYSBDU1NPTS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNT IiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgY2FuU2V0 UHJvcGVydHkoJ2ZvbnQnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdmb250Jykg aXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYm9yZGVyLXRvcCcpIGlzIHRydWUKK1BBU1Mg Y2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci10b3AnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3Bl cnR5KCdib3JkZXItcmlnaHQnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3Jk ZXItcmlnaHQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItYm90dG9tJykg aXMgdHJ1ZQorUEFTUyBjYW5SZW1vdmVQcm9wZXJ0eSgnYm9yZGVyLWJvdHRvbScpIGlzIHRydWUK K1BBU1MgY2FuU2V0UHJvcGVydHkoJ2JvcmRlci1sZWZ0JykgaXMgdHJ1ZQorUEFTUyBjYW5SZW1v dmVQcm9wZXJ0eSgnYm9yZGVyLWxlZnQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdi b3JkZXInKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXInKSBpcyB0cnVl CitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItY29sb3InKSBpcyB0cnVlCitQQVNTIGNhblJl bW92ZVByb3BlcnR5KCdib3JkZXItY29sb3InKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5 KCdib3JkZXItc3R5bGUnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXIt c3R5bGUnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdib3JkZXItd2lkdGgnKSBpcyB0 cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdib3JkZXItd2lkdGgnKSBpcyB0cnVlCitQQVNT IGNhblNldFByb3BlcnR5KCdiYWNrZ3JvdW5kLXBvc2l0aW9uJykgaXMgdHJ1ZQorUEFTUyBjYW5S ZW1vdmVQcm9wZXJ0eSgnYmFja2dyb3VuZC1wb3NpdGlvbicpIGlzIHRydWUKK1BBU1MgY2FuU2V0 UHJvcGVydHkoJ2JhY2tncm91bmQtcmVwZWF0JykgaXMgdHJ1ZQorUEFTUyBjYW5SZW1vdmVQcm9w ZXJ0eSgnYmFja2dyb3VuZC1yZXBlYXQnKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdi b3JkZXItc3BhY2luZycpIGlzIHRydWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci1z cGFjaW5nJykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnbGlzdC1zdHlsZScpIGlzIHRy dWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2xpc3Qtc3R5bGUnKSBpcyB0cnVlCitQQVNTIGNh blNldFByb3BlcnR5KCdtYXJnaW4nKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdt YXJnaW4nKSBpcyB0cnVlCitQQVNTIGNhblNldFByb3BlcnR5KCdvdXRsaW5lJykgaXMgdHJ1ZQor UEFTUyBjYW5SZW1vdmVQcm9wZXJ0eSgnb3V0bGluZScpIGlzIHRydWUKK1BBU1MgY2FuU2V0UHJv cGVydHkoJ3BhZGRpbmcnKSBpcyB0cnVlCitQQVNTIGNhblJlbW92ZVByb3BlcnR5KCdwYWRkaW5n JykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYmFja2dyb3VuZCcpIGlzIHRydWUKK1BB U1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JhY2tncm91bmQnKSBpcyB0cnVlCitQQVNTIGNhblNldFBy b3BlcnR5KCdvdmVyZmxvdycpIGlzIHRydWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ292ZXJm bG93JykgaXMgdHJ1ZQorUEFTUyBjYW5TZXRQcm9wZXJ0eSgnYm9yZGVyLXJhZGl1cycpIGlzIHRy dWUKK1BBU1MgY2FuUmVtb3ZlUHJvcGVydHkoJ2JvcmRlci1yYWRpdXMnKSBpcyB0cnVlCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY3Nzb20tcmVtb3ZlLXNob3J0aGFuZC1wcm9wZXJ0eS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvY3Nzb20tcmVtb3ZlLXNob3J0aGFuZC1wcm9wZXJ0 eS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjJmOGY5MzUKLS0tIC9k ZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9jc3NvbS1yZW1vdmUtc2hvcnRoYW5k LXByb3BlcnR5Lmh0bWwKQEAgLTAsMCArMSw1NiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4K KzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291 cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQ+ CisKK3Nob3J0aGFuZFByb3BlcnRpZXMgPSBbCisgICAgImZvbnQiLAorICAgICJib3JkZXItdG9w IiwKKyAgICAiYm9yZGVyLXJpZ2h0IiwKKyAgICAiYm9yZGVyLWJvdHRvbSIsCisgICAgImJvcmRl ci1sZWZ0IiwKKyAgICAiYm9yZGVyIiwKKyAgICAiYm9yZGVyLWNvbG9yIiwKKyAgICAiYm9yZGVy LXN0eWxlIiwKKyAgICAiYm9yZGVyLXdpZHRoIiwKKyAgICAiYmFja2dyb3VuZC1wb3NpdGlvbiIs CisgICAgImJhY2tncm91bmQtcmVwZWF0IiwKKyAgICAiYm9yZGVyLXNwYWNpbmciLAorICAgICJs aXN0LXN0eWxlIiwKKyAgICAibWFyZ2luIiwKKyAgICAib3V0bGluZSIsCisgICAgInBhZGRpbmci LAorICAgICJiYWNrZ3JvdW5kIiwKKyAgICAib3ZlcmZsb3ciLAorICAgICJib3JkZXItcmFkaXVz IgorXTsKKworZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3NwYW4nKTsKKworZnVu Y3Rpb24gY2FuU2V0UHJvcGVydHkocHJvcGVydHlOYW1lKSB7CisgICAgZWxlbWVudC5zdHlsZS5z ZXRQcm9wZXJ0eShwcm9wZXJ0eU5hbWUsICdpbml0aWFsJyk7CisgICAgcmV0dXJuIGVsZW1lbnQu c3R5bGUuZ2V0UHJvcGVydHlWYWx1ZShwcm9wZXJ0eU5hbWUpID09ICdpbml0aWFsJzsKK30KKwor ZnVuY3Rpb24gY2FuUmVtb3ZlUHJvcGVydHkocHJvcGVydHlOYW1lKSB7CisgICAgZWxlbWVudC5z dHlsZS5yZW1vdmVQcm9wZXJ0eShwcm9wZXJ0eU5hbWUpOworICAgIHJldHVybiBlbGVtZW50LnN0 eWxlLmdldFByb3BlcnR5VmFsdWUocHJvcGVydHlOYW1lKSAhPSAnaW5pdGlhbCc7Cit9CisKK2Rl c2NyaXB0aW9uKCJUZXN0cyB0aGF0IHNob3J0aGFuZCBwcm9wZXJ0aWVzIGNhbiBiZSByZW1vdmVk IHZpYSBDU1NPTS4iKTsKKworZm9yIChpID0gMDsgaSA8IHNob3J0aGFuZFByb3BlcnRpZXMubGVu Z3RoOyArK2kpIHsKKyAgICB2YXIgcHJvcGVydHlOYW1lID0gc2hvcnRoYW5kUHJvcGVydGllc1tp XTsKKworICAgIHNob3VsZEJlKCJjYW5TZXRQcm9wZXJ0eSgnIiArIHByb3BlcnR5TmFtZSArICIn KSIsICJ0cnVlIik7CisgICAgc2hvdWxkQmUoImNhblJlbW92ZVByb3BlcnR5KCciICsgcHJvcGVy dHlOYW1lICsgIicpIiwgInRydWUiKTsKK30KKworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4v anMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYzI4NDIyNi4uOTgzOWI2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDExLTEyLTA0ICBBbmRyZWFzIEtsaW5nICA8a2xpbmdAd2Via2l0Lm9yZz4KKworICAg ICAgICBib3JkZXItd2lkdGg6IGluaXRpYWwgYW5kIGJvcmRlci1jb2xvcjogaW5pdGlhbCBjYW5u b3QgYmUgcmVtb3ZlZCB2aWEgQ1NTT00uCisgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzY4 NTUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRl c3Q6IGZhc3QvY3NzL2Nzc29tLXJlbW92ZS1zaG9ydGhhbmQtcHJvcGVydHkuaHRtbAorCisgICAg ICAgIFdoZW4gYXNrZWQgdG8gcmVtb3ZlIGEgc2hvcnRoYW5kIHByb3BlcnR5LCB3ZSBzaG91bGQg dG9zcyBvdXQgYm90aCB0aGUKKyAgICAgICAgc3ViLXByb3BlcnRpZXMgb2YgdGhhdCBzaG9ydGhh bmQgYXMgd2VsbCBhcyB0aGUgc2hvcnRoYW5kIGl0c2VsZiwgc2hvdWxkIHRoZQorICAgICAgICBk ZWNsYXJhdGlvbiBjb250YWluIGl0LiBUaGUgbGF0dGVyIHBhcnQgd2FzIG1pc3NpbmcgaW4gb3Vy IGltcGxlbWVudGF0aW9uLgorCisgICAgICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0 aW9uLmg6CisgICAgICAgICogY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNTU011dGFibGVTdHlsZURlY2xhcmF0aW9uOjpyZW1vdmVQcm9wZXJ0 aWVzSW5TZXQpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246 OnJlbW92ZVNob3J0aGFuZFByb3BlcnR5KToKKworICAgICAgICAgICAgQ2hhbmdlZCB0byByZXR1 cm4gdHJ1ZSBvbmx5IGlmIHNvbWV0aGluZyB3YXMgYWN0dWFsbHkgcmVtb3ZlZC4KKwogMjAxMS0x Mi0wMyAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVXNlIEhh c2hNYXA8T3duUHRyPiBmb3IgRXZlbnRMaXN0ZW5lck1hcCdzIGludGVybmFsIG1hcC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb24uY3BwCmluZGV4 IDJmMDQ1NDEuLjNmZWFjODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU011dGFi bGVTdHlsZURlY2xhcmF0aW9uLmNwcApAQCAtNTczLDExICs1NzMsOSBAQCBQYXNzUmVmUHRyPENT U1ZhbHVlPiBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6Z2V0UHJvcGVydHlDU1NWYWx1ZShp bnQgcHJvcGVydAogYm9vbCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6cmVtb3ZlU2hvcnRo YW5kUHJvcGVydHkoaW50IHByb3BlcnR5SUQsIGJvb2wgbm90aWZ5Q2hhbmdlZCkKIHsKICAgICBD U1NQcm9wZXJ0eUxvbmdoYW5kIGxvbmdoYW5kID0gbG9uZ2hhbmRGb3JQcm9wZXJ0eShwcm9wZXJ0 eUlEKTsKLSAgICBpZiAobG9uZ2hhbmQubGVuZ3RoKCkpIHsKLSAgICAgICAgcmVtb3ZlUHJvcGVy dGllc0luU2V0KGxvbmdoYW5kLnByb3BlcnRpZXMoKSwgbG9uZ2hhbmQubGVuZ3RoKCksIG5vdGlm eUNoYW5nZWQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghbG9uZ2hhbmQubGVuZ3RoKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICByZXR1cm4gcmVtb3ZlUHJvcGVydGllc0luU2V0KGxvbmdoYW5kLnByb3BlcnRpZXMoKSwgbG9u Z2hhbmQubGVuZ3RoKCksIG5vdGlmeUNoYW5nZWQpOwogfQogCiBTdHJpbmcgQ1NTTXV0YWJsZVN0 eWxlRGVjbGFyYXRpb246OnJlbW92ZVByb3BlcnR5KGludCBwcm9wZXJ0eUlELCBib29sIG5vdGlm eUNoYW5nZWQsIGJvb2wgcmV0dXJuVGV4dCkKQEAgLTk2OSwxMiArOTY3LDEyIEBAIHZvaWQgQ1NT TXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OnJlbW92ZUJsb2NrUHJvcGVydGllcygpCiAgICAgcmVt b3ZlUHJvcGVydGllc0luU2V0KGJsb2NrUHJvcGVydGllcywgbnVtQmxvY2tQcm9wZXJ0aWVzKTsK IH0KIAotdm9pZCBDU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbjo6cmVtb3ZlUHJvcGVydGllc0lu U2V0KGNvbnN0IGludCogc2V0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgbm90aWZ5Q2hhbmdlZCkK K2Jvb2wgQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246OnJlbW92ZVByb3BlcnRpZXNJblNldChj b25zdCBpbnQqIHNldCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIG5vdGlmeUNoYW5nZWQpCiB7CiAg ICAgQVNTRVJUKCFtX2l0ZXJhdG9yQ291bnQpOwogCiAgICAgaWYgKG1fcHJvcGVydGllcy5pc0Vt cHR5KCkpCi0gICAgICAgIHJldHVybjsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAjaWYgRU5B QkxFKE1VVEFUSU9OX09CU0VSVkVSUykKICAgICBTdHlsZUF0dHJpYnV0ZU11dGF0aW9uU2NvcGUg bXV0YXRpb25TY29wZSh0aGlzKTsKQEAgLTEwMDIsMTQgKzEwMDAsMTQgQEAgdm9pZCBDU1NNdXRh YmxlU3R5bGVEZWNsYXJhdGlvbjo6cmVtb3ZlUHJvcGVydGllc0luU2V0KGNvbnN0IGludCogc2V0 LCB1bnNpZ25lZAogICAgIGJvb2wgY2hhbmdlZCA9IG5ld1Byb3BlcnRpZXMuc2l6ZSgpICE9IG1f cHJvcGVydGllcy5zaXplKCk7CiAgICAgbV9wcm9wZXJ0aWVzID0gbmV3UHJvcGVydGllczsKIAot ICAgIGlmICghY2hhbmdlZCB8fCAhbm90aWZ5Q2hhbmdlZCkKLSAgICAgICAgcmV0dXJuOwotCisg ICAgaWYgKG5vdGlmeUNoYW5nZWQpIHsKICNpZiBFTkFCTEUoTVVUQVRJT05fT0JTRVJWRVJTKQot ICAgIG11dGF0aW9uU2NvcGUuZW5xdWV1ZU11dGF0aW9uUmVjb3JkKCk7CisgICAgICAgIG11dGF0 aW9uU2NvcGUuZW5xdWV1ZU11dGF0aW9uUmVjb3JkKCk7CiAjZW5kaWYKKyAgICAgICAgc2V0TmVl ZHNTdHlsZVJlY2FsYygpOworICAgIH0KIAotICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoKTsKKyAg ICByZXR1cm4gY2hhbmdlZDsKIH0KIAogUGFzc1JlZlB0cjxDU1NNdXRhYmxlU3R5bGVEZWNsYXJh dGlvbj4gQ1NTTXV0YWJsZVN0eWxlRGVjbGFyYXRpb246Om1ha2VNdXRhYmxlKCkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NNdXRhYmxlU3R5bGVEZWNsYXJhdGlvbi5oIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURlY2xhcmF0aW9uLmgKaW5kZXggNmNiMWU0 Mi4uOWZjODAyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHls ZURlY2xhcmF0aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU011dGFibGVTdHlsZURl Y2xhcmF0aW9uLmgKQEAgLTE2NSw3ICsxNjUsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgc2V0UHJv cGVydHlJbnRlcm5hbChjb25zdCBDU1NQcm9wZXJ0eSYsIENTU1Byb3BlcnR5KiBzbG90ID0gMCk7 CiAgICAgU3RyaW5nIHJlbW92ZVByb3BlcnR5KGludCBwcm9wZXJ0eUlELCBib29sIG5vdGlmeUNo YW5nZWQsIGJvb2wgcmV0dXJuVGV4dCk7CiAgICAgYm9vbCByZW1vdmVTaG9ydGhhbmRQcm9wZXJ0 eShpbnQgcHJvcGVydHlJRCwgYm9vbCBub3RpZnlDaGFuZ2VkKTsKLSAgICB2b2lkIHJlbW92ZVBy b3BlcnRpZXNJblNldChjb25zdCBpbnQqIHNldCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIG5vdGlm eUNoYW5nZWQpOworICAgIGJvb2wgcmVtb3ZlUHJvcGVydGllc0luU2V0KGNvbnN0IGludCogc2V0 LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgbm90aWZ5Q2hhbmdlZCk7CiAKICAgICBWZWN0b3I8Q1NT UHJvcGVydHk+Ojpjb25zdF9pdGVyYXRvciBmaW5kUHJvcGVydHlXaXRoSWQoaW50IHByb3BlcnR5 SWQpIGNvbnN0OwogICAgIFZlY3RvcjxDU1NQcm9wZXJ0eT46Oml0ZXJhdG9yIGZpbmRQcm9wZXJ0 eVdpdGhJZChpbnQgcHJvcGVydHlJZCk7Cg==