64509 2011-07-13 20:54:31 -0700 <input form="x"> should not associate the input with any forms when there is no form with id="x" 2011-07-16 08:08:28 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bzbarsky bashi abarth ap bashi bashi darin tkent oldest_to_newest 436911 0 100762 bzbarsky 2011-07-13 20:54:31 -0700 Created attachment 100762 Testcase showing the problem BUILD: WebKit trunk, Chrome dev builds STEPS TO REPRODUCE: 1) Load attached testcase 2) Click the submit button EXPECTED RESULTS: Nothing happens ACTUAL RESULTS: http://www.webkit.org/?test=test is loaded ADDITIONAL INFORMATION: This is poisoning the well for @form: sites are deploying with bogus @form values and breaking in UAs that actually implement the spec. The relevant spec section is http://www.whatwg.org/specs/web-apps/current-work/multipage/association-of-controls-and-forms.html#reset-the-form-owner which says in step 3.2 that if there is a "form" attribute on the input then step 4 is never reached. So both of the inputs in the testcase should not be associated with any form. It looks like WebKit falls through to step 4 when it doesn't find an element with the given ID. 436912 1 bzbarsky 2011-07-13 20:56:27 -0700 Note also http://www.w3.org/Bugs/Public/show_bug.cgi?id=12241 437489 2 100917 bashi 2011-07-14 19:43:32 -0700 Created attachment 100917 Patch V0 437490 3 bashi 2011-07-14 19:46:32 -0700 (In reply to comment #2) > Created an attachment (id=100917) [details] > Patch V0 Changed the bug title to workaround the problem that webkit-patch cannot upload patches when the title includes '<form>'. 437495 4 100917 tkent 2011-07-14 20:06:18 -0700 Comment on attachment 100917 Patch V0 View in context: https://bugs.webkit.org/attachment.cgi?id=100917&action=review > LayoutTests/fast/forms/form-attribute-nonexistence-form-id.html:15 > + document.getElementById('form').submit(); I don't think we need to submit the form to test this issue. shouldBeNull('getElementByName("input2").form') is enough, right? > Source/WebCore/html/FormAssociatedElement.cpp:131 > -void FormAssociatedElement::resetFormOwner(HTMLFormElement* form) > +void FormAssociatedElement::resetFormOwner(HTMLFormElement*) So, we can remove the HTMLFormElement* argument. 437496 5 tkent 2011-07-14 20:07:20 -0700 (In reply to comment #4) > shouldBeNull('getElementByName("input2").form') is enough, right? getElementsByName("input2")[0].form 437505 6 100921 bashi 2011-07-14 20:29:09 -0700 Created attachment 100921 Patch V1 437506 7 100917 bashi 2011-07-14 20:30:50 -0700 Comment on attachment 100917 Patch V0 View in context: https://bugs.webkit.org/attachment.cgi?id=100917&action=review Hi Kent-san, Thank you for the prompt review! >> LayoutTests/fast/forms/form-attribute-nonexistence-form-id.html:15 >> + document.getElementById('form').submit(); > > I don't think we need to submit the form to test this issue. > shouldBeNull('getElementByName("input2").form') is enough, right? Certainly. Done. >> Source/WebCore/html/FormAssociatedElement.cpp:131 >> +void FormAssociatedElement::resetFormOwner(HTMLFormElement*) > > So, we can remove the HTMLFormElement* argument. Done. 437508 8 100921 darin 2011-07-14 20:33:12 -0700 Comment on attachment 100921 Patch V1 Are the tests here sufficient to cover all the effects of the patch? Could there be websites depending on the old behavior? The part about handling form associated elements that have formAttr seems fine, but I am unclear about why the resetFormOwner changes won’t affect other form associated elements. 437522 9 bashi 2011-07-14 21:07:01 -0700 (In reply to comment #8) > (From update of attachment 100921 [details]) > Are the tests here sufficient to cover all the effects of the patch? Could there be websites depending on the old behavior? The part about handling form associated elements that have formAttr seems fine, but I am unclear about why the resetFormOwner changes won’t affect other form associated elements. All changes are enclosed by the condition that checks the elements have formAttr so I think there is no change in behavior of elements which don't have formAttr. Existing tests (LayoutTests/fast/forms/form-attribute*.html) would cover the effects of this patch, including effects for elements which don't have formAttr. Thanks, 437523 10 tkent 2011-07-14 21:13:58 -0700 'form' attribute is a new feature, which Safari 5.0 doesn't have, and I think form=<non-existent-form-id> is a very rare case. So I think it's safe to fix this bug. 437524 11 100921 tkent 2011-07-14 21:17:06 -0700 Comment on attachment 100921 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=100921&action=review > LayoutTests/fast/forms/form-attribute-nonexistence-form-id.html:19 > +var element_should_have_form = document.getElementById('input1'); > +var element_should_not_have_form = document.getElementById('input2'); We usually use camelCase for variable names in JavaScript code though we don't have a formal style guide for JavaScript. 437528 12 bashi 2011-07-14 21:36:53 -0700 Committed r91048: <http://trac.webkit.org/changeset/91048> 437532 13 bashi 2011-07-14 21:38:54 -0700 (In reply to comment #11) > We usually use camelCase for variable names in JavaScript code though we don't have a formal style guide for JavaScript. Committed with a change to use camelCase. Thanks! 437743 14 bzbarsky 2011-07-15 08:10:23 -0700 Thank you! 437751 15 darin 2011-07-15 08:25:40 -0700 (In reply to comment #9) > All changes are enclosed by the condition that checks the elements have formAttr Really? Are the resetFormOwner changes enclosed by that condition? 438135 16 bashi 2011-07-16 03:47:39 -0700 (In reply to comment #15) > Really? Are the resetFormOwner changes enclosed by that condition? Yes. At present, resetFormOwner() is called at two places. - FormAssociatedElement::formAttributeChanged() - Document::resetFormElementsOwner() The former checks element->fastHasAttribute(formAttr) and when its value is false, resetFormOwner() is never called. The former iterates m_formElementsWithFormAttribute, which contain only elements which have form attribute, to call resetFormElementsOwner(). I think this patch doesn't affect behavior for elements which don't have form attribute for that reason. Thanks, 438136 17 bashi 2011-07-16 03:48:48 -0700 (In reply to comment #16) > The former iterates m_formElementsWithFormAttribute, The letter iterates m_formElementsWithFormAttribute, 438147 18 darin 2011-07-16 08:08:28 -0700 Got it. Thanks. 100762 2011-07-13 20:54:31 -0700 2011-07-13 20:54:31 -0700 Testcase showing the problem test2.html text/html 153 bzbarsky PCFET0NUWVBFIGh0bWw+Cjxmb3JtIGFjdGlvbj0iaHR0cDovL3d3dy53ZWJraXQub3JnIj4KICA8 aW5wdXQgdHlwZT0iaGlkZGVuIiBuYW1lPSJ0ZXN0IiB2YWx1ZT0idGVzdCIgZm9ybT0iWCI+CiAg PGlucHV0IHR5cGU9InN1Ym1pdCIgZm9ybT0iWCI+CjwvZm9ybT4K 100917 2011-07-14 19:43:32 -0700 2011-07-14 20:30:50 -0700 Patch V0 bug-64509-20110715114331.patch text/plain 7991 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTEwNDUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YTk0NzU3NjlmOTU5NjA4NTdiNjNj ZGI0OWUxYjQzMGI2ODQwYTlhLi4xNzcxYWM3ODEwOGI2NGQ3OGViYTUzMTI3MTE0MWYyNzc4Zjll YWJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMTQgIEtlbmljaGkgSXNoaWJhc2hp ICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxpbnB1dCBmb3JtPSJ4Ij4gc2hvdWxk IG5vdCBhc3NvY2lhdGUgdGhlIGlucHV0IHdpdGggYW55IGZvcm1zIHdoZW4gdGhlcmUgaXMgbm8g PGZvcm0gaWQ9IngiPgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NjQ1MDkKKworICAgICAgICBBZGRzIGEgdGVzdCBmb3IgY2hlY2tpbmcgaW5wdXQgZWxl bWVudHMgZG9uJ3QgYXNzb2NpYXRlIGFueSBmb3JtIGVsZW1lbnRzIHdoZW4gdGhleSBoYXZlIHRo ZSBmb3JtIGF0dHJpYnV0ZSB3aGljaCBwb2ludHMgbm9uZXhpc3RlbmNlIGZvcm0uCisgICAgICAg IEZpeGVzIGV4aXN0aW5nIHRlc3RzIHRoYXQgY29udGFpbiB1bmludGVuZGVkIGZvcm0gYXR0cmli dXRlcy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGZhc3QvZm9ybXMvZm9ybS1hdHRyaWJ1dGUtbm9uZXhpc3RlbmNlLWZvcm0taWQtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Zvcm1zL2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0 ZW5jZS1mb3JtLWlkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZm9ybXMvc2NyaXB0LXRl c3RzL2Zvcm0tYXR0cmlidXRlLmpzOiBGaXhlZCB1bmludGVuZGVkIGZvcm0gYXR0cmlidXRlcy4K KyAgICAgICAgKiBmYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9mb3JtLWNvbGxlY3Rpb24tZWxlbWVu dHMtb3JkZXIuanM6IERpdHRvLgorCiAyMDExLTA3LTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgVGhlIGJlZm9yZWxvYWQgZXZlbnQgYWxsb3dzIHRyYWNraW5n IFVSSSBjaGFuZ2VzIGluIGEgZnJhbWUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9y bXMvZm9ybS1hdHRyaWJ1dGUtbm9uZXhpc3RlbmNlLWZvcm0taWQtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9mb3Jtcy9mb3JtLWF0dHJpYnV0ZS1ub25leGlzdGVuY2UtZm9ybS1pZC1l eHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZjAyOGIwOTAzNjE4YmNiZmI3YTYzZDJkODQ5MzdmNzgz OGYyNDliZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZm9ybS1h dHRyaWJ1dGUtbm9uZXhpc3RlbmNlLWZvcm0taWQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBA QAorVGhpcyBwYWdlIGVuc3VyZXMgdGhhdCA8aW5wdXQgZnJvbT0iWCI+IGRvbid0IGFzc29jaWF0 ZSB3aXRoIGFueSBmb3JtIGVsZW1lbnRzIHdoZW4gdGhlcmUgaXMgbm8gPGZvcm0gaWQ9IlgiPi4K KworUEFTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9mb3JtLWF0dHJpYnV0 ZS1ub25leGlzdGVuY2UtZm9ybS1pZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9mb3Jt LWF0dHJpYnV0ZS1ub25leGlzdGVuY2UtZm9ybS1pZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmI2MzdlM2M5 NjdlODkwNTMwMTNkYWQ1YzI0NDlmZTUxMmIyNDQzNjcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L2Zvcm1zL2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlkLmh0 bWwKQEAgLTAsMCArMSwyNSBAQAorPGZvcm0gYWN0aW9uPSIiIGlkPSJmb3JtIj4KKyAgPGlucHV0 IHR5cGU9ImhpZGRlbiIgbmFtZT0iaW5wdXQxIiB2YWx1ZT0idmFsdWVfc2hvdWxkX2JlX3N1Ym1p dHRlZCI+CisgIDxpbnB1dCB0eXBlPSJoaWRkZW4iIG5hbWU9ImlucHV0MiIgdmFsdWU9InZhbHVl X3Nob3VsZF9ub3RfYmVfc3VibWl0dGVkIiBmb3JtPSJYIj4KKzwvZm9ybT4KKzxwPgorVGhpcyBw YWdlIGVuc3VyZXMgdGhhdCAmbHQ7aW5wdXQgZnJvbT0iWCImZ3Q7IGRvbid0IGFzc29jaWF0ZSB3 aXRoIGFueSBmb3JtIGVsZW1lbnRzIHdoZW4gdGhlcmUgaXMgbm8gJmx0O2Zvcm0gaWQ9IlgiJmd0 Oy4KKzwvcD4KKzxkaXYgaWQ9InJlc3VsdCI+PC9kaXY+Cis8c2NyaXB0PgoraWYgKHdpbmRvdy5s YXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CitpZiAo ZG9jdW1lbnQubG9jYXRpb24uaHJlZi5pbmRleE9mKCc/JykgPT0gLTEpIHsKKyAgICBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnZm9ybScpLnN1Ym1pdCgpOworfSBlbHNlIHsKKyAgICB2YXIgdmFs dWVzID0gZG9jdW1lbnQubG9jYXRpb24uc2VhcmNoLnN1YnN0cmluZygxKTsKKyAgICBpZiAodmFs dWVzLmluZGV4T2YoJ3ZhbHVlX3Nob3VsZF9iZV9zdWJtaXR0ZWQnKSAhPSAtMSAmJiB2YWx1ZXMu aW5kZXhPZigndmFsdWVfc2hvdWxkX25vdF9iZV9zdWJtaXR0ZWQnKSA9PSAtMSkKKyAgICAgICAg ZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVySFRNTCA9ICdQQVNTJzsKKyAg ICBlbHNlCisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZXN1bHQnKS5pbm5lckhU TUwgPSAnRkFJTCc7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworfQorPC9zY3JpcHQ+CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9mb3JtLWF0dHJpYnV0 ZS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2Zvcm0tYXR0cmlidXRl LmpzCmluZGV4IGUzNGVjNDYwODA3MjgxNzBiNjFmODZkMmRjZTczNWQ0ZTRmYTc5ODcuLjMwNzli YmZiNzNhM2QwNDkwZjA2YTAzY2U1MDFjNWRmYmUyYTVmYTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2Zvcm0tYXR0cmlidXRlLmpzCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2Zvcm0tYXR0cmlidXRlLmpzCkBAIC02MSw5 ICs2MSw5IEBAIGRlYnVnKCctIEVuc3VyZXMgdGhhdCB0aGUgZm9ybSBhdHRyaWJ1dGUgcG9pbnRz IHRoZSBmb3JtIG93bmVyIGV2ZW4gaWYgdGhlIGZvcm0KIGRlYnVnKCdOT1RFOiBJdCBzZWVtcyB0 aGF0IG5lc3RpbmcgZm9ybSBlbGVtZW50cyBpcyBub3QgYWxsb3dlZCBzbyB3ZSBlbnN1cmUgZWFj aCBmb3JtLWFzc29jaWF0ZWQgZWxlbWVudHMgYXNzb2NpYXRlIHdpdGggdGhlIG91dG1vc3QgZm9y bSBlbGVtZW50LicpOwogY29udGFpbmVyLmlubmVySFRNTCA9ICc8Zm9ybSBpZD1vd25lcj4nICsK ICAgICAnICAgIDxmb3JtPicgKwotICAgICcgICAgICAgIDxpbnB1dCBpZD1pbnB1dEVsZW1lbnQx IG5hbWU9dmljdGltIGZvcm09b3duZXIvPicgKworICAgICcgICAgICAgIDxpbnB1dCBpZD1pbnB1 dEVsZW1lbnQxIG5hbWU9dmljdGltIGZvcm09b3duZXIgLz4nICsKICAgICAnICAgICAgICA8aW5w dXQgaWQ9aW5wdXRFbGVtZW50MiBuYW1lPXZpY3RpbSAvPicgKwotICAgICcgICAgICAgIDxpbnB1 dCBpZD1pbnB1dEVsZW1lbnQzIG5hbWU9dmljdGltIGZvcm09b3duZXIvPicgKworICAgICcgICAg ICAgIDxpbnB1dCBpZD1pbnB1dEVsZW1lbnQzIG5hbWU9dmljdGltIGZvcm09b3duZXIgLz4nICsK ICAgICAnICAgIDwvZm9ybT4nICsKICAgICAnPC9mb3JtPic7CiBvd25lciA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCdvd25lcicpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9zY3JpcHQtdGVzdHMvZm9ybS1jb2xsZWN0aW9uLWVsZW1lbnRzLW9yZGVyLmpzIGIvTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvZm9ybS1jb2xsZWN0aW9uLWVsZW1lbnRzLW9y ZGVyLmpzCmluZGV4IDE5NWU0NjE3NTMyM2RlZDVhMWU5NWFmYzhhMWVmYmNlMTAzMGUzNGMuLjE2 MzZiOTY4ZmRlN2Y2MjI4YzRhODAzZDI5ZTc5YTM0YWQ2OGM4ZTAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2Zvcm0tY29sbGVjdGlvbi1lbGVtZW50cy1v cmRlci5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9mb3JtLWNv bGxlY3Rpb24tZWxlbWVudHMtb3JkZXIuanMKQEAgLTU3LDcgKzU3LDcgQEAgZGVidWcoJycpOwog ZGVidWcoJy0gQ2hlY2tzIHRoZSBvcmRlciBvZiBmb3JtIGFzc29jaWF0ZWQgZWxlbWVudHMgd2l0 aCBmb3JtIGF0dHJpYnV0ZS4nKTsKIGNvbnRhaW5lci5pbm5lckhUTUwgPSAnPGJ1dHRvbiBuYW1l PXZpY3RpbSBmb3JtPW93bmVyPjwvYnV0dG9uPicgKwogICAgICc8ZmllbGRzZXQgbmFtZT12aWN0 aW0gZm9ybT1vd25lcj5UZXN0PC9maWVsZHNldD4nICsKLSAgICAnPGlucHV0IG5hbWU9dmljdGlt IGZvcm09b3duZXIvPicgKworICAgICc8aW5wdXQgbmFtZT12aWN0aW0gZm9ybT1vd25lciAvPicg KwogICAgICc8a2V5Z2VuIG5hbWU9dmljdGltIGZvcm09b3duZXI+PC9rZXlnZW4+JyArCiAgICAg Jzxmb3JtIGlkPW93bmVyPicgKwogICAgICc8bGFiZWwgbmFtZT12aWN0aW0+PC9sYWJlbD4nICsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMGVkYWY2MDkzNjRmZDUzMWU2Y2I1ZjMzNjc0ZTZhZDQ2M2RmYTlkLi5l NmUyNmRhYmY5NWJjNGNkOTgzZTYxMGMzOWFjMGZhMDE5ZmE4MmI1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTEtMDctMTQgIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21p dW0ub3JnPgorCisgICAgICAgIDxpbnB1dCBmb3JtPSJ4Ij4gc2hvdWxkIG5vdCBhc3NvY2lhdGUg dGhlIGlucHV0IHdpdGggYW55IGZvcm1zIHdoZW4gdGhlcmUgaXMgbm8gPGZvcm0gaWQ9IngiPgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQ1MDkKKwor ICAgICAgICBEb24ndCBzZXQgZm9ybSBvd25lciB3aGVuIGEgZm9ybSBhc3NvY2lhdGVkIGVsZW1l bnQgaGFzIHRoZSBmb3JtIGF0dHJpYnV0ZSBidXQgdGhlcmUgaXMgbm8gc3VjaCBmb3JtIGVsZW1l bnQuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVz dDogZmFzdC9mb3Jtcy9mb3JtLWF0dHJpYnV0ZS1ub25leGlzdGVuY2UtZm9ybS1pZC5odG1sCisK KyAgICAgICAgKiBodG1sL0Zvcm1Bc3NvY2lhdGVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6Omluc2VydGVkSW50b1RyZWUpOiBSZXNldHMgbV9m b3JtIHdoZW5ldmVyIHRoZSBlbGVtZW50IGhhcyB0aGUgZm9ybSBhdHRyaWJ1dGUuCisgICAgICAg IChXZWJDb3JlOjpGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6OnJlc2V0Rm9ybU93bmVyKTogRG9uJ3Qg c2V0IG1fZm9ybSB3aGVuIHRoZXJlIGlzIG5vIGZvcm0gZWxlbWVudCB3aGljaCBoYXMgdGhlIGdp dmVuIGlkLgorCiAyMDExLTA3LTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgVGhlIGJlZm9yZWxvYWQgZXZlbnQgYWxsb3dzIHRyYWNraW5nIFVSSSBjaGFuZ2Vz IGluIGEgZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvRm9ybUFzc29jaWF0 ZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRm9ybUFzc29jaWF0ZWRFbGVtZW50 LmNwcAppbmRleCA2YjU4OGI0OGI5OTc0ZGYxZjQ2OTVhZDA4M2M4ZWQwMjVjYzJlMjFlLi42MmIx MTkwODVhZjg2N2I0MGYyMTE4MTZkMGE1M2U4ZmNmNWY5ZDkwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0Zvcm1Bc3NvY2lhdGVkRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9Gb3JtQXNzb2NpYXRlZEVsZW1lbnQuY3BwCkBAIC03NywxMyArNzcsMTkgQEAgdm9p ZCBGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6Omluc2VydGVkSW50b1RyZWUoKQogewogICAgIEhUTUxF bGVtZW50KiBlbGVtZW50ID0gdG9IVE1MRWxlbWVudCh0aGlzKTsKICAgICBpZiAoZWxlbWVudC0+ ZmFzdEhhc0F0dHJpYnV0ZShmb3JtQXR0cikpIHsKKyAgICAgICAgLy8gUmVzZXRzIHRoZSBmb3Jt IG93bmVyIGF0IGZpcnN0IHRvIG1ha2Ugc3VyZSB0aGUgZWxlbWVudCBkb24ndAorICAgICAgICAv LyBhc3NvY2lhdGUgYW55IGZvcm0gZWxlbWVudHMgd2hlbiB0aGVyZSBpcyBubyBlbGVtZW50IHdo aWNoIGhhcworICAgICAgICAvLyB0aGUgZ2l2ZW4gSUQuCisgICAgICAgIGlmIChtX2Zvcm0pIHsK KyAgICAgICAgICAgIG1fZm9ybS0+cmVtb3ZlRm9ybUVsZW1lbnQodGhpcyk7CisgICAgICAgICAg ICBtX2Zvcm0gPSAwOworICAgICAgICB9CiAgICAgICAgIEVsZW1lbnQqIGZvcm1FbGVtZW50ID0g ZWxlbWVudC0+dHJlZVNjb3BlKCktPmdldEVsZW1lbnRCeUlkKGVsZW1lbnQtPmZhc3RHZXRBdHRy aWJ1dGUoZm9ybUF0dHIpKTsKICAgICAgICAgaWYgKGZvcm1FbGVtZW50ICYmIGZvcm1FbGVtZW50 LT5oYXNUYWdOYW1lKGZvcm1UYWcpKSB7Ci0gICAgICAgICAgICBpZiAobV9mb3JtKQotICAgICAg ICAgICAgICAgIG1fZm9ybS0+cmVtb3ZlRm9ybUVsZW1lbnQodGhpcyk7CiAgICAgICAgICAgICBt X2Zvcm0gPSBzdGF0aWNfY2FzdDxIVE1MRm9ybUVsZW1lbnQqPihmb3JtRWxlbWVudCk7CiAgICAg ICAgICAgICBtX2Zvcm0tPnJlZ2lzdGVyRm9ybUVsZW1lbnQodGhpcyk7CiAgICAgICAgIH0KKyAg ICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAoIW1fZm9ybSkgewogICAgICAgICAvLyBUaGlz IGhhbmRsZXMgdGhlIGNhc2Ugb2YgYSBuZXcgZm9ybSBlbGVtZW50IGJlaW5nIGNyZWF0ZWQgYnkK QEAgLTEyMiw3ICsxMjgsNyBAQCB2b2lkIEZvcm1Bc3NvY2lhdGVkRWxlbWVudDo6cmVtb3ZlRnJv bUZvcm0oKQogICAgIG1fZm9ybSA9IDA7CiB9CiAKLXZvaWQgRm9ybUFzc29jaWF0ZWRFbGVtZW50 OjpyZXNldEZvcm1Pd25lcihIVE1MRm9ybUVsZW1lbnQqIGZvcm0pCit2b2lkIEZvcm1Bc3NvY2lh dGVkRWxlbWVudDo6cmVzZXRGb3JtT3duZXIoSFRNTEZvcm1FbGVtZW50KikKIHsKICAgICBIVE1M RWxlbWVudCogZWxlbWVudCA9IHRvSFRNTEVsZW1lbnQodGhpcyk7CiAgICAgY29uc3QgQXRvbWlj U3RyaW5nJiBmb3JtSWQoZWxlbWVudC0+ZmFzdEdldEF0dHJpYnV0ZShmb3JtQXR0cikpOwpAQCAt MTQwLDggKzE0Niw2IEBAIHZvaWQgRm9ybUFzc29jaWF0ZWRFbGVtZW50OjpyZXNldEZvcm1Pd25l cihIVE1MRm9ybUVsZW1lbnQqIGZvcm0pCiAgICAgICAgIEVsZW1lbnQqIGZpcnN0RWxlbWVudCA9 IGVsZW1lbnQtPnRyZWVTY29wZSgpLT5nZXRFbGVtZW50QnlJZChmb3JtSWQpOwogICAgICAgICBp ZiAoZmlyc3RFbGVtZW50ICYmIGZpcnN0RWxlbWVudC0+aGFzVGFnTmFtZShmb3JtVGFnKSkKICAg ICAgICAgICAgIG1fZm9ybSA9IHN0YXRpY19jYXN0PEhUTUxGb3JtRWxlbWVudCo+KGZpcnN0RWxl bWVudCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIG1fZm9ybSA9IGZvcm07CiAgICAgfSBl bHNlCiAgICAgICAgIG1fZm9ybSA9IGVsZW1lbnQtPmZpbmRGb3JtQW5jZXN0b3IoKTsKICAgICBp ZiAobV9mb3JtKQo= 100921 2011-07-14 20:29:09 -0700 2011-07-14 21:17:06 -0700 Patch V1 bug-64509-20110715122907.patch text/plain 11866 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTEwNDUKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA2YTk0NzU3NjlmOTU5NjA4NTdiNjNj ZGI0OWUxYjQzMGI2ODQwYTlhLi43OTlhMzUxMWQ3MjQwNGU5Yzg4ODhlZTdhZTQ4OTExYTljZDJj MjNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDctMTQgIEtlbmljaGkgSXNoaWJhc2hp ICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIDxpbnB1dCBmb3JtPSJ4Ij4gc2hvdWxk IG5vdCBhc3NvY2lhdGUgdGhlIGlucHV0IHdpdGggYW55IGZvcm1zIHdoZW4gdGhlcmUgaXMgbm8g IGZvcm0gd2l0aCBpZD0ieCIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTY0NTA5CisKKyAgICAgICAgQWRkcyBhIHRlc3QgZm9yIGNoZWNraW5nIGlucHV0 IGVsZW1lbnRzIGRvbid0IGFzc29jaWF0ZSBhbnkgZm9ybSBlbGVtZW50cyB3aGVuIHRoZXkgaGF2 ZSB0aGUgZm9ybSBhdHRyaWJ1dGUgd2hpY2ggcG9pbnRzIG5vbmV4aXN0ZW5jZSBmb3JtLgorICAg ICAgICBGaXhlcyBleGlzdGluZyB0ZXN0cyB0aGF0IGNvbnRhaW4gdW5pbnRlbmRlZCBmb3JtIGF0 dHJpYnV0ZXMuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBmYXN0L2Zvcm1zL2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlkLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9mb3Jtcy9mb3JtLWF0dHJpYnV0ZS1ub25l eGlzdGVuY2UtZm9ybS1pZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Zvcm1zL3Njcmlw dC10ZXN0cy9mb3JtLWF0dHJpYnV0ZS5qczogRml4ZWQgdW5pbnRlbmRlZCBmb3JtIGF0dHJpYnV0 ZXMuCisgICAgICAgICogZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvZm9ybS1jb2xsZWN0aW9uLWVs ZW1lbnRzLW9yZGVyLmpzOiBEaXR0by4KKwogMjAxMS0wNy0xNCAgQWRhbSBCYXJ0aCAgPGFiYXJ0 aEB3ZWJraXQub3JnPgogCiAgICAgICAgIFRoZSBiZWZvcmVsb2FkIGV2ZW50IGFsbG93cyB0cmFj a2luZyBVUkkgY2hhbmdlcyBpbiBhIGZyYW1lCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlkLWV4cGVjdGVkLnR4dCBi L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvZm9ybS1hdHRyaWJ1dGUtbm9uZXhpc3RlbmNlLWZvcm0t aWQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFlZWE4NWYwYjE5Yjc2YjdmN2YyZTBmOTc2MTMw YTk4N2FhNDgwOGUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2Zv cm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDExIEBACitUaGlzIHBhZ2UgZW5zdXJlcyB0aGF0IDxpbnB1dCBmcm9tPSJYIj4gZG9uJ3QgYXNz b2NpYXRlIHdpdGggYW55IGZvcm0gZWxlbWVudHMgd2hlbiB0aGVyZSBpcyBubyA8Zm9ybSBpZD0i WCI+LgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBlbGVtZW50X3Nob3Vs ZF9oYXZlX2Zvcm0uZm9ybSBpcyBmb3JtCitQQVNTIGVsZW1lbnRfc2hvdWxkX25vdF9oYXZlX2Zv cm0uZm9ybSBpcyBudWxsCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9mb3JtLWF0dHJp YnV0ZS1ub25leGlzdGVuY2UtZm9ybS1pZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9m b3JtLWF0dHJpYnV0ZS1ub25leGlzdGVuY2UtZm9ybS1pZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjFmODQ1 ZjRiMWRjZDc5NDAyNDNmNzEzMzM1NThhMTZiMzMzOGMwNTEKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlk Lmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9E VEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl Zj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBz cmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwv aGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8Zm9ybSBpZD0iZm9ybSI+ CisgICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgaWQ9ImlucHV0MSIgdmFsdWU9InZhbHVlMSI+Cisg ICAgPGlucHV0IHR5cGU9ImhpZGRlbiIgaWQ9ImlucHV0MiIgdmFsdWU9InZhbHVlMiIgZm9ybT0i WCI+Cis8L2Zvcm0+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CitkZXNjcmlw dGlvbignVGhpcyBwYWdlIGVuc3VyZXMgdGhhdCAmbHQ7aW5wdXQgZnJvbT0iWCImZ3Q7IGRvblwn dCBhc3NvY2lhdGUgd2l0aCBhbnkgZm9ybSBlbGVtZW50cyB3aGVuIHRoZXJlIGlzIG5vICZsdDtm b3JtIGlkPSJYIiZndDsuJyk7CisKK3ZhciBmb3JtID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2Zvcm0nKTsKK3ZhciBlbGVtZW50X3Nob3VsZF9oYXZlX2Zvcm0gPSBkb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgnaW5wdXQxJyk7Cit2YXIgZWxlbWVudF9zaG91bGRfbm90X2hhdmVfZm9ybSA9IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdpbnB1dDInKTsKK3Nob3VsZEJlKCdlbGVtZW50X3Nob3Vs ZF9oYXZlX2Zvcm0uZm9ybScsICdmb3JtJyk7CitzaG91bGRCZU51bGwoJ2VsZW1lbnRfc2hvdWxk X25vdF9oYXZlX2Zvcm0uZm9ybScpOwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8 L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvZm9ybS1hdHRyaWJ1dGUuanMgYi9MYXlvdXRUZXN0 cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9mb3JtLWF0dHJpYnV0ZS5qcwppbmRleCBlMzRlYzQ2 MDgwNzI4MTcwYjYxZjg2ZDJkY2U3MzVkNGU0ZmE3OTg3Li4zMDc5YmJmYjczYTNkMDQ5MGYwNmEw M2NlNTAxYzVkZmJlMmE1ZmExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3Nj cmlwdC10ZXN0cy9mb3JtLWF0dHJpYnV0ZS5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1z L3NjcmlwdC10ZXN0cy9mb3JtLWF0dHJpYnV0ZS5qcwpAQCAtNjEsOSArNjEsOSBAQCBkZWJ1Zygn LSBFbnN1cmVzIHRoYXQgdGhlIGZvcm0gYXR0cmlidXRlIHBvaW50cyB0aGUgZm9ybSBvd25lciBl dmVuIGlmIHRoZSBmb3JtCiBkZWJ1ZygnTk9URTogSXQgc2VlbXMgdGhhdCBuZXN0aW5nIGZvcm0g ZWxlbWVudHMgaXMgbm90IGFsbG93ZWQgc28gd2UgZW5zdXJlIGVhY2ggZm9ybS1hc3NvY2lhdGVk IGVsZW1lbnRzIGFzc29jaWF0ZSB3aXRoIHRoZSBvdXRtb3N0IGZvcm0gZWxlbWVudC4nKTsKIGNv bnRhaW5lci5pbm5lckhUTUwgPSAnPGZvcm0gaWQ9b3duZXI+JyArCiAgICAgJyAgICA8Zm9ybT4n ICsKLSAgICAnICAgICAgICA8aW5wdXQgaWQ9aW5wdXRFbGVtZW50MSBuYW1lPXZpY3RpbSBmb3Jt PW93bmVyLz4nICsKKyAgICAnICAgICAgICA8aW5wdXQgaWQ9aW5wdXRFbGVtZW50MSBuYW1lPXZp Y3RpbSBmb3JtPW93bmVyIC8+JyArCiAgICAgJyAgICAgICAgPGlucHV0IGlkPWlucHV0RWxlbWVu dDIgbmFtZT12aWN0aW0gLz4nICsKLSAgICAnICAgICAgICA8aW5wdXQgaWQ9aW5wdXRFbGVtZW50 MyBuYW1lPXZpY3RpbSBmb3JtPW93bmVyLz4nICsKKyAgICAnICAgICAgICA8aW5wdXQgaWQ9aW5w dXRFbGVtZW50MyBuYW1lPXZpY3RpbSBmb3JtPW93bmVyIC8+JyArCiAgICAgJyAgICA8L2Zvcm0+ JyArCiAgICAgJzwvZm9ybT4nOwogb3duZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnb3du ZXInKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2Zv cm0tY29sbGVjdGlvbi1lbGVtZW50cy1vcmRlci5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMv c2NyaXB0LXRlc3RzL2Zvcm0tY29sbGVjdGlvbi1lbGVtZW50cy1vcmRlci5qcwppbmRleCAxOTVl NDYxNzUzMjNkZWQ1YTFlOTVhZmM4YTFlZmJjZTEwMzBlMzRjLi4xNjM2Yjk2OGZkZTdmNjIyOGM0 YTgwM2QyOWU3OWEzNGFkNjhjOGUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1z L3NjcmlwdC10ZXN0cy9mb3JtLWNvbGxlY3Rpb24tZWxlbWVudHMtb3JkZXIuanMKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvZm9ybS1jb2xsZWN0aW9uLWVsZW1lbnRz LW9yZGVyLmpzCkBAIC01Nyw3ICs1Nyw3IEBAIGRlYnVnKCcnKTsKIGRlYnVnKCctIENoZWNrcyB0 aGUgb3JkZXIgb2YgZm9ybSBhc3NvY2lhdGVkIGVsZW1lbnRzIHdpdGggZm9ybSBhdHRyaWJ1dGUu Jyk7CiBjb250YWluZXIuaW5uZXJIVE1MID0gJzxidXR0b24gbmFtZT12aWN0aW0gZm9ybT1vd25l cj48L2J1dHRvbj4nICsKICAgICAnPGZpZWxkc2V0IG5hbWU9dmljdGltIGZvcm09b3duZXI+VGVz dDwvZmllbGRzZXQ+JyArCi0gICAgJzxpbnB1dCBuYW1lPXZpY3RpbSBmb3JtPW93bmVyLz4nICsK KyAgICAnPGlucHV0IG5hbWU9dmljdGltIGZvcm09b3duZXIgLz4nICsKICAgICAnPGtleWdlbiBu YW1lPXZpY3RpbSBmb3JtPW93bmVyPjwva2V5Z2VuPicgKwogICAgICc8Zm9ybSBpZD1vd25lcj4n ICsKICAgICAnPGxhYmVsIG5hbWU9dmljdGltPjwvbGFiZWw+JyArCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDBl ZGFmNjA5MzY0ZmQ1MzFlNmNiNWYzMzY3NGU2YWQ0NjNkZmE5ZC4uY2MwMWQwNDg2MWFhMmIxYTAx MWQzYzNjNDlkYTRhZjU1MGQwM2ZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEx LTA3LTE0ICBLZW5pY2hpIElzaGliYXNoaSAgPGJhc2hpQGNocm9taXVtLm9yZz4KKworICAgICAg ICA8aW5wdXQgZm9ybT0ieCI+IHNob3VsZCBub3QgYXNzb2NpYXRlIHRoZSBpbnB1dCB3aXRoIGFu eSBmb3JtcyB3aGVuIHRoZXJlIGlzIG5vICBmb3JtIHdpdGggaWQ9IngiCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDUwOQorCisgICAgICAgIERvbid0 IHNldCBmb3JtIG93bmVyIHdoZW4gYSBmb3JtIGFzc29jaWF0ZWQgZWxlbWVudCBoYXMgdGhlIGZv cm0gYXR0cmlidXRlIGJ1dCB0aGVyZSBpcyBubyBzdWNoIGZvcm0gZWxlbWVudC4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Zvcm1z L2Zvcm0tYXR0cmlidXRlLW5vbmV4aXN0ZW5jZS1mb3JtLWlkLmh0bWwKKworICAgICAgICAqIGRv bS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVzZXRGb3JtRWxl bWVudHNPd25lcik6IFJlbW92ZWQgdGhlIGFyZ3VtZW50IHdoaWNoIGlzIG5vIGxvbmdlciBuZWVk ZWQuCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6IERpdHRvLgorICAgICAgICAqIGh0bWwvRm9y bUFzc29jaWF0ZWRFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1Bc3NvY2lhdGVk RWxlbWVudDo6aW5zZXJ0ZWRJbnRvVHJlZSk6IFJlc2V0cyBtX2Zvcm0gd2hlbmV2ZXIgdGhlIGVs ZW1lbnQgaGFzIHRoZSBmb3JtIGF0dHJpYnV0ZS4KKyAgICAgICAgKFdlYkNvcmU6OkZvcm1Bc3Nv Y2lhdGVkRWxlbWVudDo6cmVzZXRGb3JtT3duZXIpOiBEb24ndCBzZXQgbV9mb3JtIHdoZW4gdGhl cmUgaXMgbm8gZm9ybSBlbGVtZW50IHdoaWNoIGhhcyB0aGUgZ2l2ZW4gaWQuCisgICAgICAgIChX ZWJDb3JlOjpGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6OmZvcm1BdHRyaWJ1dGVDaGFuZ2VkKTogUmVt b3ZlZCB0aGUgYXJndW1lbnQgb2YgcmVzZXRGb3JtT3duZXIoKS4KKyAgICAgICAgKiBodG1sL0Zv cm1Bc3NvY2lhdGVkRWxlbWVudC5oOiBEaXR0by4KKyAgICAgICAgKiBodG1sL0hUTUxGb3JtRWxl bWVudC5jcHA6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTEZvcm1FbGVtZW50OjppbnNl cnRlZEludG9Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRm9ybUVsZW1lbnQ6OnJl bW92ZWRGcm9tRG9jdW1lbnQpOgorCiAyMDExLTA3LTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgVGhlIGJlZm9yZWxvYWQgZXZlbnQgYWxsb3dzIHRyYWNraW5n IFVSSSBjaGFuZ2VzIGluIGEgZnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDkyNTI0 ODM3NjlmNmVjNTMwMTIzMDQyOTBjZjBmNjM5OWFmNjdjZDEuLmQyZTA5NDRmZWU3ZWNjZjE2YjU0 NTkxN2RjZjQ5NTBhODBhZDlhMzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNDM3Mywx MiArNDM3MywxMiBAQCB2b2lkIERvY3VtZW50Ojp1bnJlZ2lzdGVyRm9ybUVsZW1lbnRXaXRoRm9y bUF0dHJpYnV0ZShGb3JtQXNzb2NpYXRlZEVsZW1lbnQqIGVsZQogICAgIG1fZm9ybUVsZW1lbnRz V2l0aEZvcm1BdHRyaWJ1dGUucmVtb3ZlKGVsZW1lbnQpOwogfQogCi12b2lkIERvY3VtZW50Ojpy ZXNldEZvcm1FbGVtZW50c093bmVyKEhUTUxGb3JtRWxlbWVudCogZm9ybSkKK3ZvaWQgRG9jdW1l bnQ6OnJlc2V0Rm9ybUVsZW1lbnRzT3duZXIoKQogewogICAgIHR5cGVkZWYgRm9ybUFzc29jaWF0 ZWRFbGVtZW50TGlzdEhhc2hTZXQ6Oml0ZXJhdG9yIEl0ZXJhdG9yOwogICAgIEl0ZXJhdG9yIGVu ZCA9IG1fZm9ybUVsZW1lbnRzV2l0aEZvcm1BdHRyaWJ1dGUuZW5kKCk7CiAgICAgZm9yIChJdGVy YXRvciBpdCA9IG1fZm9ybUVsZW1lbnRzV2l0aEZvcm1BdHRyaWJ1dGUuYmVnaW4oKTsgaXQgIT0g ZW5kOyArK2l0KQotICAgICAgICAoKml0KS0+cmVzZXRGb3JtT3duZXIoZm9ybSk7CisgICAgICAg ICgqaXQpLT5yZXNldEZvcm1Pd25lcigpOwogfQogCiB2b2lkIERvY3VtZW50OjpzZXRVc2VTZWN1 cmVLZXlib2FyZEVudHJ5V2hlbkFjdGl2ZShib29sIHVzZXNTZWN1cmVLZXlib2FyZCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmgKaW5kZXggYWZhNDQ1YzJjNjZmMjk0ODcwZTMyNmE1OTE4MmYyYjYzNzQ3MzJm OC4uMTQ4MGFiNTM1MDYyNGI4OGZjNTg4NmU5ZGFhY2I3YmNlZTUxMzQ4MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmgKQEAgLTUyMCw3ICs1MjAsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlZ2lzdGVy Rm9ybUVsZW1lbnRXaXRoRm9ybUF0dHJpYnV0ZShGb3JtQXNzb2NpYXRlZEVsZW1lbnQqKTsKICAg ICB2b2lkIHVucmVnaXN0ZXJGb3JtRWxlbWVudFdpdGhGb3JtQXR0cmlidXRlKEZvcm1Bc3NvY2lh dGVkRWxlbWVudCopOwotICAgIHZvaWQgcmVzZXRGb3JtRWxlbWVudHNPd25lcihIVE1MRm9ybUVs ZW1lbnQqKTsKKyAgICB2b2lkIHJlc2V0Rm9ybUVsZW1lbnRzT3duZXIoKTsKIAogICAgIEZyYW1l VmlldyogdmlldygpIGNvbnN0OyAvLyBjYW4gYmUgTlVMTAogICAgIEZyYW1lKiBmcmFtZSgpIGNv bnN0IHsgcmV0dXJuIG1fZnJhbWU7IH0gLy8gY2FuIGJlIE5VTEwKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvRm9ybUFzc29jaWF0ZWRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvRm9ybUFzc29jaWF0ZWRFbGVtZW50LmNwcAppbmRleCA2YjU4OGI0OGI5OTc0ZGYxZjQ2 OTVhZDA4M2M4ZWQwMjVjYzJlMjFlLi4xZGRiNmE2NWMyNjYyZjA5OGE4MzAzOTFmY2JlMTE0MDFh YjIxNjYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Bc3NvY2lhdGVkRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9Gb3JtQXNzb2NpYXRlZEVsZW1lbnQu Y3BwCkBAIC03NywxMyArNzcsMTkgQEAgdm9pZCBGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6Omluc2Vy dGVkSW50b1RyZWUoKQogewogICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gdG9IVE1MRWxlbWVu dCh0aGlzKTsKICAgICBpZiAoZWxlbWVudC0+ZmFzdEhhc0F0dHJpYnV0ZShmb3JtQXR0cikpIHsK KyAgICAgICAgLy8gUmVzZXRzIHRoZSBmb3JtIG93bmVyIGF0IGZpcnN0IHRvIG1ha2Ugc3VyZSB0 aGUgZWxlbWVudCBkb24ndAorICAgICAgICAvLyBhc3NvY2lhdGUgYW55IGZvcm0gZWxlbWVudHMg d2hlbiB0aGVyZSBpcyBubyBlbGVtZW50IHdoaWNoIGhhcworICAgICAgICAvLyB0aGUgZ2l2ZW4g SUQuCisgICAgICAgIGlmIChtX2Zvcm0pIHsKKyAgICAgICAgICAgIG1fZm9ybS0+cmVtb3ZlRm9y bUVsZW1lbnQodGhpcyk7CisgICAgICAgICAgICBtX2Zvcm0gPSAwOworICAgICAgICB9CiAgICAg ICAgIEVsZW1lbnQqIGZvcm1FbGVtZW50ID0gZWxlbWVudC0+dHJlZVNjb3BlKCktPmdldEVsZW1l bnRCeUlkKGVsZW1lbnQtPmZhc3RHZXRBdHRyaWJ1dGUoZm9ybUF0dHIpKTsKICAgICAgICAgaWYg KGZvcm1FbGVtZW50ICYmIGZvcm1FbGVtZW50LT5oYXNUYWdOYW1lKGZvcm1UYWcpKSB7Ci0gICAg ICAgICAgICBpZiAobV9mb3JtKQotICAgICAgICAgICAgICAgIG1fZm9ybS0+cmVtb3ZlRm9ybUVs ZW1lbnQodGhpcyk7CiAgICAgICAgICAgICBtX2Zvcm0gPSBzdGF0aWNfY2FzdDxIVE1MRm9ybUVs ZW1lbnQqPihmb3JtRWxlbWVudCk7CiAgICAgICAgICAgICBtX2Zvcm0tPnJlZ2lzdGVyRm9ybUVs ZW1lbnQodGhpcyk7CiAgICAgICAgIH0KKyAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAo IW1fZm9ybSkgewogICAgICAgICAvLyBUaGlzIGhhbmRsZXMgdGhlIGNhc2Ugb2YgYSBuZXcgZm9y bSBlbGVtZW50IGJlaW5nIGNyZWF0ZWQgYnkKQEAgLTEyMiw3ICsxMjgsNyBAQCB2b2lkIEZvcm1B c3NvY2lhdGVkRWxlbWVudDo6cmVtb3ZlRnJvbUZvcm0oKQogICAgIG1fZm9ybSA9IDA7CiB9CiAK LXZvaWQgRm9ybUFzc29jaWF0ZWRFbGVtZW50OjpyZXNldEZvcm1Pd25lcihIVE1MRm9ybUVsZW1l bnQqIGZvcm0pCit2b2lkIEZvcm1Bc3NvY2lhdGVkRWxlbWVudDo6cmVzZXRGb3JtT3duZXIoKQog ewogICAgIEhUTUxFbGVtZW50KiBlbGVtZW50ID0gdG9IVE1MRWxlbWVudCh0aGlzKTsKICAgICBj b25zdCBBdG9taWNTdHJpbmcmIGZvcm1JZChlbGVtZW50LT5mYXN0R2V0QXR0cmlidXRlKGZvcm1B dHRyKSk7CkBAIC0xNDAsOCArMTQ2LDYgQEAgdm9pZCBGb3JtQXNzb2NpYXRlZEVsZW1lbnQ6OnJl c2V0Rm9ybU93bmVyKEhUTUxGb3JtRWxlbWVudCogZm9ybSkKICAgICAgICAgRWxlbWVudCogZmly c3RFbGVtZW50ID0gZWxlbWVudC0+dHJlZVNjb3BlKCktPmdldEVsZW1lbnRCeUlkKGZvcm1JZCk7 CiAgICAgICAgIGlmIChmaXJzdEVsZW1lbnQgJiYgZmlyc3RFbGVtZW50LT5oYXNUYWdOYW1lKGZv cm1UYWcpKQogICAgICAgICAgICAgbV9mb3JtID0gc3RhdGljX2Nhc3Q8SFRNTEZvcm1FbGVtZW50 Kj4oZmlyc3RFbGVtZW50KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgbV9mb3JtID0gZm9y bTsKICAgICB9IGVsc2UKICAgICAgICAgbV9mb3JtID0gZWxlbWVudC0+ZmluZEZvcm1BbmNlc3Rv cigpOwogICAgIGlmIChtX2Zvcm0pCkBAIC0xNjAsNyArMTY0LDcgQEAgdm9pZCBGb3JtQXNzb2Np YXRlZEVsZW1lbnQ6OmZvcm1BdHRyaWJ1dGVDaGFuZ2VkKCkKICAgICAgICAgICAgIGZvcm0oKS0+ cmVnaXN0ZXJGb3JtRWxlbWVudCh0aGlzKTsKICAgICAgICAgZWxlbWVudC0+ZG9jdW1lbnQoKS0+ dW5yZWdpc3RlckZvcm1FbGVtZW50V2l0aEZvcm1BdHRyaWJ1dGUodGhpcyk7CiAgICAgfSBlbHNl Ci0gICAgICAgIHJlc2V0Rm9ybU93bmVyKDApOworICAgICAgICByZXNldEZvcm1Pd25lcigpOwog fQogCiBjb25zdCBIVE1MRWxlbWVudCogdG9IVE1MRWxlbWVudChjb25zdCBGb3JtQXNzb2NpYXRl ZEVsZW1lbnQqIGFzc29jaWF0ZWRFbGVtZW50KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aHRtbC9Gb3JtQXNzb2NpYXRlZEVsZW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvRm9ybUFz c29jaWF0ZWRFbGVtZW50LmgKaW5kZXggN2YzZTlhYzM5YzI4YTQ1Y2RhZWI4NWM0MTlhMTBiYWQw ZTQxNzFlNy4uNWE4NjFlMjcyNjFiNjc1MzhmMDBiMGYyMGEyMjJmODY1NGM0MzU0MiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9Gb3JtQXNzb2NpYXRlZEVsZW1lbnQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0Zvcm1Bc3NvY2lhdGVkRWxlbWVudC5oCkBAIC01NSw3ICs1NSw3 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdm9pZCBmb3JtRGVzdHJveWVkKCkgeyBtX2Zvcm0g PSAwOyB9CiAKLSAgICB2b2lkIHJlc2V0Rm9ybU93bmVyKEhUTUxGb3JtRWxlbWVudCopOworICAg IHZvaWQgcmVzZXRGb3JtT3duZXIoKTsKIAogcHJvdGVjdGVkOgogICAgIEZvcm1Bc3NvY2lhdGVk RWxlbWVudChIVE1MRm9ybUVsZW1lbnQqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEZvcm1FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1FbGVt ZW50LmNwcAppbmRleCA5NGIwYzYyZmY0N2MxOGE3NTdiOTliNzAzMmFhMTg5MmE1YTg3YTgwLi41 YWM1YjYzNDdiNzdlOGUxYWNlNWUwZGI4NTZjOTg1NGFmMTg3NjA5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9IVE1MRm9ybUVsZW1lbnQuY3BwCkBAIC0xMzgsNyArMTM4LDcgQEAgdm9pZCBIVE1MRm9y bUVsZW1lbnQ6Omluc2VydGVkSW50b0RvY3VtZW50KCkKICAgICBIVE1MRWxlbWVudDo6aW5zZXJ0 ZWRJbnRvRG9jdW1lbnQoKTsKIAogICAgIGlmIChoYXNJRCgpKQotICAgICAgICBkb2N1bWVudCgp LT5yZXNldEZvcm1FbGVtZW50c093bmVyKHRoaXMpOworICAgICAgICBkb2N1bWVudCgpLT5yZXNl dEZvcm1FbGVtZW50c093bmVyKCk7CiB9CiAKIHZvaWQgSFRNTEZvcm1FbGVtZW50OjpyZW1vdmVk RnJvbURvY3VtZW50KCkKQEAgLTE0OSw3ICsxNDksNyBAQCB2b2lkIEhUTUxGb3JtRWxlbWVudDo6 cmVtb3ZlZEZyb21Eb2N1bWVudCgpCiAgICAgSFRNTEVsZW1lbnQ6OnJlbW92ZWRGcm9tRG9jdW1l bnQoKTsKIAogICAgIGlmIChoYXNJRCgpKQotICAgICAgICBkb2N1bWVudCgpLT5yZXNldEZvcm1F bGVtZW50c093bmVyKDApOworICAgICAgICBkb2N1bWVudCgpLT5yZXNldEZvcm1FbGVtZW50c093 bmVyKCk7CiB9CiAKIHZvaWQgSFRNTEZvcm1FbGVtZW50OjpoYW5kbGVMb2NhbEV2ZW50cyhFdmVu dCogZXZlbnQpCg==