7492 2006-02-27 05:04:12 -0800 CSS attribute selectors fail when the setAttribute() function is used to create an attribute and the attribute's name is not "class" or "id" 2006-05-16 23:41:34 -0700 1 1 1 Unclassified WebKit CSS 417.x Mac OS X 10.4 RESOLVED FIXED http://code.clientside.net.au/safari/setAttribute.html HasReduction P2 Normal --- 1 christopher.bentley webkit-unassigned oldest_to_newest 34129 0 christopher.bentley 2006-02-27 05:04:12 -0800 Summary: When an element's attribute is created using the setAttribute() method then only the attributes named "class" and "id" affect the rendering by associated CSS Attribute Selector rules. The CSS ignores any other attribute name. Steps to reproduce: The page at http://code.clientside.net.au/safari/setAttribute.html demonstrates the issue. Expected behaviour: I expect Safari to style an element using a CSS Attribute Selector when the attribute has been created using setAttribute() . eg. setAttribute('title','This is a tooltip') // el[title] Actual Behaviour: Only the "class" and "id" attributes affect the CSS rendering of an element when the attribute is created using the setAttribute() method in Safari. Workaround: None found. Isolation: Fails on Safari (except with class and id attributes). Firefox 1.5 and Opera 8.5 (Mac) behave as expected. 34130 1 6759 ddkilzer 2006-02-27 05:34:16 -0800 Created attachment 6759 Test case Test case from URL provided. 34131 2 ddkilzer 2006-02-27 05:36:44 -0800 Adding HasReduction keyword. This is broken in Safari 2.0.3 (417.8) in 10.4.5 as well as the WebKit nightlies (locally built r12990), and thus is not a regression. 41518 3 8165 rwlbuis 2006-05-08 06:50:32 -0700 Created attachment 8165 Proposed patch The patch simply checks on attribute change whether there are any attribute selectors, if so it marks the element as changed. It seems to me this is not needed for mapped attributes, hence the entry == eNone check. Cheers, Rob. 41565 4 8165 darin 2006-05-08 20:01:42 -0700 Comment on attachment 8165 Proposed patch Looks to me like this is one for Hyatt to review. 41570 5 mjs 2006-05-08 21:26:44 -0700 I don't think this fix is complete. An attribute selector could change the element from display:none to not, and when dispay:none, the element won't have a renderer. I suspect a better approach is to keep a hashtable of attribute names where there is a related attribute selector, and mark the element as changed whenever an attribute in that set is changed. 41571 6 8178 mjs 2006-05-08 21:31:51 -0700 Created attachment 8178 test case that I suspect won't work w/ this patch 41572 7 8165 mjs 2006-05-08 21:33:09 -0700 Comment on attachment 8165 Proposed patch r- because I don't think it will work in the case posted. I didn't try it though. 41590 8 rwlbuis 2006-05-09 00:06:48 -0700 (In reply to comment #6) > Created an attachment (id=8178) [edit] > test case that I suspect won't work w/ this patch > I checked it and it does not work using my current patch. Though I assume it does not work without my patch either ;) Anyway, the hashtable approach sounds good to me, I'll work on it soon. Cheers, Rob. 41838 9 8202 rwlbuis 2006-05-10 00:57:31 -0700 Created attachment 8202 New approach This new patch uses a Hashset. If the patch gets okayed, it is probably easy for me to merge the original testcase with Maciej's to make a good testcase for the patch. Cheers, Rob. 41897 10 8225 rwlbuis 2006-05-10 12:20:37 -0700 Created attachment 8225 Now includes a testcase! I made some name changes after review from hyatt and othermaciej. Also I made a new testcase out of the original one, combined with Maciej's example testcase. Cheers, Rob. 41976 11 8225 mjs 2006-05-11 00:43:31 -0700 Comment on attachment 8225 Now includes a testcase! r=me 42682 12 darin 2006-05-16 23:41:34 -0700 Had to move the test, because it does not belong in the css2.1 directory, and had to generate test results, not included here. Committed revision 14433. 6759 2006-02-27 05:34:16 -0800 2006-02-27 05:34:16 -0800 Test case setAttribute.html text/html 1366 ddkilzer PGh0bWw+CjxoZWFkPgo8dGl0bGU+c2V0QXR0cmlidXRlKCkgVGVzdDwvdGl0bGU+Cgo8c3R5bGUg dHlwZT0idGV4dC9jc3MiIHRpdGxlPSJ0ZXh0L2NzcyI+CgogICAgcCB7IGNvbG9yOiByZWQ7IH0K ICAgIHBbdGl0bGVdIHsgY29sb3I6IGdyZWVuOyB9CiAgICBwW2lkXSB7IGNvbG9yOiBncmVlbjsg fQogICAgcFtjbGFzc10geyBjb2xvcjogZ3JlZW47IH0KICAgIHBbbGFuZ10geyBjb2xvcjogZ3Jl ZW47IH0KCjwvc3R5bGU+Cgo8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+CiAgICB3aW5k b3cub25sb2FkID0gaW5pdDsKICAgIAogICAgZnVuY3Rpb24gaW5pdCgpIAogICAgewogICAgICAg IGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdwJylbMF0uc2V0QXR0cmlidXRlKCdjbGFz cycsJ3Rlc3QnKTsKICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgncCcpWzFd LnNldEF0dHJpYnV0ZSgnaWQnLCd0ZXN0Jyk7CiAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudHNC eVRhZ05hbWUoJ3AnKVsyXS5zZXRBdHRyaWJ1dGUoJ3RpdGxlJywnVGhpcyBpcyBhIHRlc3QnKTsK ICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgncCcpWzRdLnNldEF0dHJpYnV0 ZSgnbGFuZycsJ2VuJyk7CiAgICAgICAgCiAgICAgICAgLy9hbGVydChkb2N1bWVudC5nZXRFbGVt ZW50c0J5VGFnTmFtZSgnYm9keScpWzBdLmlubmVySFRNTCk7CiAgICB9Cjwvc2NyaXB0PgoKPC9o ZWFkPgo8Ym9keT4KICAgIDxoMT5zZXRBdHRyaWJ1dGUoKSBUZXN0PC9oMT4KICAgIDxwPgogICAg ICAgIFRoaXMgZWxlbWVudCdzIENsYXNzIGF0dHJpYnV0ZSBpcyBzZXQgdXNpbmcgc2V0QXR0cmli dXRlKCkuIEl0IHNob3VsZCBiZSBncmVlbi4gICAgIAogICAgPC9wPgogICAgPHA+CiAgICAgICAg VGhpcyBlbGVtZW50J3MgSUQgYXR0cmlidXRlIGlzIHNldCB1c2luZyBzZXRBdHRyaWJ1dGUoKS4g SXQgc2hvdWxkIGJlIGdyZWVuLiAgICAgICAgCiAgICA8L3A+CiAgICA8cD4KICAgICAgICBUaGlz IGVsZW1lbnQncyBUaXRsZSBhdHRyaWJ1dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0ZSgpLiBJ dCBzaG91bGQgYmUgZ3JlZW4uICAgICAKICAgIDwvcD4KICAgIDxwIHRpdGxlPSJUaGlzIGlzIGhh cmQtY29kZWQiPgogICAgICAgIFRoaXMgZWxlbWVudCdzIFRpdGxlIGF0dHJpYnV0ZSBpcyBoYXJk LWNvZGVkLiBJdCBzaG91bGQgYmUgZ3JlZW4uICAgICAgIAogICAgPC9wPgogICAgPHA+CiAgICAg ICAgVGhpcyBlbGVtZW50J3MgTGFuZyBhdHRyaWJ1dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0 ZSgpLiBJdCBzaG91bGQgYmUgZ3JlZW4uICAgICAKICAgIDwvcD4KPC9ib2R5Pgo8L2h0bWw+Cg== 8165 2006-05-08 06:50:32 -0700 2006-05-10 00:57:31 -0700 Proposed patch 7492.diff text/plain 3750 rwlbuis SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE0MjI5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsOSBAQAorMjAwNi0wNS0wOCAgUm9iIEJ1aXMgIDxidWlzQGtk ZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBjc3MyLjEvc2VsZWN0b3Itc2V0LWF0dHJpYnV0ZS5odG1sOiBBZGRlZC4KKwogMjAwNi0wNS0w OCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQG55cG9wLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbi4KSW5kZXg6IExheW91dFRlc3RzL2NzczIuMS9zZWxlY3Rvci1zZXQtYXR0cmli dXRlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY3NzMi4xL3NlbGVjdG9yLXNldC1h dHRyaWJ1dGUuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2NzczIuMS9zZWxlY3Rv ci1zZXQtYXR0cmlidXRlLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNDggQEAKKzxodG1s PgorPGhlYWQ+Cis8dGl0bGU+c2V0QXR0cmlidXRlKCkgVGVzdDwvdGl0bGU+CisKKzxzdHlsZSB0 eXBlPSJ0ZXh0L2NzcyIgdGl0bGU9InRleHQvY3NzIj4KKworICAgIHAgeyBjb2xvcjogcmVkOyB9 CisgICAgcFt0aXRsZV0geyBjb2xvcjogZ3JlZW47IH0KKyAgICBwW2lkXSB7IGNvbG9yOiBncmVl bjsgfQorICAgIHBbY2xhc3NdIHsgY29sb3I6IGdyZWVuOyB9CisgICAgcFtsYW5nXSB7IGNvbG9y OiBncmVlbjsgfQorCis8L3N0eWxlPgorCis8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCI+ CisgICAgd2luZG93Lm9ubG9hZCA9IGluaXQ7CisgICAgCisgICAgZnVuY3Rpb24gaW5pdCgpIAor ICAgIHsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3AnKVswXS5zZXRB dHRyaWJ1dGUoJ2NsYXNzJywndGVzdCcpOworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5 VGFnTmFtZSgncCcpWzFdLnNldEF0dHJpYnV0ZSgnaWQnLCd0ZXN0Jyk7CisgICAgICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdwJylbMl0uc2V0QXR0cmlidXRlKCd0aXRsZScsJ1Ro aXMgaXMgYSB0ZXN0Jyk7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdw JylbNF0uc2V0QXR0cmlidXRlKCdsYW5nJywnZW4nKTsKKyAgICAgICAgCisgICAgICAgIC8vYWxl cnQoZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ2JvZHknKVswXS5pbm5lckhUTUwpOwor ICAgIH0KKzwvc2NyaXB0PgorCis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8aDE+c2V0QXR0cmlidXRl KCkgVGVzdDwvaDE+CisgICAgPHA+CisgICAgICAgIFRoaXMgZWxlbWVudCdzIENsYXNzIGF0dHJp YnV0ZSBpcyBzZXQgdXNpbmcgc2V0QXR0cmlidXRlKCkuIEl0IHNob3VsZCBiZSBncmVlbi4gICAg IAorICAgIDwvcD4KKyAgICA8cD4KKyAgICAgICAgVGhpcyBlbGVtZW50J3MgSUQgYXR0cmlidXRl IGlzIHNldCB1c2luZyBzZXRBdHRyaWJ1dGUoKS4gSXQgc2hvdWxkIGJlIGdyZWVuLiAgICAgICAg CisgICAgPC9wPgorICAgIDxwPgorICAgICAgICBUaGlzIGVsZW1lbnQncyBUaXRsZSBhdHRyaWJ1 dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0ZSgpLiBJdCBzaG91bGQgYmUgZ3JlZW4uICAgICAK KyAgICA8L3A+CisgICAgPHAgdGl0bGU9IlRoaXMgaXMgaGFyZC1jb2RlZCI+CisgICAgICAgIFRo aXMgZWxlbWVudCdzIFRpdGxlIGF0dHJpYnV0ZSBpcyBoYXJkLWNvZGVkLiBJdCBzaG91bGQgYmUg Z3JlZW4uICAgICAgIAorICAgIDwvcD4KKyAgICA8cD4KKyAgICAgICAgVGhpcyBlbGVtZW50J3Mg TGFuZyBhdHRyaWJ1dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0ZSgpLiBJdCBzaG91bGQgYmUg Z3JlZW4uICAgICAKKyAgICA8L3A+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBXZWJDb3JlL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTQyMjkp CisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisy MDA2LTA1LTA4ICBSb2IgQnVpcyAgPGJ1aXNAa2RlLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0dHA6Ly9idWd6aWxsYS5vcGVu ZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ5MjoKKyAgICAgICAgQ1NTIEF0dHJpYnV0ZSBT ZWxlY3RvcnMgZmFpbCB3aGVuIHRoZSBzZXRBdHRyaWJ1dGUoKSBtZXRob2QgaXMgdXNlZCB0byBj cmVhdGUgYW4gYXR0cmlidXRlIGFuZCB0aGUgYXR0aWJ1dGUgbmFtZSBpcyBub3QgQ2xhc3Mgb3Ig SUQuCisKKyAgICAgICAgT24gYXR0cmlidXRlIGNoYW5nZSBtYXJrIHRoZSBlbGVtZW50IGFzIGNo YW5nZWQgKGFuZCByZWFkeSBmb3IKKyAgICAgICAgc3R5bGUgc2VsZWN0aW5nKSBpZiB0aGVyZSBh cmUgYW55IGF0dHJpYnV0ZSBzZWxlY3RvcnMgYW5kIHRoZQorICAgICAgICBhdHRyaWJ1dGUgaXMg bm90IG1hcHBlZC4KKworICAgICAgICAqIGRvbS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlZEVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQpOgorCiAyMDA2LTA1LTA4 ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBDb21wcmVoZW5zaXZl IGJveC1zaXppbmcgZml4LiAgVGhpcyBwYXRjaCBjaGFuZ2VzIGFsbCBmb3JtIGNvbnRyb2xzIHRv CkluZGV4OiBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAkocmV2aXNpb24gMTQyMjkpCisrKyBXZWJDb3JlL2Rv bS9TdHlsZWRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogI2lu Y2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCiAjaW5jbHVkZSAiY3Nz X3N0eWxlc2hlZXRpbXBsLmgiCisjaW5jbHVkZSAiUmVuZGVyT2JqZWN0LmgiCiAKIHVzaW5nIG5h bWVzcGFjZSBzdGQ7CiAKQEAgLTE3NSw3ICsxNzYsMTAgQEAgdm9pZCBTdHlsZWRFbGVtZW50Ojph dHRyaWJ1dGVDaGFuZ2VkKEF0dAogCiAgICAgaWYgKG5lZWRUb1BhcnNlKQogICAgICAgICBwYXJz ZU1hcHBlZEF0dHJpYnV0ZShtYXBwZWRBdHRyKTsKLSAgICAKKworICAgIGlmIChlbnRyeSA9PSBl Tm9uZSAmJiByZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPnN0eWxlKCktPmFmZmVjdGVkQnlBdHRy aWJ1dGVTZWxlY3RvcnMoKSkKKyAgICAgICAgc2V0Q2hhbmdlZCgpOworCiAgICAgaWYgKGNoZWNr RGVjbCAmJiBtYXBwZWRBdHRyLT5kZWNsKCkpIHsKICAgICAgICAgLy8gQWRkIHRoZSBkZWNsIHRv IHRoZSB0YWJsZSBpbiB0aGUgYXBwcm9wcmlhdGUgc3BvdC4KICAgICAgICAgc2V0TWFwcGVkQXR0 cmlidXRlRGVjbChlbnRyeSwgYXR0ciwgbWFwcGVkQXR0ci0+ZGVjbCgpKTsK 8178 2006-05-08 21:31:51 -0700 2006-05-08 21:31:51 -0700 test case that I suspect won't work w/ this patch attr-style.html text/html 523 mjs PGh0bWw+CjxoZWFkPgo8dGl0bGU+c2V0QXR0cmlidXRlKCkgVGVzdDwvdGl0bGU+Cgo8c3R5bGUg dHlwZT0idGV4dC9jc3MiIHRpdGxlPSJ0ZXh0L2NzcyI+CgogICAgcCB7IGRpc3BsYXk6IG5vbmU7 IH0KICAgIHBbdGl0bGVdIHsgZGlzcGxheTogYmxvY2sgfQo8L3N0eWxlPgoKPHNjcmlwdCB0eXBl PSJ0ZXh0L2phdmFzY3JpcHQiPgogICAgd2luZG93Lm9ubG9hZCA9IGluaXQ7CiAgICAKICAgIGZ1 bmN0aW9uIGluaXQoKSAKICAgIHsKICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFt ZSgncCcpWzBdLnNldEF0dHJpYnV0ZSgndGl0bGUnLCdUaGlzIGlzIGEgdGVzdCcpOwogICAgfQo8 L3NjcmlwdD4KCjwvaGVhZD4KPGJvZHk+CiAgICA8aDE+c2V0QXR0cmlidXRlKCkgVGVzdDwvaDE+ CiAgICA8cD4KICAgICAgICBUaGlzIGVsZW1lbnQncyBUaXRsZSBhdHRyaWJ1dGUgaXMgc2V0IHVz aW5nIHNldEF0dHJpYnV0ZSgpLiBJdCBzaG91bGQgYmUgdmlzaWJsZS4KICAgIDwvcD4KPC9ib2R5 Pgo8L2h0bWw+Cg== 8202 2006-05-10 00:57:31 -0700 2006-05-10 12:20:37 -0700 New approach 7492-3.diff text/plain 4012 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNDI4MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDYtMDUtMTAgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBmb3IgaHR0 cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD03NDkyCisgICAgICAg IENTUyBBdHRyaWJ1dGUgU2VsZWN0b3JzIGZhaWwgd2hlbiB0aGUgc2V0QXR0cmlidXRlKCkgbWV0 aG9kIGlzIHVzZWQgdG8gY3JlYXRlIGFuIGF0dHJpYnV0ZSBhbmQgdGhlIGF0dGlidXRlIG5hbWUg aXMgbm90IENsYXNzIG9yIElELjoKKworICAgICAgICBLZWVwIHRyYWNrIG9mIGF0dHJpYnV0ZXMg dXNlZCBpbiBhdHRyaWJ1dGUgc2VsZWN0b3JzIHRvCisgICAgICAgIGNoZWNrIGFmdGVyIHNldEF0 dHJpYnV0ZSB3aGV0aGVyIGEgc3R5bGUgcmVjYWxjIGlzIG5lZWRlZC4KKworICAgICAgICAqIGNz cy9jc3NzdHlsZXNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0 b3I6OmNoZWNrT25lU2VsZWN0b3IpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rv cjo6aGFzQXR0cmlidXRlU2VsZWN0b3IpOgorICAgICAgICAqIGNzcy9jc3NzdHlsZXNlbGVjdG9y Lmg6CisgICAgICAgICogZG9tL1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVkRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZCk6CisKIDIwMDYtMDUtMTAgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgogCiAgICAgICAgIC0gYW5vdGhlciB0cnkgYXQgZml4aW5n IHRoZSBXaW5kb3dzIGJ1aWxkCkluZGV4OiBXZWJDb3JlL2Nzcy9jc3NzdHlsZXNlbGVjdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9jc3NzdHlsZXNlbGVjdG9yLmNwcAkocmV2aXNp b24gMTQyODEpCisrKyBXZWJDb3JlL2Nzcy9jc3NzdHlsZXNlbGVjdG9yLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTIwNiw4ICsxMjA2LDEwIEBAIGJvb2wgQ1NTU3R5bGVTZWxlY3Rvcjo6Y2hlY2tP bmVTZWxlY3RvcigKICAgICAgICAgfQogICAgICAgICBlbHNlIGlmIChzZWwtPm1hdGNoID09IENT U1NlbGVjdG9yOjpJZCkKICAgICAgICAgICAgIHJldHVybiBlLT5oYXNJRCgpICYmIGUtPmdldElE QXR0cmlidXRlKCkgPT0gc2VsLT52YWx1ZTsKLSAgICAgICAgZWxzZSBpZiAoc3R5bGUgJiYgKGUg IT0gZWxlbWVudCB8fCAhc3R5bGVkRWxlbWVudCB8fCAoIXN0eWxlZEVsZW1lbnQtPmlzTWFwcGVk QXR0cmlidXRlKHNlbC0+YXR0cikgJiYgc2VsLT5hdHRyICE9IHR5cGVBdHRyKSkpCisgICAgICAg IGVsc2UgaWYgKHN0eWxlICYmIChlICE9IGVsZW1lbnQgfHwgIXN0eWxlZEVsZW1lbnQgfHwgKCFz dHlsZWRFbGVtZW50LT5pc01hcHBlZEF0dHJpYnV0ZShzZWwtPmF0dHIpICYmIHNlbC0+YXR0ciAh PSB0eXBlQXR0cikpKSB7CiAgICAgICAgICAgICBzdHlsZS0+c2V0QWZmZWN0ZWRCeUF0dHJpYnV0 ZVNlbGVjdG9ycygpOyAvLyBTcGVjaWFsLWNhc2UgdGhlICJ0eXBlIiBhdHRyaWJ1dGUgc28gaW5w dXQgZm9ybSBjb250cm9scyBjYW4gc2hhcmUgc3R5bGUuCisgICAgICAgICAgICBtX2F0dHJzLmFk ZChzZWwtPmF0dHIubG9jYWxOYW1lKCkuaW1wbCgpKTsKKyAgICAgICAgfQogCiAgICAgICAgIGNv bnN0IEF0b21pY1N0cmluZyYgdmFsdWUgPSBlLT5nZXRBdHRyaWJ1dGUoc2VsLT5hdHRyKTsKICAg ICAgICAgaWYgKHZhbHVlLmlzTnVsbCgpKQpAQCAtNDI5Miw0ICs0Mjk0LDkgQEAgQ29sb3IgQ1NT U3R5bGVTZWxlY3Rvcjo6Z2V0Q29sb3JGcm9tUHJpbQogICAgIHJldHVybiBjb2w7CiB9CiAKK2Jv b2wgQ1NTU3R5bGVTZWxlY3Rvcjo6aGFzQXR0cmlidXRlU2VsZWN0b3IoY29uc3QgQXRvbWljU3Ry aW5nICZhdHRybmFtZSkKK3sKKyAgICByZXR1cm4gbV9hdHRycy5jb250YWlucyhhdHRybmFtZS5p bXBsKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2Nzcy9j c3NzdHlsZXNlbGVjdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvY3Nzc3R5bGVzZWxl Y3Rvci5oCShyZXZpc2lvbiAxNDI4MSkKKysrIFdlYkNvcmUvY3NzL2Nzc3N0eWxlc2VsZWN0b3Iu aAkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogCiAjaW5jbHVkZSAiY3NzX3J1bGVp bXBsLmgiCiAjaW5jbHVkZSAicmVuZGVyX3N0eWxlLmgiCisjaW5jbHVkZSA8d3RmL0hhc2hTZXQu aD4KIAogY2xhc3MgS0hUTUxTZXR0aW5nczsKIGNsYXNzIEtVUkw7CkBAIC0xMjMsNyArMTI0LDkg QEAgY2xhc3MgU3R5bGVkRWxlbWVudDsKICAgICAgICAgZmxvYXQgZ2V0Q29tcHV0ZWRTaXplRnJv bVNwZWNpZmllZFNpemUoYm9vbCBpc0Fic29sdXRlU2l6ZSwgZmxvYXQgc3BlY2lmaWVkU2l6ZSk7 CiAgICAgICAgIAogICAgICAgICBDb2xvciBnZXRDb2xvckZyb21QcmltaXRpdmVWYWx1ZShDU1NQ cmltaXRpdmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUpOwotICAgICAgICAKKyAgICAKKyAgICAgICAg Ym9vbCBoYXNBdHRyaWJ1dGVTZWxlY3Rvcihjb25zdCBBdG9taWNTdHJpbmcgJmF0dHJuYW1lKTsK KyAKICAgICBwcm90ZWN0ZWQ6CiAKICAgICAgICAgLyogY2hlY2tzIGlmIGEgY29tcG91bmQgc2Vs ZWN0b3IgKHdoaWNoIGNhbiBjb25zaXN0IG9mIG11bHRpcGxlIHNpbXBsZSBzZWxlY3RvcnMpCkBA IC0yMTEsNiArMjE0LDggQEAgcHVibGljOgogICAgICAgICBjb25zdCBLSFRNTFNldHRpbmdzICpz ZXR0aW5nczsKICAgICAgICAgYm9vbCBmb250RGlydHk7CiAgICAgICAgIGJvb2wgaXNYTUxEb2M7 CisKKyAgICAgICAgSGFzaFNldDxBdG9taWNTdHJpbmdJbXBsICo+IG1fYXR0cnM7CiAgICAgICAg IAogICAgICAgICB2b2lkIGFwcGx5UHJvcGVydHkoaW50IGlkLCBDU1NWYWx1ZSAqdmFsdWUpOwog I2lmIFNWR19TVVBQT1JUCkluZGV4OiBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAkocmV2aXNpb24gMTQyODEp CisrKyBXZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAs NiArMzAsNyBAQAogI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgi CiAjaW5jbHVkZSAiY3NzX3N0eWxlc2hlZXRpbXBsLmgiCisjaW5jbHVkZSAiY3Nzc3R5bGVzZWxl Y3Rvci5oIgogCiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCkBAIC0xNzUsNyArMTc2LDEwIEBAIHZv aWQgU3R5bGVkRWxlbWVudDo6YXR0cmlidXRlQ2hhbmdlZChBdHQKIAogICAgIGlmIChuZWVkVG9Q YXJzZSkKICAgICAgICAgcGFyc2VNYXBwZWRBdHRyaWJ1dGUobWFwcGVkQXR0cik7Ci0gICAgCisK KyAgICBpZiAoZW50cnkgPT0gZU5vbmUgJiYgb3duZXJEb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9y KCktPmhhc0F0dHJpYnV0ZVNlbGVjdG9yKGF0dHItPm5hbWUoKS5sb2NhbE5hbWUoKSkpCisgICAg ICAgIHNldENoYW5nZWQoKTsKKwogICAgIGlmIChjaGVja0RlY2wgJiYgbWFwcGVkQXR0ci0+ZGVj bCgpKSB7CiAgICAgICAgIC8vIEFkZCB0aGUgZGVjbCB0byB0aGUgdGFibGUgaW4gdGhlIGFwcHJv cHJpYXRlIHNwb3QuCiAgICAgICAgIHNldE1hcHBlZEF0dHJpYnV0ZURlY2woZW50cnksIGF0dHIs IG1hcHBlZEF0dHItPmRlY2woKSk7Cg== 8225 2006-05-10 12:20:37 -0700 2006-05-11 00:43:31 -0700 Now includes a testcase! 7492-4.diff text/plain 6186 rwlbuis SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE0Mjg5KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDYtMDUtMTAgIFJvYiBCdWlzICA8YnVpc0Br ZGUub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogQ2hhbmdlTG9nOgorICAgICAgICAqIGNzczIuMS9zZWxlY3Rvci1zZXQtYXR0cmlidXRlLmh0 bWw6IEFkZGVkLgorCiAyMDA2LTA1LTEwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAbnlwb3Au Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFuZGVycy4KSW5kZXg6IExheW91dFRlc3RzL2Nz czIuMS9zZWxlY3Rvci1zZXQtYXR0cmlidXRlLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvY3NzMi4xL3NlbGVjdG9yLXNldC1hdHRyaWJ1dGUuaHRtbAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2NzczIuMS9zZWxlY3Rvci1zZXQtYXR0cmlidXRlLmh0bWwJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsNDYgQEAKKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+c2V0QXR0cmlidXRlKCkg VGVzdDwvdGl0bGU+CisKKzxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgdGl0bGU9InRleHQvY3NzIj4K KworICAgIHAgeyBkaXNwbGF5Om5vbmU7IGNvbG9yOiByZWQ7IH0KKyAgICBwW3RpdGxlXSB7IGRp c3BsYXk6YmxvY2s7IGNvbG9yOiBncmVlbjsgfQorICAgIHBbaWRdIHsgZGlzcGxheTpibG9jazsg Y29sb3I6IGdyZWVuOyB9CisgICAgcFtjbGFzc10geyBkaXNwbGF5OmJsb2NrOyBjb2xvcjogZ3Jl ZW47IH0KKyAgICBwW2xhbmddIHsgZGlzcGxheTpibG9jazsgY29sb3I6IGdyZWVuOyB9CisKKzwv c3R5bGU+CisKKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KKyAgICB3aW5kb3cub25s b2FkID0gaW5pdDsKKyAgICAKKyAgICBmdW5jdGlvbiBpbml0KCkgCisgICAgeworICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgncCcpWzBdLnNldEF0dHJpYnV0ZSgnY2xhc3Mn LCd0ZXN0Jyk7CisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCdwJylbMV0u c2V0QXR0cmlidXRlKCdpZCcsJ3Rlc3QnKTsKKyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudHNC eVRhZ05hbWUoJ3AnKVsyXS5zZXRBdHRyaWJ1dGUoJ3RpdGxlJywnVGhpcyBpcyBhIHRlc3QnKTsK KyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudHNCeVRhZ05hbWUoJ3AnKVs0XS5zZXRBdHRyaWJ1 dGUoJ2xhbmcnLCdlbicpOworICAgIH0KKzwvc2NyaXB0PgorCis8L2hlYWQ+Cis8Ym9keT4KKyAg ICA8aDE+c2V0QXR0cmlidXRlKCkgVGVzdDwvaDE+CisgICAgPHA+CisgICAgICAgIFRoaXMgZWxl bWVudCdzIENsYXNzIGF0dHJpYnV0ZSBpcyBzZXQgdXNpbmcgc2V0QXR0cmlidXRlKCkuIEl0IHNo b3VsZCBiZSBncmVlbi4gICAgIAorICAgIDwvcD4KKyAgICA8cD4KKyAgICAgICAgVGhpcyBlbGVt ZW50J3MgSUQgYXR0cmlidXRlIGlzIHNldCB1c2luZyBzZXRBdHRyaWJ1dGUoKS4gSXQgc2hvdWxk IGJlIGdyZWVuLiAgICAgICAgCisgICAgPC9wPgorICAgIDxwPgorICAgICAgICBUaGlzIGVsZW1l bnQncyBUaXRsZSBhdHRyaWJ1dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0ZSgpLiBJdCBzaG91 bGQgYmUgZ3JlZW4uICAgICAKKyAgICA8L3A+CisgICAgPHAgdGl0bGU9IlRoaXMgaXMgaGFyZC1j b2RlZCI+CisgICAgICAgIFRoaXMgZWxlbWVudCdzIFRpdGxlIGF0dHJpYnV0ZSBpcyBoYXJkLWNv ZGVkLiBJdCBzaG91bGQgYmUgZ3JlZW4uICAgICAgIAorICAgIDwvcD4KKyAgICA8cD4KKyAgICAg ICAgVGhpcyBlbGVtZW50J3MgTGFuZyBhdHRyaWJ1dGUgaXMgc2V0IHVzaW5nIHNldEF0dHJpYnV0 ZSgpLiBJdCBzaG91bGQgYmUgZ3JlZW4uICAgICAKKyAgICA8L3A+Cis8L2JvZHk+Cis8L2h0bWw+ CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxv ZwkocmV2aXNpb24gMTQyODkpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDIwIEBACisyMDA2LTA1LTEwICBSb2IgQnVpcyAgPGJ1aXNAa2RlLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggZm9yIGh0 dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ5MgorICAgICAg ICBDU1MgQXR0cmlidXRlIFNlbGVjdG9ycyBmYWlsIHdoZW4gdGhlIHNldEF0dHJpYnV0ZSgpIG1l dGhvZCBpcyB1c2VkIHRvIGNyZWF0ZSBhbiBhdHRyaWJ1dGUgYW5kIHRoZSBhdHRpYnV0ZSBuYW1l IGlzIG5vdCBDbGFzcyBvciBJRC46CisKKyAgICAgICAgS2VlcCB0cmFjayBvZiBhdHRyaWJ1dGVz IHVzZWQgaW4gYXR0cmlidXRlIHNlbGVjdG9ycyB0bworICAgICAgICBjaGVjayBhZnRlciBzZXRB dHRyaWJ1dGUgd2hldGhlciBhIHN0eWxlIHJlY2FsYyBpcyBuZWVkZWQuCisKKyAgICAgICAgKiBj c3MvY3Nzc3R5bGVzZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVj dG9yOjpjaGVja09uZVNlbGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0 b3I6Omhhc1NlbGVjdG9yRm9yQXR0cmlidXRlKToKKyAgICAgICAgKiBjc3MvY3Nzc3R5bGVzZWxl Y3Rvci5oOgorICAgICAgICAqIGRvbS9TdHlsZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlN0eWxlZEVsZW1lbnQ6OmF0dHJpYnV0ZUNoYW5nZWQpOgorCiAyMDA2LTA1LTEwICBEYXZp ZCBDYXJzb24gPGRhY2Fyc29uQGdtYWlsLmNvbT4KIAogICAgICAgICAtIEZpeCBmb3IgYnVnIDg4 MzMuIFJlbW92ZWQgaW5saW5lIGtleXdvcmQgZnJvbSBmdW5jdGlvbnMgZGVjbGFyZWQKSW5kZXg6 IFdlYkNvcmUvY3NzL2Nzc3N0eWxlc2VsZWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv Y3NzL2Nzc3N0eWxlc2VsZWN0b3IuY3BwCShyZXZpc2lvbiAxNDI4OSkKKysrIFdlYkNvcmUvY3Nz L2Nzc3N0eWxlc2VsZWN0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjA2LDggKzEyMDYsMTAg QEAgYm9vbCBDU1NTdHlsZVNlbGVjdG9yOjpjaGVja09uZVNlbGVjdG9yKAogICAgICAgICB9CiAg ICAgICAgIGVsc2UgaWYgKHNlbC0+bWF0Y2ggPT0gQ1NTU2VsZWN0b3I6OklkKQogICAgICAgICAg ICAgcmV0dXJuIGUtPmhhc0lEKCkgJiYgZS0+Z2V0SURBdHRyaWJ1dGUoKSA9PSBzZWwtPnZhbHVl OwotICAgICAgICBlbHNlIGlmIChzdHlsZSAmJiAoZSAhPSBlbGVtZW50IHx8ICFzdHlsZWRFbGVt ZW50IHx8ICghc3R5bGVkRWxlbWVudC0+aXNNYXBwZWRBdHRyaWJ1dGUoc2VsLT5hdHRyKSAmJiBz ZWwtPmF0dHIgIT0gdHlwZUF0dHIpKSkKKyAgICAgICAgZWxzZSBpZiAoc3R5bGUgJiYgKGUgIT0g ZWxlbWVudCB8fCAhc3R5bGVkRWxlbWVudCB8fCAoIXN0eWxlZEVsZW1lbnQtPmlzTWFwcGVkQXR0 cmlidXRlKHNlbC0+YXR0cikgJiYgc2VsLT5hdHRyICE9IHR5cGVBdHRyKSkpIHsKICAgICAgICAg ICAgIHN0eWxlLT5zZXRBZmZlY3RlZEJ5QXR0cmlidXRlU2VsZWN0b3JzKCk7IC8vIFNwZWNpYWwt Y2FzZSB0aGUgInR5cGUiIGF0dHJpYnV0ZSBzbyBpbnB1dCBmb3JtIGNvbnRyb2xzIGNhbiBzaGFy ZSBzdHlsZS4KKyAgICAgICAgICAgIG1fc2VsZWN0b3JBdHRycy5hZGQoc2VsLT5hdHRyLmxvY2Fs TmFtZSgpLmltcGwoKSk7CisgICAgICAgIH0KIAogICAgICAgICBjb25zdCBBdG9taWNTdHJpbmcm IHZhbHVlID0gZS0+Z2V0QXR0cmlidXRlKHNlbC0+YXR0cik7CiAgICAgICAgIGlmICh2YWx1ZS5p c051bGwoKSkKQEAgLTQyOTIsNCArNDI5NCw5IEBAIENvbG9yIENTU1N0eWxlU2VsZWN0b3I6Omdl dENvbG9yRnJvbVByaW0KICAgICByZXR1cm4gY29sOwogfQogCitib29sIENTU1N0eWxlU2VsZWN0 b3I6Omhhc1NlbGVjdG9yRm9yQXR0cmlidXRlKGNvbnN0IEF0b21pY1N0cmluZyAmYXR0cm5hbWUp Cit7CisgICAgcmV0dXJuIG1fc2VsZWN0b3JBdHRycy5jb250YWlucyhhdHRybmFtZS5pbXBsKCkp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL2Nzcy9jc3NzdHls ZXNlbGVjdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9jc3MvY3Nzc3R5bGVzZWxlY3Rvci5o CShyZXZpc2lvbiAxNDI4OSkKKysrIFdlYkNvcmUvY3NzL2Nzc3N0eWxlc2VsZWN0b3IuaAkod29y a2luZyBjb3B5KQpAQCAtMjYsNiArMjYsNyBAQAogCiAjaW5jbHVkZSAiY3NzX3J1bGVpbXBsLmgi CiAjaW5jbHVkZSAicmVuZGVyX3N0eWxlLmgiCisjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KIAog Y2xhc3MgS0hUTUxTZXR0aW5nczsKIGNsYXNzIEtVUkw7CkBAIC0xMjMsNyArMTI0LDkgQEAgY2xh c3MgU3R5bGVkRWxlbWVudDsKICAgICAgICAgZmxvYXQgZ2V0Q29tcHV0ZWRTaXplRnJvbVNwZWNp ZmllZFNpemUoYm9vbCBpc0Fic29sdXRlU2l6ZSwgZmxvYXQgc3BlY2lmaWVkU2l6ZSk7CiAgICAg ICAgIAogICAgICAgICBDb2xvciBnZXRDb2xvckZyb21QcmltaXRpdmVWYWx1ZShDU1NQcmltaXRp dmVWYWx1ZSogcHJpbWl0aXZlVmFsdWUpOwotICAgICAgICAKKyAgICAKKyAgICAgICAgYm9vbCBo YXNTZWxlY3RvckZvckF0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJpbmcgJmF0dHJuYW1lKTsKKyAK ICAgICBwcm90ZWN0ZWQ6CiAKICAgICAgICAgLyogY2hlY2tzIGlmIGEgY29tcG91bmQgc2VsZWN0 b3IgKHdoaWNoIGNhbiBjb25zaXN0IG9mIG11bHRpcGxlIHNpbXBsZSBzZWxlY3RvcnMpCkBAIC0y MTEsNiArMjE0LDggQEAgcHVibGljOgogICAgICAgICBjb25zdCBLSFRNTFNldHRpbmdzICpzZXR0 aW5nczsKICAgICAgICAgYm9vbCBmb250RGlydHk7CiAgICAgICAgIGJvb2wgaXNYTUxEb2M7CisK KyAgICAgICAgSGFzaFNldDxBdG9taWNTdHJpbmdJbXBsICo+IG1fc2VsZWN0b3JBdHRyczsKICAg ICAgICAgCiAgICAgICAgIHZvaWQgYXBwbHlQcm9wZXJ0eShpbnQgaWQsIENTU1ZhbHVlICp2YWx1 ZSk7CiAjaWYgU1ZHX1NVUFBPUlQKSW5kZXg6IFdlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCShyZXZpc2lvbiAx NDI4OSkKKysrIFdlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAiRG9jdW1lbnQuaCIKICNpbmNsdWRlICJIVE1MTmFt ZXMuaCIKICNpbmNsdWRlICJjc3Nfc3R5bGVzaGVldGltcGwuaCIKKyNpbmNsdWRlICJjc3NzdHls ZXNlbGVjdG9yLmgiCiAKIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKQEAgLTE3NSw3ICsxNzYsMTAg QEAgdm9pZCBTdHlsZWRFbGVtZW50OjphdHRyaWJ1dGVDaGFuZ2VkKEF0dAogCiAgICAgaWYgKG5l ZWRUb1BhcnNlKQogICAgICAgICBwYXJzZU1hcHBlZEF0dHJpYnV0ZShtYXBwZWRBdHRyKTsKLSAg ICAKKworICAgIGlmIChlbnRyeSA9PSBlTm9uZSAmJiBvd25lckRvY3VtZW50KCktPnN0eWxlU2Vs ZWN0b3IoKS0+aGFzU2VsZWN0b3JGb3JBdHRyaWJ1dGUoYXR0ci0+bmFtZSgpLmxvY2FsTmFtZSgp KSkKKyAgICAgICAgc2V0Q2hhbmdlZCgpOworCiAgICAgaWYgKGNoZWNrRGVjbCAmJiBtYXBwZWRB dHRyLT5kZWNsKCkpIHsKICAgICAgICAgLy8gQWRkIHRoZSBkZWNsIHRvIHRoZSB0YWJsZSBpbiB0 aGUgYXBwcm9wcmlhdGUgc3BvdC4KICAgICAgICAgc2V0TWFwcGVkQXR0cmlidXRlRGVjbChlbnRy eSwgYXR0ciwgbWFwcGVkQXR0ci0+ZGVjbCgpKTsK