25031 2009-04-03 11:05:28 -0700 Chrome allows elements with names to override collection properties 2009-04-06 11:01:56 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 0 davemoore webkit-unassigned dglazkov oldest_to_newest 116450 0 davemoore 2009-04-03 11:05:28 -0700 If you have an HTMLSelectElement and it has an option that happens to be named 'length' you will get this element when accessing the length property, instead of the actual length. This also causes these accesses to be slower than they need to be. 116451 1 29233 davemoore 2009-04-03 11:09:57 -0700 Created attachment 29233 Fix This patch will only effect the chromium build, as it's in the bindings 116455 2 29233 dglazkov 2009-04-03 11:19:22 -0700 Comment on attachment 29233 Fix Don't forget bug URL in ChangeLog description. > + (WebCore::collectionNamedPropertyGetter): > + (WebCore::nodeCollectionNamedPropertyGetter): It's a good practice to add brief descriptions to each line on what's being done. > + if (!value.IsEmpty()) > + return value; 4 spaces. > + > + // Search local callback properties next to find IDL defined > + // properties. > + if (info.Holder()->HasRealNamedCallbackProperty(name)) > + return v8::Handle<v8::Value>(); 4 spaces. Also, I think this should be return notHandledbyInterceptor(). > + if (!value.IsEmpty()) > + return value; 4 spaces. > + if (info.Holder()->HasRealNamedCallbackProperty(name)) > + return v8::Handle<v8::Value>(); 4 spaces, notHandledByInterceptor() > +2009-04-03 Dave Moore <davemoore@google.com> > + > + Reviewed by NOBODY (OOPS!). Need a good description of what the tests test. > + function test() > + { > + if (window.layoutTestController) > + layoutTestController.dumpAsText(); Is this where we should put attempting to override length? > + > + var sl = document.getElementById("sl"); > + if (sl.length == 1) 116467 3 29236 davemoore 2009-04-03 12:26:22 -0700 Created attachment 29236 Fix 116474 4 29237 davemoore 2009-04-03 13:27:41 -0700 Created attachment 29237 Fix Added a new tests to ensure that JS can override the length property on the HTMLSelectElement 116480 5 29240 davemoore 2009-04-03 14:06:09 -0700 Created attachment 29240 Fix Remove test for JS setting the length property. 116482 6 29240 dglazkov 2009-04-03 14:07:43 -0700 Comment on attachment 29240 Fix looks good! 116639 7 dglazkov 2009-04-06 11:01:56 -0700 Landed as http://trac.webkit.org/changeset/42247. 29233 2009-04-03 11:09:57 -0700 2009-04-03 12:26:22 -0700 Fix 25031.patch text/plain 4939 davemoore SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjIwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDktMDQtMDMgIERhdmUgTW9vcmUgIDxkYXZlbW9vcmVAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHRoZSBWOCBlbGVtZW50IGNvbGxlY3Rpb25zIGNoZWNrIGZvciBuYW1lZCBwcm9wZXJ0aWVz ICpiZWZvcmUqCisgICAgICAgIGNoZWNraW5nIGlmIHRoZXJlIGFyZSBhbnkgZWxlbWVudHMgd2l0 aCB0aGUgc2FtZSBuYW1lLiBPdGhlcndpc2UKKyAgICAgICAgaXQgaXMgYm90aCBpbmNvcnJlY3Qg YW5kIHNsb3cuCisKKyAgICAgICAgVGVzdDogZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVu Z3RoLW5vdC1vdmVycmlkZGVuLmh0bWwKKworICAgICAgICAqIGJpbmRpbmdzL3Y4L1Y4Q29sbGVj dGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Y29sbGVjdGlvbk5hbWVkUHJvcGVydHlHZXR0ZXIp OgorICAgICAgICAoV2ViQ29yZTo6bm9kZUNvbGxlY3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKToK KwogMjAwOS0wNC0wMyAgRGFyaW4gRmlzaGVyICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9W OENvbGxlY3Rpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVj dGlvbi5oCShyZXZpc2lvbiA0MjIwMikKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvVjhDb2xsZWN0 aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYgKzcxLDE1IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAvLyBBIHRlbXBsYXRlIG9mIG5hbWVkIHByb3BlcnR5IGFjY2Vzc29yIG9mIGNvbGxl Y3Rpb25zLgogICAgIHRlbXBsYXRlPGNsYXNzIENvbGxlY3Rpb24sIGNsYXNzIEl0ZW1UeXBlPiBz dGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNvbGxlY3Rpb25OYW1lZFByb3BlcnR5R2V0dGVy KHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBjb25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZv KQogICAgIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlID0gaW5mby5Ib2xk ZXIoKS0+R2V0UmVhbE5hbWVkUHJvcGVydHlJblByb3RvdHlwZUNoYWluKG5hbWUpOworCisgICAg ICAgIGlmICghdmFsdWUuSXNFbXB0eSgpKQorICAgICAgICAgIHJldHVybiB2YWx1ZTsKKworICAg ICAgICAvLyBTZWFyY2ggbG9jYWwgY2FsbGJhY2sgcHJvcGVydGllcyBuZXh0IHRvIGZpbmQgSURM IGRlZmluZWQKKyAgICAgICAgLy8gcHJvcGVydGllcy4KKyAgICAgICAgaWYgKGluZm8uSG9sZGVy KCktPkhhc1JlYWxOYW1lZENhbGxiYWNrUHJvcGVydHkobmFtZSkpCisgICAgICAgICAgcmV0dXJu IHY4OjpIYW5kbGU8djg6OlZhbHVlPigpOwogICAgICAgICByZXR1cm4gZ2V0TmFtZWRQcm9wZXJ0 eU9mQ29sbGVjdGlvbjxDb2xsZWN0aW9uLCBJdGVtVHlwZT4obmFtZSwgaW5mby5Ib2xkZXIoKSwg aW5mby5EYXRhKCkpOwogICAgIH0KIApAQCAtNzksNiArODgsMTUgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogICAgIHsKICAgICAgICAgQVNTRVJUKFY4UHJveHk6Ok1heWJlRE9NV3JhcHBlcihpbmZv LkhvbGRlcigpKSk7CiAgICAgICAgIEFTU0VSVChWOFByb3h5OjpHZXRET01XcmFwcGVyVHlwZShp bmZvLkhvbGRlcigpKSA9PSBWOENsYXNzSW5kZXg6Ok5PREUpOworICAgICAgICB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gdmFsdWUgPSBpbmZvLkhvbGRlcigpLT5HZXRSZWFsTmFtZWRQcm9wZXJ0eUlu UHJvdG90eXBlQ2hhaW4obmFtZSk7CisKKyAgICAgICAgaWYgKCF2YWx1ZS5Jc0VtcHR5KCkpCisg ICAgICAgICAgcmV0dXJuIHZhbHVlOworCisgICAgICAgIC8vIFNlYXJjaCBsb2NhbCBjYWxsYmFj ayBwcm9wZXJ0aWVzIG5leHQgdG8gZmluZCBJREwgZGVmaW5lZAorICAgICAgICAvLyBwcm9wZXJ0 aWVzLgorICAgICAgICBpZiAoaW5mby5Ib2xkZXIoKS0+SGFzUmVhbE5hbWVkQ2FsbGJhY2tQcm9w ZXJ0eShuYW1lKSkKKyAgICAgICAgICByZXR1cm4gdjg6OkhhbmRsZTx2ODo6VmFsdWU+KCk7CiAg ICAgICAgIENvbGxlY3Rpb24qIGNvbGxlY3Rpb24gPSBWOFByb3h5OjpET01XcmFwcGVyVG9Ob2Rl PENvbGxlY3Rpb24+KGluZm8uSG9sZGVyKCkpOwogICAgICAgICBTdHJpbmcgcHJvcGVydHlOYW1l ID0gdG9XZWJDb3JlU3RyaW5nKG5hbWUpOwogICAgICAgICB2b2lkKiBpbXBsZW1lbnRhdGlvbiA9 IGNvbGxlY3Rpb24tPm5hbWVkSXRlbShwcm9wZXJ0eU5hbWUpOwpJbmRleDogTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24g NDIyMDIpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMCBAQAorMjAwOS0wNC0wMyAgRGF2ZSBNb29yZSAgPGRhdmVtb29yZUBnb29nbGUuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9k b20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1v dmVycmlkZGVuLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1v bi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4K SW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qt b3ZlcnJpZGRlbi1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9k b20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dAko cmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xl bmd0aC1ub3Qtb3ZlcnJpZGRlbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEs NCBAQAorVGhpcyB0ZXN0cyB0aGF0IHRoZSBsZW5ndGggcHJvcGVydHkgaXMgbm90IG92ZXJyaWRl biBieSBoYXZpbmcgYW4gb3B0aW9uIHdpdGggdGhlIG5hbWUgJ2xlbmd0aCcuCisKK1NlbGVjdCBF bGVtZW50IFRlc3QgUGFzc2VkCitPcHRpb25zIENvbGxlY3Rpb24gVGVzdCBQYXNzZWQKSW5kZXg6 IExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJp ZGRlbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RF bGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0 VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0 bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsMzIgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAg ICAgICA8c2NyaXB0PgorICAgICAgICAgICAgZnVuY3Rpb24gbG9nKG1zZykKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1zZyArICdcbicpKTsKKyAgICAgICAg ICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgICAgICB7CisgICAg ICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAg ICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgICAg ICAgICAgdmFyIHNsID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNsIik7CisgICAgICAgICAg ICAgICAgaWYgKHNsLmxlbmd0aCA9PSAxKQorICAgICAgICAgICAgICAgICAgICBsb2coIlNlbGVj dCBFbGVtZW50IFRlc3QgUGFzc2VkIik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAg ICAgICAgICAgICBsb2coIlNlbGVjdCBFbGVtZW50IFRlc3QgRmFpbGVkIik7CisKKyAgICAgICAg ICAgICAgICBpZiAoc2wub3B0aW9ucy5sZW5ndGggPT0gMSkKKyAgICAgICAgICAgICAgICAgICAg bG9nKCJPcHRpb25zIENvbGxlY3Rpb24gVGVzdCBQYXNzZWQiKTsKKyAgICAgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgICAgIGxvZygiT3B0aW9ucyBDb2xsZWN0aW9uIFRlc3QgRmFp bGVkIik7CisgICAgICAgICAgICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAg ICA8Ym9keSBvbmxvYWQ9InRlc3QoKSI+CisgICAgICAgIFRoaXMgdGVzdHMgdGhhdCB0aGUgbGVu Z3RoIHByb3BlcnR5IGlzIG5vdCBvdmVycmlkZW4gYnkgaGF2aW5nIGFuIG9wdGlvbiB3aXRoIHRo ZSBuYW1lICdsZW5ndGgnLjxicj4KKyAgICAgICAgPHNlbGVjdCBpZD0ic2wiPjxvcHRpb24gdmFs dWU9Ikxlbmd0aCIgbmFtZT0ibGVuZ3RoIiAvPjwvc2VsZWN0PgorICAgICAgICA8cHJlIGlkPSJj b25zb2xlIj48L3ByZT4KKyAgICA8L2JvZHk+Cis8L2h0bWw+Cg== 29236 2009-04-03 12:26:22 -0700 2009-04-03 13:28:57 -0700 Fix 25031.patch text/plain 5206 davemoore SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjIwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDQtMDMgIERhdmUgTW9vcmUgIDxkYXZlbW9vcmVAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHRoZSBWOCBlbGVtZW50IGNvbGxlY3Rpb25zIGNoZWNrIGZvciBuYW1lZCBwcm9wZXJ0aWVz ICpiZWZvcmUqCisgICAgICAgIGNoZWNraW5nIGlmIHRoZXJlIGFyZSBhbnkgZWxlbWVudHMgd2l0 aCB0aGUgc2FtZSBuYW1lLiBPdGhlcndpc2UKKyAgICAgICAgaXQgaXMgYm90aCBpbmNvcnJlY3Qg YW5kIHNsb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNTAzMQorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0 aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCisKKyAgICAgICAgQm90aCBvZiB0aGVzZSBpbnRlcmNlcHRv cnMgd2VyZSBhdHRlbXB0aW5nIHRvIGZpbmQgYW4gZWxlbWVudCBpbiB0aGUKKyAgICAgICAgY29s bGVjdGlvbiB0aGF0IGhhZCBhIG5hbWUgb3IgaWQgb2YgdGhlIHByb3BlcnR5IG5hbWUgYmVmb3Jl IGNoZWNraW5nCisgICAgICAgIGZvciBhIEpTIHByb3BlcnR5IHdpdGggdGhhdCBuYW1lLgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Y29s bGVjdGlvbk5hbWVkUHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bm9kZUNvbGxl Y3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKToKKwogMjAwOS0wNC0wMyAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCShyZXZpc2lvbiA0MjIwNykKKysrIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYg KzcxLDE1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBBIHRlbXBsYXRlIG9mIG5hbWVk IHByb3BlcnR5IGFjY2Vzc29yIG9mIGNvbGxlY3Rpb25zLgogICAgIHRlbXBsYXRlPGNsYXNzIENv bGxlY3Rpb24sIGNsYXNzIEl0ZW1UeXBlPiBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNv bGxlY3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogICAgIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHZhbHVlID0gaW5mby5Ib2xkZXIoKS0+R2V0UmVhbE5hbWVkUHJvcGVydHlJblBy b3RvdHlwZUNoYWluKG5hbWUpOworCisgICAgICAgIGlmICghdmFsdWUuSXNFbXB0eSgpKQorICAg ICAgICAgICAgcmV0dXJuIHZhbHVlOworCisgICAgICAgIC8vIFNlYXJjaCBsb2NhbCBjYWxsYmFj ayBwcm9wZXJ0aWVzIG5leHQgdG8gZmluZCBJREwgZGVmaW5lZAorICAgICAgICAvLyBwcm9wZXJ0 aWVzLgorICAgICAgICBpZiAoaW5mby5Ib2xkZXIoKS0+SGFzUmVhbE5hbWVkQ2FsbGJhY2tQcm9w ZXJ0eShuYW1lKSkKKyAgICAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigp OwogICAgICAgICByZXR1cm4gZ2V0TmFtZWRQcm9wZXJ0eU9mQ29sbGVjdGlvbjxDb2xsZWN0aW9u LCBJdGVtVHlwZT4obmFtZSwgaW5mby5Ib2xkZXIoKSwgaW5mby5EYXRhKCkpOwogICAgIH0KIApA QCAtNzksNiArODgsMTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHsKICAgICAgICAgQVNT RVJUKFY4UHJveHk6Ok1heWJlRE9NV3JhcHBlcihpbmZvLkhvbGRlcigpKSk7CiAgICAgICAgIEFT U0VSVChWOFByb3h5OjpHZXRET01XcmFwcGVyVHlwZShpbmZvLkhvbGRlcigpKSA9PSBWOENsYXNz SW5kZXg6Ok5PREUpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUgPSBpbmZv LkhvbGRlcigpLT5HZXRSZWFsTmFtZWRQcm9wZXJ0eUluUHJvdG90eXBlQ2hhaW4obmFtZSk7CisK KyAgICAgICAgaWYgKCF2YWx1ZS5Jc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7 CisKKyAgICAgICAgLy8gU2VhcmNoIGxvY2FsIGNhbGxiYWNrIHByb3BlcnRpZXMgbmV4dCB0byBm aW5kIElETCBkZWZpbmVkCisgICAgICAgIC8vIHByb3BlcnRpZXMuCisgICAgICAgIGlmIChpbmZv LkhvbGRlcigpLT5IYXNSZWFsTmFtZWRDYWxsYmFja1Byb3BlcnR5KG5hbWUpKQorICAgICAgICAg ICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgICAgIENvbGxlY3Rpb24q IGNvbGxlY3Rpb24gPSBWOFByb3h5OjpET01XcmFwcGVyVG9Ob2RlPENvbGxlY3Rpb24+KGluZm8u SG9sZGVyKCkpOwogICAgICAgICBTdHJpbmcgcHJvcGVydHlOYW1lID0gdG9XZWJDb3JlU3RyaW5n KG5hbWUpOwogICAgICAgICB2b2lkKiBpbXBsZW1lbnRhdGlvbiA9IGNvbGxlY3Rpb24tPm5hbWVk SXRlbShwcm9wZXJ0eU5hbWUpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDIyMDIpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMCBAQAorMjAwOS0wNC0w MyAgRGF2ZSBNb29yZSAgPGRhdmVtb29yZUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1l bnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0bWw6IEFk ZGVkLgorCiAyMDA5LTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4KSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRlbi1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1l bnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRl bi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNCBAQAorVGhpcyB0ZXN0cyB0 aGF0IHRoZSBsZW5ndGggcHJvcGVydHkgaXMgbm90IG92ZXJyaWRlbiBieSBoYXZpbmcgYW4gb3B0 aW9uIHdpdGggdGhlIG5hbWUgJ2xlbmd0aCcuCisKK1NlbGVjdCBFbGVtZW50IFRlc3QgUGFzc2Vk CitPcHRpb25zIENvbGxlY3Rpb24gVGVzdCBQYXNzZWQKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv ZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qt b3ZlcnJpZGRlbi5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRN TFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0bWwJKHJldmlzaW9uIDApCkBA IC0wLDAgKzEsMzIgQEAKKzxodG1sPgorICAgIDxoZWFkPgorICAgICAgICA8c2NyaXB0PgorICAg ICAgICAgICAgZnVuY3Rpb24gbG9nKG1zZykKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29uc29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50 LmNyZWF0ZVRleHROb2RlKG1zZyArICdcbicpKTsKKyAgICAgICAgICAgIH0KKworICAgICAgICAg ICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgICAgICAgICAgbGF5b3V0VGVz dENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgICAgICAgICAgdmFyIHNsID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNsIik7CisgICAgICAgICAgICAgICAgaWYgKHNsLmxlbmd0 aCA9PSAxKQorICAgICAgICAgICAgICAgICAgICBsb2coIlNlbGVjdCBFbGVtZW50IFRlc3QgUGFz c2VkIik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICBsb2coIlNl bGVjdCBFbGVtZW50IFRlc3QgRmFpbGVkIik7CisKKyAgICAgICAgICAgICAgICBpZiAoc2wub3B0 aW9ucy5sZW5ndGggPT0gMSkKKyAgICAgICAgICAgICAgICAgICAgbG9nKCJPcHRpb25zIENvbGxl Y3Rpb24gVGVzdCBQYXNzZWQiKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAg ICAgICAgIGxvZygiT3B0aW9ucyBDb2xsZWN0aW9uIFRlc3QgRmFpbGVkIik7CisgICAgICAgICAg ICB9CisgICAgICAgIDwvc2NyaXB0PgorICAgIDwvaGVhZD4KKyAgICA8Ym9keSBvbmxvYWQ9InRl c3QoKSI+CisgICAgICAgIFRoaXMgdGVzdHMgdGhhdCB0aGUgbGVuZ3RoIHByb3BlcnR5IGlzIG5v dCBvdmVycmlkZW4gYnkgaGF2aW5nIGFuIG9wdGlvbiB3aXRoIHRoZSBuYW1lICdsZW5ndGgnLjxi cj4KKyAgICAgICAgPHNlbGVjdCBpZD0ic2wiPjxvcHRpb24gdmFsdWU9Ikxlbmd0aCIgbmFtZT0i bGVuZ3RoIiAvPjwvc2VsZWN0PgorICAgICAgICA8cHJlIGlkPSJjb25zb2xlIj48L3ByZT4KKyAg ICA8L2JvZHk+Cis8L2h0bWw+Cg== 29237 2009-04-03 13:27:41 -0700 2009-04-03 14:06:09 -0700 Fix 25031.patch text/plain 6334 davemoore SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjIwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDQtMDMgIERhdmUgTW9vcmUgIDxkYXZlbW9vcmVAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHRoZSBWOCBlbGVtZW50IGNvbGxlY3Rpb25zIGNoZWNrIGZvciBuYW1lZCBwcm9wZXJ0aWVz ICpiZWZvcmUqCisgICAgICAgIGNoZWNraW5nIGlmIHRoZXJlIGFyZSBhbnkgZWxlbWVudHMgd2l0 aCB0aGUgc2FtZSBuYW1lLiBPdGhlcndpc2UKKyAgICAgICAgaXQgaXMgYm90aCBpbmNvcnJlY3Qg YW5kIHNsb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNTAzMQorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0 aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCisKKyAgICAgICAgQm90aCBvZiB0aGVzZSBpbnRlcmNlcHRv cnMgd2VyZSBhdHRlbXB0aW5nIHRvIGZpbmQgYW4gZWxlbWVudCBpbiB0aGUKKyAgICAgICAgY29s bGVjdGlvbiB0aGF0IGhhZCBhIG5hbWUgb3IgaWQgb2YgdGhlIHByb3BlcnR5IG5hbWUgYmVmb3Jl IGNoZWNraW5nCisgICAgICAgIGZvciBhIEpTIHByb3BlcnR5IHdpdGggdGhhdCBuYW1lLgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Y29s bGVjdGlvbk5hbWVkUHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bm9kZUNvbGxl Y3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKToKKwogMjAwOS0wNC0wMyAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCShyZXZpc2lvbiA0MjIwNykKKysrIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYg KzcxLDE1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBBIHRlbXBsYXRlIG9mIG5hbWVk IHByb3BlcnR5IGFjY2Vzc29yIG9mIGNvbGxlY3Rpb25zLgogICAgIHRlbXBsYXRlPGNsYXNzIENv bGxlY3Rpb24sIGNsYXNzIEl0ZW1UeXBlPiBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNv bGxlY3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogICAgIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHZhbHVlID0gaW5mby5Ib2xkZXIoKS0+R2V0UmVhbE5hbWVkUHJvcGVydHlJblBy b3RvdHlwZUNoYWluKG5hbWUpOworCisgICAgICAgIGlmICghdmFsdWUuSXNFbXB0eSgpKQorICAg ICAgICAgICAgcmV0dXJuIHZhbHVlOworCisgICAgICAgIC8vIFNlYXJjaCBsb2NhbCBjYWxsYmFj ayBwcm9wZXJ0aWVzIG5leHQgdG8gZmluZCBJREwgZGVmaW5lZAorICAgICAgICAvLyBwcm9wZXJ0 aWVzLgorICAgICAgICBpZiAoaW5mby5Ib2xkZXIoKS0+SGFzUmVhbE5hbWVkQ2FsbGJhY2tQcm9w ZXJ0eShuYW1lKSkKKyAgICAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigp OwogICAgICAgICByZXR1cm4gZ2V0TmFtZWRQcm9wZXJ0eU9mQ29sbGVjdGlvbjxDb2xsZWN0aW9u LCBJdGVtVHlwZT4obmFtZSwgaW5mby5Ib2xkZXIoKSwgaW5mby5EYXRhKCkpOwogICAgIH0KIApA QCAtNzksNiArODgsMTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHsKICAgICAgICAgQVNT RVJUKFY4UHJveHk6Ok1heWJlRE9NV3JhcHBlcihpbmZvLkhvbGRlcigpKSk7CiAgICAgICAgIEFT U0VSVChWOFByb3h5OjpHZXRET01XcmFwcGVyVHlwZShpbmZvLkhvbGRlcigpKSA9PSBWOENsYXNz SW5kZXg6Ok5PREUpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUgPSBpbmZv LkhvbGRlcigpLT5HZXRSZWFsTmFtZWRQcm9wZXJ0eUluUHJvdG90eXBlQ2hhaW4obmFtZSk7CisK KyAgICAgICAgaWYgKCF2YWx1ZS5Jc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7 CisKKyAgICAgICAgLy8gU2VhcmNoIGxvY2FsIGNhbGxiYWNrIHByb3BlcnRpZXMgbmV4dCB0byBm aW5kIElETCBkZWZpbmVkCisgICAgICAgIC8vIHByb3BlcnRpZXMuCisgICAgICAgIGlmIChpbmZv LkhvbGRlcigpLT5IYXNSZWFsTmFtZWRDYWxsYmFja1Byb3BlcnR5KG5hbWUpKQorICAgICAgICAg ICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgICAgIENvbGxlY3Rpb24q IGNvbGxlY3Rpb24gPSBWOFByb3h5OjpET01XcmFwcGVyVG9Ob2RlPENvbGxlY3Rpb24+KGluZm8u SG9sZGVyKCkpOwogICAgICAgICBTdHJpbmcgcHJvcGVydHlOYW1lID0gdG9XZWJDb3JlU3RyaW5n KG5hbWUpOwogICAgICAgICB2b2lkKiBpbXBsZW1lbnRhdGlvbiA9IGNvbGxlY3Rpb24tPm5hbWVk SXRlbShwcm9wZXJ0eU5hbWUpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDIyMDIpCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMCBAQAorMjAwOS0wNC0w MyAgRGF2ZSBNb29yZSAgPGRhdmVtb29yZUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1l bnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0bWw6IEFk ZGVkLgorCiAyMDA5LTA0LTAyICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4KSW5kZXg6IExheW91dFRlc3Rz L2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRlbi1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1l bnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKKysrIExh eW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRl bi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNiBAQAorVGhpcyB0ZXN0cyB0 aGF0IHRoZSBsZW5ndGggcHJvcGVydHkgaXMgbm90IG92ZXJyaWRlbiBieSBoYXZpbmcgYW4gb3B0 aW9uIHdpdGggdGhlIG5hbWUgJ2xlbmd0aCcsIGJ1dCB0aGF0IGl0IGNhbiBiZSBzZXQgZXhwbGlj aXRseS4KKworU2VsZWN0IEVsZW1lbnQgVGVzdCBQYXNzZWQKK09wdGlvbnMgQ29sbGVjdGlvbiBU ZXN0IFBhc3NlZAorU2VsZWN0IEVsZW1lbnQgT3ZlcnJpZGUgVGVzdCBQYXNzZWQKK09wdGlvbnMg Q29sbGVjdGlvbiBPdmVycmlkZSBUZXN0IFBhc3NlZApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZp bGUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0aC1u b3Qtb3ZlcnJpZGRlbi5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3QvZG9tL0hU TUxTZWxlY3RFbGVtZW50L2xlbmd0aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVy cmlkZGVuLmh0bWwJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTEgQEAKKzxodG1sPgorICAgIDxo ZWFkPgorICAgICAgICA8c2NyaXB0PgorICAgICAgICAgICAgZnVuY3Rpb24gbG9nKG1zZykKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29u c29sZScpLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKG1zZyArICdcbicpKTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gdGVzdCgpCisgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAg ICAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworCisg ICAgICAgICAgICAgICAgdmFyIHNsID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNsIik7CisK KyAgICAgICAgICAgICAgICAvLyBUaGlzIGNoZWNrcyB0aGF0IHRoZSBzZWxlY3QgZWxlbWVudCdz IGxlbmd0aCBwcm9wZXJ0eSBpcyBzdGlsbCAnMScsCisgICAgICAgICAgICAgICAgLy8gZXZlbiB0 aG91Z2ggdGhlcmUgaXMgYW4gb3B0aW9uIHdpdGggdGhlIHNhbWUgbmFtZQorICAgICAgICAgICAg ICAgIGlmIChzbC5sZW5ndGggPT0gMSkKKyAgICAgICAgICAgICAgICAgICAgbG9nKCJTZWxlY3Qg RWxlbWVudCBUZXN0IFBhc3NlZCIpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgbG9nKCJTZWxlY3QgRWxlbWVudCBUZXN0IEZhaWxlZCIpOworCisgICAgICAgICAg ICAgICAgLy8gVGhpcyBjaGVja3MgdGhhdCB0aGUgb3B0aW9uIGNvbGxlY3Rpb24ncyBsZW5ndGgg cHJvcGVydHkgaXMgc3RpbGwgJzEnLAorICAgICAgICAgICAgICAgIC8vIGV2ZW4gdGhvdWdoIHRo ZXJlIGlzIGFuIG9wdGlvbiB3aXRoIHRoZSBzYW1lIG5hbWUKKyAgICAgICAgICAgICAgICBpZiAo c2wub3B0aW9ucy5sZW5ndGggPT0gMSkKKyAgICAgICAgICAgICAgICAgICAgbG9nKCJPcHRpb25z IENvbGxlY3Rpb24gVGVzdCBQYXNzZWQiKTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAg ICAgICAgICAgICAgIGxvZygiT3B0aW9ucyBDb2xsZWN0aW9uIFRlc3QgRmFpbGVkIik7CisKKyAg ICAgICAgICAgICAgICBzbC5sZW5ndGggPSA1OworCisgICAgICAgICAgICAgICAgLy8gVGhpcyBj aGVja3MgdGhhdCB0aGUgc2VsZWN0IGVsZW1lbnQncyBsZW5ndGggcHJvcGVydHkgaGFzIGJlZW4g Y2hhbmdlZCB0byAnNScKKyAgICAgICAgICAgICAgICBpZiAoc2wubGVuZ3RoID09IDUpCisgICAg ICAgICAgICAgICAgICAgIGxvZygiU2VsZWN0IEVsZW1lbnQgT3ZlcnJpZGUgVGVzdCBQYXNzZWQi KTsKKyAgICAgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIGxvZygiU2VsZWN0 IEVsZW1lbnQgT3ZlcnJpZGUgVGVzdCBGYWlsZWQiKTsKKworICAgICAgICAgICAgICAgIC8vIFRo aXMgY2hlY2tzIHRoYXQgdGhlIG9wdGlvbiBjb2xsZWN0aW9uJ3MgbGVuZ3RoIHByb3BlcnR5IGhh cyBiZWVuIGNoYW5nZWQgdG8gJzUnCisgICAgICAgICAgICAgICAgaWYgKHNsLm9wdGlvbnMubGVu Z3RoID09IDUpCisgICAgICAgICAgICAgICAgICAgIGxvZygiT3B0aW9ucyBDb2xsZWN0aW9uIE92 ZXJyaWRlIFRlc3QgUGFzc2VkIik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgICAgICBsb2coIk9wdGlvbnMgQ29sbGVjdGlvbiBPdmVycmlkZSBUZXN0IEZhaWxlZCIpOwor ICAgICAgICAgICAgfQorICAgICAgICA8L3NjcmlwdD4KKyAgICA8L2hlYWQ+CisgICAgPGJvZHkg b25sb2FkPSJ0ZXN0KCkiPgorICAgICAgICBUaGlzIHRlc3RzIHRoYXQgdGhlIGxlbmd0aCBwcm9w ZXJ0eSBpcyBub3Qgb3ZlcnJpZGVuIGJ5IGhhdmluZyBhbiBvcHRpb24gd2l0aCB0aGUgbmFtZSAn bGVuZ3RoJywgYnV0IHRoYXQgaXQgY2FuIGJlIHNldCBleHBsaWNpdGx5Ljxicj4KKyAgICAgICAg PHNlbGVjdCBpZD0ic2wiPjxvcHRpb24gdmFsdWU9Ikxlbmd0aCIgbmFtZT0ibGVuZ3RoIiAvPjwv c2VsZWN0PgorICAgICAgICA8cHJlIGlkPSJjb25zb2xlIj48L3ByZT4KKyAgICA8L2JvZHk+Cis8 L2h0bWw+Cg== 29240 2009-04-03 14:06:09 -0700 2009-04-03 14:07:43 -0700 Fix 25031.patch text/plain 5718 davemoore SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjIwMikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMDktMDQtMDMgIERhdmUgTW9vcmUgIDxkYXZlbW9vcmVAZ29vZ2xl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWtlIHRoZSBWOCBlbGVtZW50IGNvbGxlY3Rpb25zIGNoZWNrIGZvciBuYW1lZCBwcm9wZXJ0aWVz ICpiZWZvcmUqCisgICAgICAgIGNoZWNraW5nIGlmIHRoZXJlIGFyZSBhbnkgZWxlbWVudHMgd2l0 aCB0aGUgc2FtZSBuYW1lLiBPdGhlcndpc2UKKyAgICAgICAgaXQgaXMgYm90aCBpbmNvcnJlY3Qg YW5kIHNsb3cuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNTAzMQorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL0hUTUxTZWxlY3RFbGVtZW50L2xlbmd0 aC1ub3Qtb3ZlcnJpZGRlbi5odG1sCisKKyAgICAgICAgQm90aCBvZiB0aGVzZSBpbnRlcmNlcHRv cnMgd2VyZSBhdHRlbXB0aW5nIHRvIGZpbmQgYW4gZWxlbWVudCBpbiB0aGUKKyAgICAgICAgY29s bGVjdGlvbiB0aGF0IGhhZCBhIG5hbWUgb3IgaWQgb2YgdGhlIHByb3BlcnR5IG5hbWUgYmVmb3Jl IGNoZWNraW5nCisgICAgICAgIGZvciBhIEpTIHByb3BlcnR5IHdpdGggdGhhdCBuYW1lLgorICAg ICAgICAqIGJpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oOgorICAgICAgICAoV2ViQ29yZTo6Y29s bGVjdGlvbk5hbWVkUHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6bm9kZUNvbGxl Y3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKToKKwogMjAwOS0wNC0wMyAgRGFyaW4gRmlzaGVyICA8 ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCShyZXZpc2lvbiA0MjIwNykKKysrIFdl YkNvcmUvYmluZGluZ3MvdjgvVjhDb2xsZWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTcxLDYg KzcxLDE1IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAvLyBBIHRlbXBsYXRlIG9mIG5hbWVk IHByb3BlcnR5IGFjY2Vzc29yIG9mIGNvbGxlY3Rpb25zLgogICAgIHRlbXBsYXRlPGNsYXNzIENv bGxlY3Rpb24sIGNsYXNzIEl0ZW1UeXBlPiBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGNv bGxlY3Rpb25OYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lLCBj b25zdCB2ODo6QWNjZXNzb3JJbmZvJiBpbmZvKQogICAgIHsKKyAgICAgICAgdjg6OkhhbmRsZTx2 ODo6VmFsdWU+IHZhbHVlID0gaW5mby5Ib2xkZXIoKS0+R2V0UmVhbE5hbWVkUHJvcGVydHlJblBy b3RvdHlwZUNoYWluKG5hbWUpOworCisgICAgICAgIGlmICghdmFsdWUuSXNFbXB0eSgpKQorICAg ICAgICAgICAgcmV0dXJuIHZhbHVlOworCisgICAgICAgIC8vIFNlYXJjaCBsb2NhbCBjYWxsYmFj ayBwcm9wZXJ0aWVzIG5leHQgdG8gZmluZCBJREwgZGVmaW5lZAorICAgICAgICAvLyBwcm9wZXJ0 aWVzLgorICAgICAgICBpZiAoaW5mby5Ib2xkZXIoKS0+SGFzUmVhbE5hbWVkQ2FsbGJhY2tQcm9w ZXJ0eShuYW1lKSkKKyAgICAgICAgICAgIHJldHVybiBub3RIYW5kbGVkQnlJbnRlcmNlcHRvcigp OwogICAgICAgICByZXR1cm4gZ2V0TmFtZWRQcm9wZXJ0eU9mQ29sbGVjdGlvbjxDb2xsZWN0aW9u LCBJdGVtVHlwZT4obmFtZSwgaW5mby5Ib2xkZXIoKSwgaW5mby5EYXRhKCkpOwogICAgIH0KIApA QCAtNzksNiArODgsMTUgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHsKICAgICAgICAgQVNT RVJUKFY4UHJveHk6Ok1heWJlRE9NV3JhcHBlcihpbmZvLkhvbGRlcigpKSk7CiAgICAgICAgIEFT U0VSVChWOFByb3h5OjpHZXRET01XcmFwcGVyVHlwZShpbmZvLkhvbGRlcigpKSA9PSBWOENsYXNz SW5kZXg6Ok5PREUpOworICAgICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUgPSBpbmZv LkhvbGRlcigpLT5HZXRSZWFsTmFtZWRQcm9wZXJ0eUluUHJvdG90eXBlQ2hhaW4obmFtZSk7CisK KyAgICAgICAgaWYgKCF2YWx1ZS5Jc0VtcHR5KCkpCisgICAgICAgICAgICByZXR1cm4gdmFsdWU7 CisKKyAgICAgICAgLy8gU2VhcmNoIGxvY2FsIGNhbGxiYWNrIHByb3BlcnRpZXMgbmV4dCB0byBm aW5kIElETCBkZWZpbmVkCisgICAgICAgIC8vIHByb3BlcnRpZXMuCisgICAgICAgIGlmIChpbmZv LkhvbGRlcigpLT5IYXNSZWFsTmFtZWRDYWxsYmFja1Byb3BlcnR5KG5hbWUpKQorICAgICAgICAg ICAgcmV0dXJuIG5vdEhhbmRsZWRCeUludGVyY2VwdG9yKCk7CiAgICAgICAgIENvbGxlY3Rpb24q IGNvbGxlY3Rpb24gPSBWOFByb3h5OjpET01XcmFwcGVyVG9Ob2RlPENvbGxlY3Rpb24+KGluZm8u SG9sZGVyKCkpOwogICAgICAgICBTdHJpbmcgcHJvcGVydHlOYW1lID0gdG9XZWJDb3JlU3RyaW5n KG5hbWUpOwogICAgICAgICB2b2lkKiBpbXBsZW1lbnRhdGlvbiA9IGNvbGxlY3Rpb24tPm5hbWVk SXRlbShwcm9wZXJ0eU5hbWUpOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNDIyMTApCisrKyBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0wNC0w MyAgRGF2ZSBNb29yZSAgPGRhdmVtb29yZUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjUwMzEKKworICAgICAgICBUZXN0IGZvciBlbnN1cmluZyB0aGF0IG5hbWVk IGVsZW1lbnRzIGRvbid0IG92ZXJyaWRlIHByb3BlcnRpZXMgb24gY29sbGVjdGlvbnMKKyAgICAg ICAgCisgICAgICAgICogZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVy cmlkZGVuLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9kb20vSFRNTFNlbGVj dEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0bWw6IEFkZGVkLgorCiAyMDA5LTA0LTAz ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0 ZSBleHBlY3RlZCByZXN1bHQgZHVlIHRvIHJvdW5kaW5nIGRpZmZlcmVuY2UgYWZ0ZXIgcjQyMjA3 LgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5v dC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0 L2RvbS9IVE1MU2VsZWN0RWxlbWVudC9sZW5ndGgtbm90LW92ZXJyaWRkZW4tZXhwZWN0ZWQudHh0 CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQv bGVuZ3RoLW5vdC1vdmVycmlkZGVuLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCAr MSw0IEBACitUaGlzIHRlc3RzIHRoYXQgdGhlIGxlbmd0aCBwcm9wZXJ0eSBpcyBub3Qgb3ZlcnJp ZGVuIGJ5IGhhdmluZyBhbiBvcHRpb24gd2l0aCB0aGUgbmFtZSAnbGVuZ3RoJy4KKworU2VsZWN0 IEVsZW1lbnQgVGVzdCBQYXNzZWQKK09wdGlvbnMgQ29sbGVjdGlvbiBUZXN0IFBhc3NlZApJbmRl eDogTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVjdEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVy cmlkZGVuLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vSFRNTFNlbGVj dEVsZW1lbnQvbGVuZ3RoLW5vdC1vdmVycmlkZGVuLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9mYXN0L2RvbS9IVE1MU2VsZWN0RWxlbWVudC9sZW5ndGgtbm90LW92ZXJyaWRkZW4u aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNyBAQAorPGh0bWw+CisgICAgPGhlYWQ+Cisg ICAgICAgIDxzY3JpcHQ+CisgICAgICAgICAgICBmdW5jdGlvbiBsb2cobXNnKQorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb25zb2xlJyku YXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUobXNnICsgJ1xuJykpOworICAgICAg ICAgICAgfQorCisgICAgICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKKyAgICAgICAgICAgIHsKKyAg ICAgICAgICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAg ICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisKKyAgICAgICAg ICAgICAgICB2YXIgc2wgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgic2wiKTsKKworICAgICAg ICAgICAgICAgIC8vIFRoaXMgY2hlY2tzIHRoYXQgdGhlIHNlbGVjdCBlbGVtZW50J3MgbGVuZ3Ro IHByb3BlcnR5IGlzIHN0aWxsICcxJywKKyAgICAgICAgICAgICAgICAvLyBldmVuIHRob3VnaCB0 aGVyZSBpcyBhbiBvcHRpb24gd2l0aCB0aGUgc2FtZSBuYW1lCisgICAgICAgICAgICAgICAgaWYg KHNsLmxlbmd0aCA9PSAxKQorICAgICAgICAgICAgICAgICAgICBsb2coIlNlbGVjdCBFbGVtZW50 IFRlc3QgUGFzc2VkIik7CisgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAg ICBsb2coIlNlbGVjdCBFbGVtZW50IFRlc3QgRmFpbGVkIik7CisKKyAgICAgICAgICAgICAgICAv LyBUaGlzIGNoZWNrcyB0aGF0IHRoZSBvcHRpb24gY29sbGVjdGlvbidzIGxlbmd0aCBwcm9wZXJ0 eSBpcyBzdGlsbCAnMScsCisgICAgICAgICAgICAgICAgLy8gZXZlbiB0aG91Z2ggdGhlcmUgaXMg YW4gb3B0aW9uIHdpdGggdGhlIHNhbWUgbmFtZQorICAgICAgICAgICAgICAgIGlmIChzbC5vcHRp b25zLmxlbmd0aCA9PSAxKQorICAgICAgICAgICAgICAgICAgICBsb2coIk9wdGlvbnMgQ29sbGVj dGlvbiBUZXN0IFBhc3NlZCIpOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgbG9nKCJPcHRpb25zIENvbGxlY3Rpb24gVGVzdCBGYWlsZWQiKTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgPC9zY3JpcHQ+CisgICAgPC9oZWFkPgorICAgIDxib2R5IG9ubG9hZD0idGVz dCgpIj4KKyAgICAgICAgVGhpcyB0ZXN0cyB0aGF0IHRoZSBsZW5ndGggcHJvcGVydHkgaXMgbm90 IG92ZXJyaWRlbiBieSBoYXZpbmcgYW4gb3B0aW9uIHdpdGggdGhlIG5hbWUgJ2xlbmd0aCcuPGJy PgorICAgICAgICA8c2VsZWN0IGlkPSJzbCI+PG9wdGlvbiB2YWx1ZT0iTGVuZ3RoIiBuYW1lPSJs ZW5ndGgiIC8+PC9zZWxlY3Q+CisgICAgICAgIDxwcmUgaWQ9ImNvbnNvbGUiPjwvcHJlPgorICAg IDwvYm9keT4KKzwvaHRtbD4K