5926 2005-12-03 09:55:59 -0800 Assertion failure in HTMLGenericFormElementImpl::removedFromTree 2006-01-17 09:47:55 -0800 1 1 1 Unclassified WebKit Forms 420+ Mac OS X 10.4 VERIFIED FIXED https://tychousa7.umuc.edu/sys/login.html?/WebTycho.nsf&0 HasReduction P2 Normal --- 1 ap webkit-unassigned gerald.singh mitz oldest_to_newest 25442 0 ap 2005-12-03 09:55:59 -0800 WebKit/WebCore/khtml/html/html_formimpl.cpp:864: failed assertion `form == m_form' Steps to reproduce (debug build of ToT): 1. open the bug URL; 2. after it finishes loading, close the window. 26440 1 5251 joost 2005-12-23 12:40:54 -0800 Created attachment 5251 Minimal testcase This is a minimal testcase for the bug, reload or close the page, and any debug build wil crash. 26441 2 joost 2005-12-23 12:41:45 -0800 changed keyword NeedsReduction to HasReduction :) 26485 3 5271 mitz 2005-12-24 11:34:47 -0800 Created attachment 5271 Proposed patch 26499 4 5271 mjs 2005-12-24 14:24:57 -0800 Comment on attachment 5271 Proposed patch It's a little ugly for the parser to know about this HTMLGenericFormElementImpl detail directly. Is it possible for the GenericFormElement itself to detect that it changed forms? Perhaps it can do something on removedFromDocument/insertedIntoDocument or something? 26501 5 mitz 2005-12-24 14:39:57 -0800 (In reply to comment #4) > (From update of attachment 5271 [edit]) > Is it possible for the GenericFormElement itself to detect > that it changed forms? Perhaps it can do something on > removedFromDocument/insertedIntoDocument or something? I tried such an approach, but I couldn't differentiate between "inserted in the right place" and "inserted not where it was expected to be inserted" (in both cases insertedIntoDocument is called only once), so I ended up calling getForm() every time, which kind of defeats the presumed purpose of passing the form to the constructor. Perhaps I didn't try hard enough. 26502 6 5271 mjs 2005-12-24 14:42:35 -0800 Comment on attachment 5271 Proposed patch r=me 26770 7 5271 mitz 2005-12-27 12:32:44 -0800 Comment on attachment 5271 Proposed patch The patch fixes the minimal testcase but not the given URL. 26771 8 joost 2005-12-27 12:38:27 -0800 I would say, commit the patch, cause it solves a problem, and do not close the bug yet, removing the review+ seems a bit harsh. 26787 9 5307 mitz 2005-12-27 13:34:03 -0800 Created attachment 5307 Reduced testcase that triggers the assert even with the patch This is different from the previous reduction, in that in this case, the input element ends up belonging to form B, even though it isn't a descendant of form B. That's also what Firefox thinks should happen. However, if the input element were programatically inserted at the same place, then getForm() would be used and it would end up belonging to its ancestor, form A. Firefox says so too. I see four options: 1) Decide that the above (Firefox-compatible) behavior is correct, and remove the assert. 2) Decide that the above (Firefox-compatible) behavior is correct, add have the parser set some flag(s) on the inputElement to bypass the assert in this special case. 3) Decide that the above logic is incorrect, and change getForm() to answer "which form would the parser associate this input element with if it were here in the first place" (if the question has meaning, and if it's even possible to answer, it probably involves traversing the entire DOM tree). 4) Decide that the above logic is incorrect, and an input element's form should always be its ancestor. 26792 10 mitz 2005-12-27 13:45:46 -0800 Hmm... I checked what Firefox has to say about the original testcase, and even though it gives the same DOM tree as WebKit, where the input element is a direct descendant of form A, its form is form B. So I guess the Firefox logic when parsing is like WebKit's w/o the "proposed patch", which means that option 1) above should say "...remove the assert and don't apply the 'proposed patch'" and that the only other option that makes sense is option 4). 27248 11 5385 mitz 2005-12-30 08:05:59 -0800 Created attachment 5385 Don't assert According to Dave Hyatt on IRC, the assert should be yanked. 27270 12 5385 mitz 2005-12-30 14:31:55 -0800 Comment on attachment 5385 Don't assert I mistakenly deleted the } before the else too. That doesn't even compile! 27271 13 5388 mitz 2005-12-30 14:33:53 -0800 Created attachment 5388 Corrected patch 27272 14 5388 mitz 2005-12-30 14:34:18 -0800 Comment on attachment 5388 Corrected patch Added missing curly brace 27273 15 5388 ggaren 2005-12-30 15:09:44 -0800 Comment on attachment 5388 Corrected patch Dave? 27276 16 5388 darin 2005-12-30 16:17:24 -0800 Comment on attachment 5388 Corrected patch I don't think it's right to just remove this assert. It's possible that a form element is being removed from the DOM tree along with a form that it's nested inside. The form the element is attached to is still in the main document's DOM tree. This code will discover the form that's being removed along with the node, but will leave the form element attached to the form still in the main document. This is not a good state -- the form from the main document has an element attached to it that's no longer in the document at all. 27539 17 mjs 2006-01-02 20:35:16 -0800 Moving to r- until Darin's comment is addressed. 28583 18 5719 mitz 2006-01-16 08:57:17 -0800 Created attachment 5719 Ignore ancestor forms that aren't our form 28656 19 5719 darin 2006-01-17 00:28:30 -0800 Comment on attachment 5719 Ignore ancestor forms that aren't our form Looks fine, r=me. 5251 2005-12-23 12:40:54 -0800 2005-12-23 12:40:54 -0800 Minimal testcase testcase.html text/html 141 joost PGh0bWw+Cgo8Ym9keSBvbkxvYWQ9ImRvY3VtZW50LmZvcm1zWzBdIj4KCTxmb3JtPgoJCTx0YWJs ZT4KCTwvZm9ybT4KCTxmb3JtPgoJCTxpbnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJMb2cgSW4i PgoJPC9mb3JtPgo8L2JvZHk+Cgo8L2h0bWw+ 5271 2005-12-24 11:34:47 -0800 2005-12-30 08:05:59 -0800 Proposed patch 5926_r1.patch text/plain 7071 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE4NApkaWZm IC1wIC11IC1yMS4xODQgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJMjMgRGVjIDIwMDUgMDg6MzU6MzggLTAwMDAJMS4xODQKKysrIExheW91dFRlc3RzL0No YW5nZUxvZwkyNCBEZWMgMjAwNSAxOTozNzo1OCAtMDAwMApAQCAtMSwzICsxLDEzIEBACisyMDA1 LTEyLSMjICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1pdHpwZXR0ZWwuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIC0gdGVzdCBmb3Ig aHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI2CisgICAg ICAgIEFzc2VydGlvbiBmYWlsdXJlIGluIEhUTUxHZW5lcmljRm9ybUVsZW1lbnRJbXBsOjpyZW1v dmVkRnJvbVRyZWUKKworICAgICAgICAqIGZhc3QvcGFyc2VyL2dlbmVyaWMtZm9ybS1lbGVtZW50 LWFzc2VydC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvcGFyc2VyL2dlbmVy aWMtZm9ybS1lbGVtZW50LWFzc2VydC5odG1sOiBBZGRlZC4KKwogMjAwNS0xMi0yMiAgQWxleGV5 IFByb3NrdXJ5YWtvdiAgPGFwQG55cG9wLmNvbT4NDSAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4g QWRsZXIuDQ0gICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NjExOA0gICAgICAgIEludmVzdGlnYXRlIG5vdCB1c2luZyB0aGUgZnJhbWVz ZXQgY2hhcnNldCBhcyBhIGRlZmF1bHQgZm9yIGZyYW1lcw0NICAgICAgICAqIGZhc3QvZW5jb2Rp bmcvZnJhbWUtZGVmYXVsdC1lbmMtZXhwZWN0ZWQuY2hlY2tzdW06IEFkZGVkLg0gICAgICAgICog ZmFzdC9lbmNvZGluZy9mcmFtZS1kZWZhdWx0LWVuYy1leHBlY3RlZC5wbmc6IEFkZGVkLg0gICAg ICAgICogZmFzdC9lbmNvZGluZy9mcmFtZS1kZWZhdWx0LWVuYy1leHBlY3RlZC50eHQ6IEFkZGVk Lg0gICAgICAgICogZmFzdC9lbmNvZGluZy9mcmFtZS1kZWZhdWx0LWVuYy5odG1sOiBBZGRlZC4N ICAgICAgICAqIGZhc3QvZW5jb2RpbmcvcmVzb3VyY2VzL2ZyYW1lLWRlZmF1bHQtZW5jLWZyYW1l Lmh0bWw6IEFkZGVkLg0KIAogMjAwNS0xMi0yMiAgSnVzdGluIEdhcmNpYSAgPGp1c3Rpbi5nYXJj aWFAYXBwbGUuY29tPgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIvZ2VuZXJpYy1mb3Jt LWVsZW1lbnQtYXNzZXJ0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5wdSBMYXlvdXRU ZXN0cy9mYXN0L3BhcnNlci9nZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQtZXhwZWN0ZWQudHh0 Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9nZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQt ZXhwZWN0ZWQudHh0CTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIExheW91dFRlc3RzL2Zh c3QvcGFyc2VyL2dlbmVyaWMtZm9ybS1lbGVtZW50LWFzc2VydC1leHBlY3RlZC50eHQJMjQgRGVj IDIwMDUgMTk6MTU6MzUgLTAwMDAKQEAgLTAsMCArMSw1IEBACitUaGlzIHRlc3QgY2hlY2tzIGZv ciBhIHJlZ3Jlc3Npb24gYWdhaW5zdCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hv d19idWcuY2dpP2lkPTU5MjYgQXNzZXJ0aW9uIGZhaWx1cmUgaW4gSFRNTEdlbmVyaWNGb3JtRWxl bWVudEltcGw6OnJlbW92ZWRGcm9tVHJlZS4KKworVGVzdCByZXN1bHQ6IFBBU1MKKworCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9nZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09CmRpZmYgLU5wdSBMYXlvdXRUZXN0cy9mYXN0L3BhcnNlci9nZW5lcmljLWZv cm0tZWxlbWVudC1hc3NlcnQuaHRtbAotLS0gTGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIvZ2VuZXJp Yy1mb3JtLWVsZW1lbnQtYXNzZXJ0Lmh0bWwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysg TGF5b3V0VGVzdHMvZmFzdC9wYXJzZXIvZ2VuZXJpYy1mb3JtLWVsZW1lbnQtYXNzZXJ0Lmh0bWwJ MjQgRGVjIDIwMDUgMTk6MTI6NDUgLTAwMDAKQEAgLTAsMCArMSwyOSBAQAorPGh0bWw+Cis8aGVh ZD4KKzxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2lmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCitm dW5jdGlvbiB0ZXN0KCkKK3sKKyAgICB2YXIgYSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdh Jyk7CisgICAgdmFyIEkgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnSScpOworICAgIGRvY3Vt ZW50LmdldEVsZW1lbnRCeUlkKCdyZXN1bHQnKS5pbm5lclRleHQgPSBJLmZvcm0gPT0gYSA/ICJQ QVNTIiA6ICJGQUlMOiAiK0kuZm9ybS5pZDsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkg b25sb2FkPSJ0ZXN0KCk7Ij4KKzxwPgorVGhpcyB0ZXN0IGNoZWNrcyBmb3IgYSByZWdyZXNzaW9u IGFnYWluc3QgPGk+PGEgaHJlZj0iaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3df YnVnLmNnaT9pZD01OTI2Ij5odHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcu Y2dpP2lkPTU5MjY8L2E+CitBc3NlcnRpb24gZmFpbHVyZSBpbiBIVE1MR2VuZXJpY0Zvcm1FbGVt ZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlPC9pPi4KKzwvcD4KKzxocj4KKzxwPlRlc3QgcmVzdWx0 OiA8c3BhbiBpZD0icmVzdWx0Ij5GQUlMPC9zcGFuPjwvcD4KKzxmb3JtIGlkPSJhIiBzdHlsZT0i ZGlzcGxheTogbm9uZTsiPgorICAgIDx0YWJsZT4KKyAgICA8L2Zvcm0+CisgICAgPGZvcm0gaWQ9 ImIiPgorICAgIDxpbnB1dCBpZD0iSSIgdHlwZT0ic3VibWl0IiB2YWx1ZT0iTG9nIEluIj4KKyAg ICA8L2Zvcm0+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9DaGFuZ2VMb2csdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuMzcKZGlmZiAtcCAtdSAtcjEuMzcgV2ViQ29yZS9DaGFuZ2VMb2cKLS0tIFdl YkNvcmUvQ2hhbmdlTG9nCTI0IERlYyAyMDA1IDEwOjAyOjIxIC0wMDAwCTEuMzcKKysrIFdlYkNv cmUvQ2hhbmdlTG9nCTI0IERlYyAyMDA1IDE5OjM4OjI4IC0wMDAwCkBAIC0xLDMgKzEsMjEgQEAK KzIwMDUtMTItIyMgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDog ZmFzdC9wYXJzZXIvZ2VuZXJpYy1mb3JtLWVsZW1lbnQtYXNzZXJ0Lmh0bWwKKworICAgICAgICAt IGZpeCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTU5MjYK KyAgICAgICAgQXNzZXJ0aW9uIGZhaWx1cmUgaW4gSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6 OnJlbW92ZWRGcm9tVHJlZQorCisgICAgICAgICoga2h0bWwvaHRtbC9odG1scGFyc2VyLmNwcDoK KyAgICAgICAgKEhUTUxQYXJzZXI6OmhhbmRsZUVycm9yKTogV2hlbiBhIGdlbmVyaWMgZm9ybSBl bGVtZW50IGFwcGVhcnMgaW5zaWRlIGEKKyAgICAgICAgdGFibGUgYW5kIGlzIG1hZGUgYSBzaWJs aW5nIG9mIHRoZSB0YWJsZSwgaXQgbWF5IG5vIGxvbmdlciBiZWxvbmcgdG8gdGhlCisgICAgICAg IGZvcm0gaXQgd2FzIGNyZWF0ZWQgd2l0aCwgc28gdGVsbCBpdCB0byByZWNvbXB1dGUgaXRzIGZv cm0uCisgICAgICAgICoga2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmg6CisgICAgICAgICoga2h0 bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcDoKKyAgICAgICAgKEhUTUxHZW5lcmljRm9ybUVsZW1l bnRJbXBsOjpjaGFuZ2VkRm9ybSk6IEFkZGVkLiBDYWxsZWQgaW4gdGhlIGFib3ZlCisgICAgICAg IGNvbmRpdGlvbiwgZmluZHMgdGhlIGZvcm0gYW5kIChkZSlyZWdpc3RlcnMgd2l0aCAob2xkKSBu ZXcgZm9ybS4KKwogMjAwNS0xMi0yNCAgTWl0eiBQZXR0ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6 cGV0dGVsLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYWNpZWouCkluZGV4OiBXZWJDb3Jl L2todG1sL2h0bWwvaHRtbF9mb3JtaW1wbC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9y b290L1dlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcCx2CnJldHJpZXZpbmcgcmV2 aXNpb24gMS4yMTYKZGlmZiAtcCAtdSAtcjEuMjE2IFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zv cm1pbXBsLmNwcAotLS0gV2ViQ29yZS9raHRtbC9odG1sL2h0bWxfZm9ybWltcGwuY3BwCTIzIERl YyAyMDA1IDE4OjQ0OjE1IC0wMDAwCTEuMjE2CisrKyBXZWJDb3JlL2todG1sL2h0bWwvaHRtbF9m b3JtaW1wbC5jcHAJMjQgRGVjIDIwMDUgMTk6Mzk6MTIgLTAwMDAKQEAgLTg1Nyw2ICs4NTcsMTkg QEAgdm9pZCBIVE1MR2VuZXJpY0Zvcm1FbGVtZW50SW1wbDo6cmVtb3ZlZAogICAgIEhUTUxFbGVt ZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlKGRlZXApOwogfQogCisvLyBDYWxsZWQgYnkgdGhlIHBh cnNlciB3aGVuIHdlIG1heSBoYXZlIGVuZGVkIHVwIGluIGEgZm9ybSBkaWZmZXJlbnQgZnJvbSB0 aGUgb25lIHdlIHdlcmUgZ2l2ZW4gaW4gdGhlIGNvbnN0cnVjdG9yLgordm9pZCBIVE1MR2VuZXJp Y0Zvcm1FbGVtZW50SW1wbDo6Y2hhbmdlZEZvcm0oKQoreworICAgIEhUTUxGb3JtRWxlbWVudElt cGwgKm5ld0Zvcm0gPSBnZXRGb3JtKCk7CisgICAgaWYgKG1fZm9ybSA9PSBuZXdGb3JtKQorICAg ICAgICByZXR1cm47CisgICAgaWYgKG1fZm9ybSkKKyAgICAgICAgbV9mb3JtLT5yZW1vdmVGb3Jt RWxlbWVudCh0aGlzKTsKKyAgICBtX2Zvcm0gPSBuZXdGb3JtOworICAgIGlmIChtX2Zvcm0pCisg ICAgICAgIG1fZm9ybS0+cmVnaXN0ZXJGb3JtRWxlbWVudCh0aGlzKTsKK30KKwogSFRNTEZvcm1F bGVtZW50SW1wbCAqSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6OmdldEZvcm0oKSBjb25zdAog ewogICAgIE5vZGVJbXBsICpwID0gcGFyZW50Tm9kZSgpOwpJbmRleDogV2ViQ29yZS9raHRtbC9o dG1sL2h0bWxfZm9ybWltcGwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29y ZS9raHRtbC9odG1sL2h0bWxfZm9ybWltcGwuaCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMDAK ZGlmZiAtcCAtdSAtcjEuMTAwIFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmgKLS0t IFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmgJMjIgRGVjIDIwMDUgMjM6MDY6MjAg LTAwMDAJMS4xMDAKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmgJMjQgRGVj IDIwMDUgMTk6Mzk6MjkgLTAwMDAKQEAgLTE3NCw2ICsxNzQsNyBAQCBwdWJsaWM6CiAgICAgdmly dHVhbCB2b2lkIGF0dGFjaCgpOwogICAgIHZpcnR1YWwgdm9pZCBpbnNlcnRlZEludG9UcmVlKGJv b2wgZGVlcCk7CiAgICAgdmlydHVhbCB2b2lkIHJlbW92ZWRGcm9tVHJlZShib29sIGRlZXApOwor ICAgIHZvaWQgY2hhbmdlZEZvcm0oKTsKIAogICAgIHZpcnR1YWwgdm9pZCByZXNldCgpIHt9CiAK SW5kZXg6IFdlYkNvcmUva2h0bWwvaHRtbC9odG1scGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBm aWxlOiAvY3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9odG1sL2h0bWxwYXJzZXIuY3BwLHYKcmV0cmll dmluZyByZXZpc2lvbiAxLjEyNgpkaWZmIC1wIC11IC1yMS4xMjYgV2ViQ29yZS9raHRtbC9odG1s L2h0bWxwYXJzZXIuY3BwCi0tLSBXZWJDb3JlL2todG1sL2h0bWwvaHRtbHBhcnNlci5jcHAJMjAg RGVjIDIwMDUgMDk6MTY6NDUgLTAwMDAJMS4xMjYKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9odG1s cGFyc2VyLmNwcAkyNCBEZWMgMjAwNSAxOTozOTo0NSAtMDAwMApAQCAtNTExLDYgKzUxMSw5IEBA IGJvb2wgSFRNTFBhcnNlcjo6aGFuZGxlRXJyb3IoTm9kZUltcGwqIG4KICAgICAgICAgICAgICAg ICAgICAgICAgIG5vZGUgPSAobm9kZS0+aGFzVGFnTmFtZSh0YWJsZVRhZykpID8gbm9kZSA6CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgobm9kZS0+aGFzVGFnTmFtZSh0clRhZykp ID8gZ3JhbmRwYXJlbnQgOiBwYXJlbnQpOwogICAgICAgICAgICAgICAgICAgICAgICAgTm9kZUlt cGwgKnBhcmVudCA9IG5vZGUtPnBhcmVudE5vZGUoKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGlmIChuLT5pc0hUTUxFbGVtZW50KCkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYg KHN0YXRpY19jYXN0PEhUTUxFbGVtZW50SW1wbCo+KG4pLT5pc0dlbmVyaWNGb3JtRWxlbWVudCgp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxIVE1MR2VuZXJp Y0Zvcm1FbGVtZW50SW1wbCo+KG4pLT5jaGFuZ2VkRm9ybSgpOwogICAgICAgICAgICAgICAgICAg ICAgICAgcGFyZW50LT5pbnNlcnRCZWZvcmUobiwgbm9kZSwgZXhjZXB0aW9uQ29kZSk7CiAgICAg ICAgICAgICAgICAgICAgICAgICBpZiAoIWV4Y2VwdGlvbkNvZGUpIHsKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiAobi0+aXNIVE1MRWxlbWVudCgpICYmIHRhZ1ByaW9yaXR5ID4gMCAm JiAK 5307 2005-12-27 13:34:03 -0800 2005-12-27 13:34:03 -0800 Reduced testcase that triggers the assert even with the patch crasher.html text/html 221 mitz PEhUTUw+CjxIRUFEPgo8VElUTEU+PC9USVRMRT4KPC9IRUFEPgo8Qk9EWSBvbkxvYWQ9ImRvY3Vt ZW50LmZvcm1zWzBdIj4KPEZPUk0gaWQ9IkEiPgo8VEFCTEU+Cgk8VFI+CgkJPFREPgogICAgICA8 L0ZPUk0+CgkJCTxGT1JNIGlkPSJCIj48L1REPgoJCTxURD48SU5QVVQgVFlQRT0idGV4dCIgaWQ9 IkkiPjwvVEQ+Cgk8L1RSPgo8L1RBQkxFPgo8L0ZPUk0+CjwvQk9EWT4KPC9IVE1MPgo= 5385 2005-12-30 08:05:59 -0800 2005-12-30 14:31:55 -0800 Don't assert 5926_r2.patch text/plain 1364 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9X ZWJDb3JlL0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNwpkaWZmIC1wIC11IC1y MS4zNyBXZWJDb3JlL0NoYW5nZUxvZwotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJMjQgRGVjIDIwMDUg MTA6MDI6MjEgLTAwMDAJMS4zNworKysgV2ViQ29yZS9DaGFuZ2VMb2cJMjQgRGVjIDIwMDUgMTk6 Mzg6MjggLTAwMDAKQEAgLTEsMCArMSw5IEBACisyMDA2LTAxLSMjICBNaXR6IFBldHRlbCAgPG9w ZW5kYXJ3aW4ub3JnQG1pdHpwZXR0ZWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNgorICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBpbiBIVE1M R2VuZXJpY0Zvcm1FbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlCisKKyAgICAgICAgKiBraHRt bC9odG1sL2h0bWxfZm9ybWltcGwuY3BwOiBSZW1vdmVkIHRoZSBhc3NlcnQuCisKSW5kZXg6IFdl YkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv Y3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9odG1sL2h0bWxfZm9ybWltcGwuY3BwLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjIxNwpkaWZmIC1wIC11IC1yMS4yMTcgV2ViQ29yZS9raHRtbC9odG1sL2h0 bWxfZm9ybWltcGwuY3BwCi0tLSBXZWJDb3JlL2todG1sL2h0bWwvaHRtbF9mb3JtaW1wbC5jcHAJ MzAgRGVjIDIwMDUgMDM6Mjc6MTkgLTAwMDAJMS4yMTcKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9o dG1sX2Zvcm1pbXBsLmNwcAkzMCBEZWMgMjAwNSAxNjowOTo0MSAtMDAwMApAQCAtODQ2LDggKzg0 Niw2IEBAIHZvaWQgSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6OnJlbW92ZWQKICAgICAgICAg aWYgKCFmb3JtKSB7CiAgICAgICAgICAgICBtX2Zvcm0tPnJlbW92ZUZvcm1FbGVtZW50KHRoaXMp OwogICAgICAgICAgICAgbV9mb3JtID0gMDsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBh c3NlcnQoZm9ybSA9PSBtX2Zvcm0pOyAvLyBUaGUgcmUtYWNxdWlyZWQgZm9ybSBzaG91bGQgYmUg dGhlIHNhbWUuIElmIG5vdCwgc29tZXRoaW5nIHJlYWxseSBzdHJhbmdlIGhhcHBlbmVkLgogICAg IH0KICAgIAogICAgIEhUTUxFbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlKGRlZXApOwo= 5388 2005-12-30 14:33:53 -0800 2006-01-16 08:57:17 -0800 Corrected patch 5926_r2.patch text/plain 1375 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnMvcm9vdC9X ZWJDb3JlL0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNwpkaWZmIC1wIC11IC1y MS4zNyBXZWJDb3JlL0NoYW5nZUxvZwotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJMjQgRGVjIDIwMDUg MTA6MDI6MjEgLTAwMDAJMS4zNworKysgV2ViQ29yZS9DaGFuZ2VMb2cJMjQgRGVjIDIwMDUgMTk6 Mzg6MjggLTAwMDAKQEAgLTEsMCArMSw5IEBACisyMDA2LTAxLSMjICBNaXR6IFBldHRlbCAgPG9w ZW5kYXJ3aW4ub3JnQG1pdHpwZXR0ZWwuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNgorICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBpbiBIVE1M R2VuZXJpY0Zvcm1FbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlCisKKyAgICAgICAgKiBraHRt bC9odG1sL2h0bWxfZm9ybWltcGwuY3BwOiBSZW1vdmVkIHRoZSBhc3NlcnQuCisKSW5kZXg6IFdl YkNvcmUva2h0bWwvaHRtbC9odG1sX2Zvcm1pbXBsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAv Y3ZzL3Jvb3QvV2ViQ29yZS9raHRtbC9odG1sL2h0bWxfZm9ybWltcGwuY3BwLHYKcmV0cmlldmlu ZyByZXZpc2lvbiAxLjIxNwpkaWZmIC1wIC11IC1yMS4yMTcgV2ViQ29yZS9raHRtbC9odG1sL2h0 bWxfZm9ybWltcGwuY3BwCi0tLSBXZWJDb3JlL2todG1sL2h0bWwvaHRtbF9mb3JtaW1wbC5jcHAJ MzAgRGVjIDIwMDUgMDM6Mjc6MTkgLTAwMDAJMS4yMTcKKysrIFdlYkNvcmUva2h0bWwvaHRtbC9o dG1sX2Zvcm1pbXBsLmNwcAkzMCBEZWMgMjAwNSAxNjowOTo0MSAtMDAwMApAQCAtODQ2LDggKzg0 Niw3IEBAIHZvaWQgSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6OnJlbW92ZWQKICAgICAgICAg aWYgKCFmb3JtKSB7CiAgICAgICAgICAgICBtX2Zvcm0tPnJlbW92ZUZvcm1FbGVtZW50KHRoaXMp OwogICAgICAgICAgICAgbV9mb3JtID0gMDsKLSAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBh c3NlcnQoZm9ybSA9PSBtX2Zvcm0pOyAvLyBUaGUgcmUtYWNxdWlyZWQgZm9ybSBzaG91bGQgYmUg dGhlIHNhbWUuIElmIG5vdCwgc29tZXRoaW5nIHJlYWxseSBzdHJhbmdlIGhhcHBlbmVkLgorICAg ICAgICB9CiAgICAgfQogICAgCiAgICAgSFRNTEVsZW1lbnRJbXBsOjpyZW1vdmVkRnJvbVRyZWUo ZGVlcCk7Cg== 5719 2006-01-16 08:57:17 -0800 2006-01-17 00:28:30 -0800 Ignore ancestor forms that aren't our form 5926_r3.patch text/plain 5048 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyMTI4KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDYtMDEtIyMgIE1pdHogUGV0dGVsICA8b3Bl bmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgLSB0ZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTU5MjYKKyAgICAgICAgICBBc3NlcnRpb24gZmFpbHVyZSBp biBIVE1MR2VuZXJpY0Zvcm1FbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlCisKKyAgICAgICAg KiBmYXN0L2RvbS9nZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQtZXhwZWN0ZWQudHh0OiBBZGRl ZC4KKyAgICAgICAgKiBmYXN0L2RvbS9nZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQuaHRtbDog QWRkZWQuCisKIDIwMDYtMDEtMTYgIEVyaWMgU2VpZGVsICA8ZXNlaWRlbEBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgZGFyaW4uCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9n ZW5lcmljLWZvcm0tZWxlbWVudC1hc3NlcnQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvZG9tL2dlbmVyaWMtZm9ybS1lbGVtZW50LWFzc2VydC1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L2RvbS9nZW5lcmljLWZvcm0tZWxl bWVudC1hc3NlcnQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUgQEAKK1Ro aXMgdGVzdHMgZm9yIGEgcmVncmVzc2lvbiBhZ2FpbnN0IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFy d2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTkyNiBBc3NlcnRpb24gZmFpbHVyZSBpbiBIVE1MR2Vu ZXJpY0Zvcm1FbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlLgorCitUZXN0IHJlc3VsdDogUEFT UworCisKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL2dlbmVyaWMtZm9ybS1lbGVtZW50LWFz c2VydC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL2dlbmVyaWMtZm9y bS1lbGVtZW50LWFzc2VydC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9k b20vZ2VuZXJpYy1mb3JtLWVsZW1lbnQtYXNzZXJ0Lmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsMzUgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0IHR5cGU9InRleHQv amF2YXNjcmlwdCI+CisgICAgICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVy KQorICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKwor ICAgICAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAg ICAgdmFyIGEgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYScpOworICAgICAgICAgICAgICAg IHZhciBiID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2InKTsKKyAgICAgICAgICAgICAgICB2 YXIgciA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZXN1bHQnKTsKKyAgICAgICAgICAgICAg ICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGIpOworICAgICAgICAgICAgICAgIGRvY3VtZW50 LmJvZHkucmVtb3ZlQ2hpbGQoYSk7CisgICAgICAgICAgICAgICAgdmFyIGwgPSBiLmVsZW1lbnRz Lmxlbmd0aDsKKyAgICAgICAgICAgICAgICByZXN1bHQuaW5uZXJUZXh0ID0gbCA9PSAwID8gJ1BB U1MnIDogJ0ZBSUw6ICcgKyBsOworICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAg ICA8L2hlYWQ+CisgICAgPGJvZHkgb25sb2FkPSJ0ZXN0KCkiPgorICAgICAgICA8cD4KKyAgICAg ICAgICAgIFRoaXMgdGVzdHMgZm9yIGEgcmVncmVzc2lvbiBhZ2FpbnN0CisgICAgICAgICAgICA8 aT48YSBocmVmPSJodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lk PTU5MjYiPmh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTky NjwvYT4KKyAgICAgICAgICAgIEFzc2VydGlvbiBmYWlsdXJlIGluIEhUTUxHZW5lcmljRm9ybUVs ZW1lbnRJbXBsOjpyZW1vdmVkRnJvbVRyZWU8L2k+LgorICAgICAgICA8L3A+CisgICAgICAgIDxo cj4KKyAgICAgICAgPHA+CisgICAgICAgICAgICBUZXN0IHJlc3VsdDogPHNwYW4gaWQ9InJlc3Vs dCI+RkFJTDogZGlkbid0IGZpbmlzaDwvc3Bhbj4KKyAgICAgICAgPC9wPgorICAgICAgICA8Zm9y bSBpZD0iYSI+CisgICAgICAgICAgICA8dGFibGU+PC9mb3JtPgorICAgICAgICAgICAgPGZvcm0g aWQ9ImIiPgorICAgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJzdWJtaXQiIHZhbHVlPSJMb2cg SW4iPgorICAgICAgICAgICAgPC9mb3JtPgorICAgIDwvYm9keT4KKzwvaHRtbD4KSW5kZXg6IFdl YkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lv biAxMjEyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTggQEAKKzIwMDYtMDEtIyMgIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdAbWl0enBldHRl bC5jb20+CisKKyAgICAgICAgVGVzdDogZmFzdC9kb20vZ2VuZXJpYy1mb3JtLWVsZW1lbnQtYXNz ZXJ0Lmh0bWwKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAg CisgICAgICAgIC0gZml4IGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTkyNgorICAgICAgICAgIEFzc2VydGlvbiBmYWlsdXJlIGluIEhUTUxHZW5lcmljRm9y bUVsZW1lbnRJbXBsOjpyZW1vdmVkRnJvbVRyZWUKKworICAgICAgICAqIGtodG1sL2h0bWwvSFRN TEdlbmVyaWNGb3JtRWxlbWVudEltcGwuY3BwOgorICAgICAgICAoRE9NOjpIVE1MR2VuZXJpY0Zv cm1FbGVtZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlKTogQ2hhbmdlZCB0aGUgYW5jZXN0b3Igc2Vh cmNoIHRvCisgICAgICAgIG9ubHkgbG9vayBmb3Igb3VyIGN1cnJlbnQgZm9ybSBhbmQgbm90IGFu eSBmb3JtLiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgbGluayB0byB0aGUKKyAgICAgICAgZm9ybSBp cyBtYWludGFpbmVkIGlmIGFuZCBvbmx5IGlmIHRoZSBmb3JtIGlzIGJlaW5nIHJlbW92ZWQgYWxv bmcgd2l0aCB1cy4KKyAgICAgICAgQWxzbyByZW1vdmVkIHRoZSBub3ctcmVkdW5kYW50IGFzc2Vy dC4KKwogMjAwNi0wMS0xNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6IE1vdmUgY29uZmlnLmggaW4g cHJvamVjdCBmaWxlIHRvIG1hdGNoCkluZGV4OiBXZWJDb3JlL2todG1sL2h0bWwvSFRNTEdlbmVy aWNGb3JtRWxlbWVudEltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUva2h0bWwvaHRtbC9I VE1MR2VuZXJpY0Zvcm1FbGVtZW50SW1wbC5jcHAJKHJldmlzaW9uIDEyMTI4KQorKysgV2ViQ29y ZS9raHRtbC9odG1sL0hUTUxHZW5lcmljRm9ybUVsZW1lbnRJbXBsLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTMzLDcgKzEzMyw3IEBAIHZvaWQgSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6OnJl bW92ZWQKICAgICAgICAgTm9kZUltcGwqIGZvcm0gPSBwYXJlbnROb2RlKCk7CiAgICAgICAgIE5v ZGVJbXBsKiByb290ID0gdGhpczsKICAgICAgICAgd2hpbGUgKGZvcm0pIHsKLSAgICAgICAgICAg IGlmIChmb3JtLT5oYXNUYWdOYW1lKGZvcm1UYWcpKQorICAgICAgICAgICAgaWYgKGZvcm0gPT0g bV9mb3JtKQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgcm9vdCA9IGZvcm07 CiAgICAgICAgICAgICBmb3JtID0gZm9ybS0+cGFyZW50Tm9kZSgpOwpAQCAtMTQ0LDcgKzE0NCw4 IEBAIHZvaWQgSFRNTEdlbmVyaWNGb3JtRWxlbWVudEltcGw6OnJlbW92ZWQKICAgICAgICAgLy8g bWF0Y2guICBJZiBzbywgcHJlc2VydmUgdGhlIGNvbm5lY3Rpb24gdG8gdGhlIGZvcm0uCiAgICAg ICAgIGlmICghZm9ybSkgewogICAgICAgICAgICAgTm9kZUltcGwqIGZvcm1Sb290ID0gbV9mb3Jt OwotICAgICAgICAgICAgd2hpbGUgKGZvcm1Sb290LT5wYXJlbnQoKSkgZm9ybVJvb3QgPSBmb3Jt Um9vdC0+cGFyZW50KCk7CisgICAgICAgICAgICB3aGlsZSAoZm9ybVJvb3QtPnBhcmVudCgpKQor ICAgICAgICAgICAgICAgIGZvcm1Sb290ID0gZm9ybVJvb3QtPnBhcmVudCgpOwogICAgICAgICAg ICAgaWYgKGZvcm1Sb290ID09IHJvb3QpCiAgICAgICAgICAgICAgICAgZm9ybSA9IG1fZm9ybTsK ICAgICAgICAgfSAKQEAgLTE1Miw4ICsxNTMsNyBAQCB2b2lkIEhUTUxHZW5lcmljRm9ybUVsZW1l bnRJbXBsOjpyZW1vdmVkCiAgICAgICAgIGlmICghZm9ybSkgewogICAgICAgICAgICAgbV9mb3Jt LT5yZW1vdmVGb3JtRWxlbWVudCh0aGlzKTsKICAgICAgICAgICAgIG1fZm9ybSA9IDA7Ci0gICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgYXNzZXJ0KGZvcm0gPT0gbV9mb3JtKTsgLy8gVGhlIHJl LWFjcXVpcmVkIGZvcm0gc2hvdWxkIGJlIHRoZSBzYW1lLiBJZiBub3QsIHNvbWV0aGluZyByZWFs bHkgc3RyYW5nZSBoYXBwZW5lZC4KKyAgICAgICAgfQogICAgIH0KICAgIAogICAgIEhUTUxFbGVt ZW50SW1wbDo6cmVtb3ZlZEZyb21UcmVlKGRlZXApOwo=