18230 2008-03-30 23:40:24 -0700 tspan in link not working 2008-07-29 04:54:25 -0700 1 1 1 Unclassified WebKit SVG 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jeffschiller webkit-unassigned webkit oldest_to_newest 75904 0 jeffschiller 2008-03-30 23:40:24 -0700 The following construct does not render: <text><a><tspan>foo</tspan></a></text> If I remove the <a> or the <tspan> it renders fine. 75905 1 20230 jeffschiller 2008-03-30 23:42:15 -0700 Created attachment 20230 Minimal test case Works in Firefox and Opera... 76218 2 20308 rwlbuis 2008-04-03 00:16:47 -0700 Created attachment 20308 First attempt Implement the errata given at: http://www.w3.org/2003/01/REC-SVG11-20030114-errata#linking-text-environment This change of behaviour implements the Minimal test case, I also included a testcase that tests the possible content of the <a> when contained in a <text>. Cheers, Rob. 77471 3 20308 eric 2008-04-13 22:32:37 -0700 Comment on attachment 20308 First attempt This is *great*. But I don't think it's safe to assume that your parent is always an SVG element: if (static_cast<SVGElement*>(parent())) I bet that it's possible to add an SVGAElement into an arbitrary XML DOM and we don't prevent that. Whether we should is another question. You'll need to check the type of the parent before making the case. r- for the potential crasher. 77492 4 20520 rwlbuis 2008-04-13 23:49:08 -0700 Created attachment 20520 Safer cast I did not check but I a convinced it will crash in mixed content, this cast is safer. Cheers, Rob. 77493 5 20520 eric 2008-04-13 23:50:35 -0700 Comment on attachment 20520 Safer cast Awesome. 77572 6 darin 2008-04-14 08:38:07 -0700 (In reply to comment #3) > I bet that it's possible to add an SVGAElement into an arbitrary XML DOM and we > don't prevent that. Whether we should is another question. We definitely shouldn't prevent that. Keep in mind that in XML you can have arbitrary content, any element child with any element as parent, in markup without any DOM calls. 79540 7 rwlbuis 2008-05-02 23:02:59 -0700 Landed in r31859. 86857 8 jeffschiller 2008-07-24 08:52:06 -0700 This broke again - not sure when (Safari 3.1.2) 86859 9 jeffschiller 2008-07-24 08:58:19 -0700 Hm, works in a more recent WebKit build (34603). Which build of WebKit is Safari 3.1 using? This might be FIXED after all (just not in Safari yet). 86957 10 20520 mitz 2008-07-25 13:12:24 -0700 Comment on attachment 20520 Safer cast Clearing the review flag because the patch was landed. 87257 11 webkit 2008-07-29 04:54:25 -0700 (In reply to comment #9) > Hm, works in a more recent WebKit build (34603). Which build of WebKit is > Safari 3.1 using? Safari 3.1 was build from branched source tree of WebKit: http://trac.webkit.org/browser/branches/Safari-3-1-branch. The bug is fixed only in trunk for now: http://trac.webkit.org/browser/trunk >This might be FIXED after all (just not in Safari yet). Indeed. 20230 2008-03-30 23:42:15 -0700 2008-03-30 23:42:15 -0700 Minimal test case test-tspan-in-link.svg image/svg+xml 379 jeffschiller PD94bWwgdmVyc2lvbj0iMS4wIiA/Pg0KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAw MC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94 PSIwIDAgMzAwIDIwMCI+DQo8ZGVzYz5GYWlscyBpbiBXZWJLaXQgMjAwOC0wMy0zMS4gIEJ1Z3pp bGxhIEJ1ZyAxODIzMCAoaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgy MzApPC9kZXNjPg0KPHRleHQgeD0iMjAiIHk9IjMwIj5EaWQgdGhlIFRlc3QgUGFzcz88L3RleHQ+ DQo8dGV4dCB4PSIyMCIgeT0iNjAiIGZvbnQtc2l6ZT0iMjIiIGZpbGw9ImdyZWVuIj4NCjxhPjx0 c3Bhbj5ZZXM8L3RzcGFuPjwvYT4NCjwvdGV4dD4NCjwvc3ZnPg== 20308 2008-04-03 00:16:47 -0700 2008-04-13 23:49:08 -0700 First attempt 18230.diff text/plain 6610 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTU4MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMDMgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjMwCisgICAgICAgIHRzcGFuIGluIGxpbmsg bm90IHdvcmtpbmcKKworICAgICAgICBJbXBsZW1lbnQgU1ZHIEVycmF0YTogIlRoZSAnYScgZWxl bWVudCBtYXkgY29udGFpbiBhbnkgZWxlbWVudCB0aGF0IGl0cyBwYXJlbnQgbWF5IGNvbnRhaW4s IGV4Y2VwdCBpdHNlbGYuIgorCisgICAgICAgICogc3ZnL1NWR0FFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0FFbGVtZW50OjpjaGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKToKKwog MjAwOC0wNC0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgTWl0eiBQZXR0ZWwKSW5kZXg6IFdlYkNvcmUvc3ZnL1NWR0FFbGVtZW50LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N2Zy9TVkdBRWxlbWVudC5jcHAJKHJldmlzaW9uIDMx NTc5KQorKysgV2ViQ29yZS9zdmcvU1ZHQUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x ODcsOCArMTg3LDEyIEBAIGJvb2wgU1ZHQUVsZW1lbnQ6OmlzS2V5Ym9hcmRGb2N1c2FibGUoS2UK IAogYm9vbCBTVkdBRWxlbWVudDo6Y2hpbGRTaG91bGRDcmVhdGVSZW5kZXJlcihOb2RlKiBjaGls ZCkgY29uc3QKIHsKLSAgICBpZiAoc3RhdGljX2Nhc3Q8U1ZHRWxlbWVudCo+KHBhcmVudCgpKS0+ aXNUZXh0Q29udGVudCgpKQotICAgICAgICByZXR1cm4gY2hpbGQtPmlzVGV4dE5vZGUoKTsKKyAg ICAvLyBodHRwOi8vd3d3LnczLm9yZy8yMDAzLzAxL1JFQy1TVkcxMS0yMDAzMDExNC1lcnJhdGEj bGlua2luZy10ZXh0LWVudmlyb25tZW50CisgICAgLy8gVGhlICdhJyBlbGVtZW50IG1heSBjb250 YWluIGFueSBlbGVtZW50IHRoYXQgaXRzIHBhcmVudCBtYXkgY29udGFpbiwgZXhjZXB0IGl0c2Vs Zi4KKyAgICBpZiAoY2hpbGQtPmhhc1RhZ05hbWUoU1ZHTmFtZXM6OmFUYWcpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisgICAgaWYgKHN0YXRpY19jYXN0PFNWR0VsZW1lbnQqPihwYXJlbnQoKSkp CisgICAgICAgIHJldHVybiBzdGF0aWNfY2FzdDxTVkdFbGVtZW50Kj4ocGFyZW50KCkpLT5jaGls ZFNob3VsZENyZWF0ZVJlbmRlcmVyKGNoaWxkKTsKIAogICAgIHJldHVybiBTVkdFbGVtZW50Ojpj aGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKGNoaWxkKTsKIH0KSW5kZXg6IExheW91dFRlc3RzL0No YW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDMx NTgxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEs MTQgQEAKKzIwMDgtMDQtMDMgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RjYXNlIGZvcjoKKyAgICAg ICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyMzAKKyAgICAgICAg dHNwYW4gaW4gbGluayBub3Qgd29ya2luZworCisgICAgICAgICogcGxhdGZvcm0vbWFjL3N2Zy9j dXN0b20vdGV4dC1saW5raW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogc3ZnL2N1 c3RvbS90ZXh0LWxpbmtpbmcuc3ZnOiBBZGRlZC4KKwogMjAwOC0wNC0wMiAgQnJhZHkgRWlkc29u ICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgV3JpdHRlbiBieSBEYXZpZCBLaWx6ZXIs IHR3ZWFrZWQgYnkgQnJhZHksIFJldmlld2VkIGJ5IE1pdHogUGV0dGVsCkluZGV4OiBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvc3ZnL2N1c3RvbS90ZXh0LWxpbmtpbmctZXhwZWN0ZWQudHh0Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9zdmcvY3VzdG9tL3RleHQtbGlu a2luZy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvc3ZnL2N1c3RvbS90ZXh0LWxpbmtpbmctZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAt MCwwICsxLDM1IEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyVmlldyBh dCAoMCwwKSBzaXplIDgwMHg2MDAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBSZW5k ZXJTVkdSb290IHtzdmd9IGF0ICg5NywzNikgc2l6ZSAyMzV4MTY4CisgICAgUmVuZGVyU1ZHSGlk ZGVuQ29udGFpbmVyIHtkZWZzfSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVuZGVyU1ZHVGV4 dCB7dGV4dH0gYXQgKDAsMCkgc2l6ZSAxNjN4MTggY29udGFpbnMgMSBjaHVuayhzKQorICAgICAg ICBSZW5kZXJTVkdJbmxpbmVUZXh0IHsjdGV4dH0gYXQgKDAsLTE0KSBzaXplIDE2M3gxOAorICAg ICAgICAgIGNodW5rIDEgdGV4dCBydW4gMSBhdCAoMC4wMCwwLjAwKSBzdGFydE9mZnNldCAwIGVu ZE9mZnNldCAyNSB3aWR0aCAxNjMuMDA6ICJSZWZlcmVuY2VkIGNoYXJhY3RlciBkYXRhIgorICAg ICAgUmVuZGVyUGF0aCB7cGF0aH0gYXQgKDEwMCwxNDApIHNpemUgMTAweDEwIFtmaWxsPXtbdHlw ZT1TT0xJRF0gW2NvbG9yPSMwMDAwMDBdfV0gW2RhdGE9Ik0xMDAuMDAsMTUwLjAwTDE1MC4wMCwx NDAuMDBMMjAwLjAwLDE1MC4wMCJdCisgICAgUmVuZGVyU1ZHVGV4dCB7dGV4dH0gYXQgKDEwMCw1 MCkgc2l6ZSA3N3gxOCBjb250YWlucyAxIGNodW5rKHMpCisgICAgICBSZW5kZXJTVkdJbmxpbmUg e2F9IGF0ICgwLDApIHNpemUgNzd4MTgKKyAgICAgICAgUmVuZGVyU1ZHVFNwYW4ge3RzcGFufSBh dCAoMCwwKSBzaXplIDc3eDE4CisgICAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9 IGF0ICgwLC0xNCkgc2l6ZSA3N3gxOAorICAgICAgICAgICAgY2h1bmsgMSB0ZXh0IHJ1biAxIGF0 ICgxMDAuMDAsNTAuMDApIHN0YXJ0T2Zmc2V0IDAgZW5kT2Zmc2V0IDEzIHdpZHRoIDc3LjAwOiAi dHNwYW4gaW4gbGluayIKKyAgICBSZW5kZXJTVkdUZXh0IHt0ZXh0fSBhdCAoMTAwLDEwMCkgc2l6 ZSAyMzJ4MTggY29udGFpbnMgMSBjaHVuayhzKQorICAgICAgUmVuZGVyU1ZHSW5saW5lIHthfSBh dCAoMCwwKSBzaXplIDIzMngxOAorICAgICAgICBSZW5kZXJTVkdJbmxpbmUge3RyZWZ9IGF0ICgw LDApIHNpemUgMjMyeDE4CisgICAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9IGF0 ICgwLC0xNCkgc2l6ZSAxNjd4MTgKKyAgICAgICAgICAgIGNodW5rIDEgdGV4dCBydW4gMSBhdCAo MTAwLjAwLDEwMC4wMCkgc3RhcnRPZmZzZXQgMCBlbmRPZmZzZXQgMjYgd2lkdGggMTY3LjAwOiAi UmVmZXJlbmNlZCBjaGFyYWN0ZXIgZGF0YSAiCisgICAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4 dCB7I3RleHR9IGF0ICgxNjcsLTE0KSBzaXplIDY1eDE4CisgICAgICAgICAgICBjaHVuayAxIHRl eHQgcnVuIDIgYXQgKDI2Ny4wMCwxMDAuMDApIHN0YXJ0T2Zmc2V0IDAgZW5kT2Zmc2V0IDEyIHdp ZHRoIDY1LjAwOiAidHJlZiBpbiBsaW5rIgorICAgIFJlbmRlclNWR1RleHQge3RleHR9IGF0ICgx MDEsMTQwKSBzaXplIDk5eDI4IGNvbnRhaW5zIDEgY2h1bmsocykKKyAgICAgIFJlbmRlclNWR0lu bGluZSB7YX0gYXQgKDAsMCkgc2l6ZSA5OXgyOAorICAgICAgICBSZW5kZXJTVkdUZXh0UGF0aCB7 dGV4dFBhdGh9IGF0ICgwLDApIHNpemUgOTl4MjgKKyAgICAgICAgICBSZW5kZXJTVkdJbmxpbmVU ZXh0IHsjdGV4dH0gYXQgKC00LC0xNCkgc2l6ZSA5OXgyOAorICAgICAgICAgICAgY2h1bmsgMSB0 ZXh0IHJ1biAxIGF0ICgxMDEuOTYsMTQwLjM5KSBzdGFydE9mZnNldCAwIGVuZE9mZnNldCAxNiB3 aWR0aCA5NS4wMDogInRleHRQYXRoIGluIGxpbmsiCisgICAgUmVuZGVyU1ZHVGV4dCB7dGV4dH0g YXQgKDEwMCwyMDApIHNpemUgMTEweDE4IGNvbnRhaW5zIDEgY2h1bmsocykKKyAgICAgIFJlbmRl clNWR0lubGluZSB7YX0gYXQgKDAsMCkgc2l6ZSAxMTB4MTgKKyAgICAgICAgUmVuZGVyU1ZHVFNw YW4ge2FsdEdseXBofSBhdCAoMCwwKSBzaXplIDEyeDE4CisgICAgICAgICAgUmVuZGVyU1ZHSW5s aW5lVGV4dCB7I3RleHR9IGF0ICgwLC0xNCkgc2l6ZSAxMngxOAorICAgICAgICAgICAgY2h1bmsg MSB0ZXh0IHJ1biAxIGF0ICgxMDAuMDAsMjAwLjAwKSBzdGFydE9mZnNldCAwIGVuZE9mZnNldCAx IHdpZHRoIDEyLjAwOiAiQSIKKyAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9IGF0 ICgxMiwtMTQpIHNpemUgOTh4MTgKKyAgICAgICAgICBjaHVuayAxIHRleHQgcnVuIDIgYXQgKDEx Mi4wMCwyMDAuMDApIHN0YXJ0T2Zmc2V0IDAgZW5kT2Zmc2V0IDE1IHdpZHRoIDk4LjAwOiAibHRH bHlwaCBjb250ZW50IgorICAgIFJlbmRlclNWR1RleHQge3RleHR9CisgICAgICBSZW5kZXJTVkdJ bmxpbmUge2F9IGF0ICgwLDApIHNpemUgMHgwCkluZGV4OiBMYXlvdXRUZXN0cy9zdmcvY3VzdG9t L3RleHQtbGlua2luZy5zdmcKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS90 ZXh0LWxpbmtpbmcuc3ZnCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS90 ZXh0LWxpbmtpbmcuc3ZnCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI2IEBACis8P3htbCB2ZXJz aW9uPSIxLjAiIHN0YW5kYWxvbmU9Im5vIj8+Cis8IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzND Ly9EVEQgU1ZHIDEuMSBCYXNpYy8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcv MS4xL0RURC9zdmcxMS1iYXNpYy5kdGQiPgorPHN2ZyB2ZXJzaW9uPSIxLjEiIGJhc2VQcm9maWxl PSJiYXNpYyIgaWQ9InN2Zy1yb290IiB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiAKKyAgICAg eG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiCisgICAgIHhtbG5zPSJo dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CisgIDxkZWZzPgorICAgIDx0ZXh0IGlkPSJSZWZl cmVuY2VkVGV4dCI+CisgICAgICBSZWZlcmVuY2VkIGNoYXJhY3RlciBkYXRhCisgICAgPC90ZXh0 PgorICAgIDxwYXRoIGlkPSJwYXRoMSIgZD0iTSAxMDAgMTUwIEwgMTUwIDE0MCBMIDIwMCAxNTAi Lz4KKyAgICA8Zm9udCBpZD0iRm9udDEiIGhvcml6LWFkdi14PSI1Ij4KKyAgICAgIDxmb250LWZh Y2UgZm9udC1mYW1pbHk9IkhhcHB5U2FkIiBmb250LXdlaWdodD0iYm9sZCIgZm9udC1zdHlsZT0i bm9ybWFsIiB1bml0cy1wZXItZW09IjgiIGNhcC1oZWlnaHQ9IjgiIHgtaGVpZ2h0PSI0IiBhc2Nl bnQ9IjgiIGRlc2NlbnQ9IjIiIGFscGhhYmV0aWM9IjAiIG1hdGhlbWF0aWNhbD0iNCIgaWRlb2dy YXBoaWM9Ii0yIiBoYW5naW5nPSI4Ii8+CisgICAgICA8bWlzc2luZy1nbHlwaCBkPSJNMSwzaDJ2 MmgtMnoiLz4KKyAgICAgICAgICAgIDxnbHlwaCBpZD0iQTEiIGQ9Ik0wLDAgTDIsOCBMNCwwIE0w LDQgQzEsMyAzLDMgNCw0Ii8+CisgICAgPC9mb250PgorICAgIDxhbHRHbHlwaERlZiBpZD0iQXNt aWxlIj4KKyAgICAgIDxnbHlwaFJlZiB4bGluazpocmVmPSIjQTEiLz4KKyAgICA8L2FsdEdseXBo RGVmPgorICA8L2RlZnM+CisgICAgPHRleHQgeD0iMTAwIiB5PSI1MCI+PGEgeGxpbms6aHJlZj0i aHR0cDovL3d3dy53ZWJraXQub3JnIj48dHNwYW4+dHNwYW4gaW4gbGluazwvdHNwYW4+PC9hPjwv dGV4dD4KKyAgICA8dGV4dCB4PSIxMDAiIHk9IjEwMCI+PGEgeGxpbms6aHJlZj0iaHR0cDovL3d3 dy53ZWJraXQub3JnIj48dHJlZiB4bGluazpocmVmPSIjUmVmZXJlbmNlZFRleHQiPnRyZWYgaW4g bGluazwvdHJlZj48L2E+PC90ZXh0PgorICAgIDx0ZXh0PjxhIHhsaW5rOmhyZWY9Imh0dHA6Ly93 d3cud2Via2l0Lm9yZyI+PHRleHRQYXRoIHhsaW5rOmhyZWY9IiNwYXRoMSI+dGV4dFBhdGggaW4g bGluazwvdGV4dFBhdGg+PC9hPjwvdGV4dD4KKyAgICA8dGV4dCB4PSIxMDAiIHk9IjIwMCI+PGEg eGxpbms6aHJlZj0iaHR0cDovL3d3dy53ZWJraXQub3JnIj48YWx0R2x5cGggeGxpbms6aHJlZj0i I0FzbWlsZSI+QTwvYWx0R2x5cGg+bHRHbHlwaCBjb250ZW50PC9hPjwvdGV4dD4KKyAgICA8dGV4 dCB4PSIxMDAiIHk9IjI1MCI+PGEgeGxpbms6aHJlZj0iaHR0cDovL3d3dy53ZWJraXQub3JnIj48 YT5UaGlzIHNob3VsZCBub3QgYmUgcmVuZGVyZWQ8L2E+PC9hPjwvdGV4dD4KKzwvc3ZnPgorCg== 20520 2008-04-13 23:49:08 -0700 2008-07-25 13:12:24 -0700 Safer cast 18230-2.diff text/plain 6641 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTg1OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTUgQEAKKzIwMDgtMDQtMTQgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjMwCisgICAgICAgIHRzcGFuIGluIGxpbmsg bm90IHdvcmtpbmcKKworICAgICAgICBJbXBsZW1lbnQgU1ZHIEVycmF0YTogIlRoZSAnYScgZWxl bWVudCBtYXkgY29udGFpbiBhbnkgZWxlbWVudCB0aGF0IGl0cyBwYXJlbnQgbWF5IGNvbnRhaW4s IGV4Y2VwdCBpdHNlbGYuIgorCisgICAgICAgICogc3ZnL1NWR0FFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlNWR0FFbGVtZW50OjpjaGlsZFNob3VsZENyZWF0ZVJlbmRlcmVyKToKKwog MjAwOC0wNC0xMyAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IGZvciBidWcgMTg0NjYsIFdlYktpdCBleGhpYml0cyBzbG93IHBlcmZvcm1hbmNlIG9uIE9wZXJh IERIVE1MIGJlbmNobWFyay4gIEltcHJvdmUgbGF5b3V0J3MgcmVjdApJbmRleDogV2ViQ29yZS9z dmcvU1ZHQUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL1NWR0FFbGVtZW50 LmNwcAkocmV2aXNpb24gMzE4NTgpCisrKyBXZWJDb3JlL3N2Zy9TVkdBRWxlbWVudC5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTIwMSw4ICsyMDEsMTIgQEAgYm9vbCBTVkdBRWxlbWVudDo6aXNLZXli b2FyZEZvY3VzYWJsZShLZQogCiBib29sIFNWR0FFbGVtZW50OjpjaGlsZFNob3VsZENyZWF0ZVJl bmRlcmVyKE5vZGUqIGNoaWxkKSBjb25zdAogewotICAgIGlmIChzdGF0aWNfY2FzdDxTVkdFbGVt ZW50Kj4ocGFyZW50KCkpLT5pc1RleHRDb250ZW50KCkpCi0gICAgICAgIHJldHVybiBjaGlsZC0+ aXNUZXh0Tm9kZSgpOworICAgIC8vIGh0dHA6Ly93d3cudzMub3JnLzIwMDMvMDEvUkVDLVNWRzEx LTIwMDMwMTE0LWVycmF0YSNsaW5raW5nLXRleHQtZW52aXJvbm1lbnQKKyAgICAvLyBUaGUgJ2En IGVsZW1lbnQgbWF5IGNvbnRhaW4gYW55IGVsZW1lbnQgdGhhdCBpdHMgcGFyZW50IG1heSBjb250 YWluLCBleGNlcHQgaXRzZWxmLgorICAgIGlmIChjaGlsZC0+aGFzVGFnTmFtZShTVkdOYW1lczo6 YVRhZykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBpZiAocGFyZW50KCkgJiYgcGFyZW50 KCktPmlzU1ZHRWxlbWVudCgpKQorICAgICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8U1ZHRWxlbWVu dCo+KHBhcmVudCgpKS0+Y2hpbGRTaG91bGRDcmVhdGVSZW5kZXJlcihjaGlsZCk7CiAKICAgICBy ZXR1cm4gU1ZHRWxlbWVudDo6Y2hpbGRTaG91bGRDcmVhdGVSZW5kZXJlcihjaGlsZCk7CiB9Cklu ZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCShyZXZpc2lvbiAzMTg1OCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDA4LTA0LTE0ICBSb2IgQnVpcyAgPGJ1aXNAa2Rl Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU ZXN0Y2FzZSBmb3I6CisgICAgICAgIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE4MjMwCisgICAgICAgIHRzcGFuIGluIGxpbmsgbm90IHdvcmtpbmcKKworICAgICAgICAq IHBsYXRmb3JtL21hYy9zdmcvY3VzdG9tL3RleHQtbGlua2luZy1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIHN2Zy9jdXN0b20vdGV4dC1saW5raW5nLnN2ZzogQWRkZWQuCisKIDIwMDgt MDQtMTEgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXZlIEh5YXR0LgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3N2Zy9jdXN0 b20vdGV4dC1saW5raW5nLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvc3ZnL2N1c3RvbS90ZXh0LWxpbmtpbmctZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL3N2Zy9jdXN0b20vdGV4dC1saW5raW5n LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNSBAQAorbGF5ZXIgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCisgIFJlbmRlclZpZXcgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCitsYXll ciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyU1ZHUm9vdCB7c3ZnfSBhdCAoOTcsMzYp IHNpemUgMjM1eDE2OAorICAgIFJlbmRlclNWR0hpZGRlbkNvbnRhaW5lciB7ZGVmc30gYXQgKDAs MCkgc2l6ZSAweDAKKyAgICAgIFJlbmRlclNWR1RleHQge3RleHR9IGF0ICgwLDApIHNpemUgMTYz eDE4IGNvbnRhaW5zIDEgY2h1bmsocykKKyAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3Rl eHR9IGF0ICgwLC0xNCkgc2l6ZSAxNjN4MTgKKyAgICAgICAgICBjaHVuayAxIHRleHQgcnVuIDEg YXQgKDAuMDAsMC4wMCkgc3RhcnRPZmZzZXQgMCBlbmRPZmZzZXQgMjUgd2lkdGggMTYzLjAwOiAi UmVmZXJlbmNlZCBjaGFyYWN0ZXIgZGF0YSIKKyAgICAgIFJlbmRlclBhdGgge3BhdGh9IGF0ICgx MDAsMTQwKSBzaXplIDEwMHgxMCBbZmlsbD17W3R5cGU9U09MSURdIFtjb2xvcj0jMDAwMDAwXX1d IFtkYXRhPSJNMTAwLjAwLDE1MC4wMEwxNTAuMDAsMTQwLjAwTDIwMC4wMCwxNTAuMDAiXQorICAg IFJlbmRlclNWR1RleHQge3RleHR9IGF0ICgxMDAsNTApIHNpemUgNzd4MTggY29udGFpbnMgMSBj aHVuayhzKQorICAgICAgUmVuZGVyU1ZHSW5saW5lIHthfSBhdCAoMCwwKSBzaXplIDc3eDE4Cisg ICAgICAgIFJlbmRlclNWR1RTcGFuIHt0c3Bhbn0gYXQgKDAsMCkgc2l6ZSA3N3gxOAorICAgICAg ICAgIFJlbmRlclNWR0lubGluZVRleHQgeyN0ZXh0fSBhdCAoMCwtMTQpIHNpemUgNzd4MTgKKyAg ICAgICAgICAgIGNodW5rIDEgdGV4dCBydW4gMSBhdCAoMTAwLjAwLDUwLjAwKSBzdGFydE9mZnNl dCAwIGVuZE9mZnNldCAxMyB3aWR0aCA3Ny4wMDogInRzcGFuIGluIGxpbmsiCisgICAgUmVuZGVy U1ZHVGV4dCB7dGV4dH0gYXQgKDEwMCwxMDApIHNpemUgMjMyeDE4IGNvbnRhaW5zIDEgY2h1bmso cykKKyAgICAgIFJlbmRlclNWR0lubGluZSB7YX0gYXQgKDAsMCkgc2l6ZSAyMzJ4MTgKKyAgICAg ICAgUmVuZGVyU1ZHSW5saW5lIHt0cmVmfSBhdCAoMCwwKSBzaXplIDIzMngxOAorICAgICAgICAg IFJlbmRlclNWR0lubGluZVRleHQgeyN0ZXh0fSBhdCAoMCwtMTQpIHNpemUgMTY3eDE4CisgICAg ICAgICAgICBjaHVuayAxIHRleHQgcnVuIDEgYXQgKDEwMC4wMCwxMDAuMDApIHN0YXJ0T2Zmc2V0 IDAgZW5kT2Zmc2V0IDI2IHdpZHRoIDE2Ny4wMDogIlJlZmVyZW5jZWQgY2hhcmFjdGVyIGRhdGEg IgorICAgICAgICAgIFJlbmRlclNWR0lubGluZVRleHQgeyN0ZXh0fSBhdCAoMTY3LC0xNCkgc2l6 ZSA2NXgxOAorICAgICAgICAgICAgY2h1bmsgMSB0ZXh0IHJ1biAyIGF0ICgyNjcuMDAsMTAwLjAw KSBzdGFydE9mZnNldCAwIGVuZE9mZnNldCAxMiB3aWR0aCA2NS4wMDogInRyZWYgaW4gbGluayIK KyAgICBSZW5kZXJTVkdUZXh0IHt0ZXh0fSBhdCAoMTAxLDE0MCkgc2l6ZSA5OXgyOCBjb250YWlu cyAxIGNodW5rKHMpCisgICAgICBSZW5kZXJTVkdJbmxpbmUge2F9IGF0ICgwLDApIHNpemUgOTl4 MjgKKyAgICAgICAgUmVuZGVyU1ZHVGV4dFBhdGgge3RleHRQYXRofSBhdCAoMCwwKSBzaXplIDk5 eDI4CisgICAgICAgICAgUmVuZGVyU1ZHSW5saW5lVGV4dCB7I3RleHR9IGF0ICgtNCwtMTQpIHNp emUgOTl4MjgKKyAgICAgICAgICAgIGNodW5rIDEgdGV4dCBydW4gMSBhdCAoMTAxLjk2LDE0MC4z OSkgc3RhcnRPZmZzZXQgMCBlbmRPZmZzZXQgMTYgd2lkdGggOTUuMDA6ICJ0ZXh0UGF0aCBpbiBs aW5rIgorICAgIFJlbmRlclNWR1RleHQge3RleHR9IGF0ICgxMDAsMjAwKSBzaXplIDExMHgxOCBj b250YWlucyAxIGNodW5rKHMpCisgICAgICBSZW5kZXJTVkdJbmxpbmUge2F9IGF0ICgwLDApIHNp emUgMTEweDE4CisgICAgICAgIFJlbmRlclNWR1RTcGFuIHthbHRHbHlwaH0gYXQgKDAsMCkgc2l6 ZSAxMngxOAorICAgICAgICAgIFJlbmRlclNWR0lubGluZVRleHQgeyN0ZXh0fSBhdCAoMCwtMTQp IHNpemUgMTJ4MTgKKyAgICAgICAgICAgIGNodW5rIDEgdGV4dCBydW4gMSBhdCAoMTAwLjAwLDIw MC4wMCkgc3RhcnRPZmZzZXQgMCBlbmRPZmZzZXQgMSB3aWR0aCAxMi4wMDogIkEiCisgICAgICAg IFJlbmRlclNWR0lubGluZVRleHQgeyN0ZXh0fSBhdCAoMTIsLTE0KSBzaXplIDk4eDE4CisgICAg ICAgICAgY2h1bmsgMSB0ZXh0IHJ1biAyIGF0ICgxMTIuMDAsMjAwLjAwKSBzdGFydE9mZnNldCAw IGVuZE9mZnNldCAxNSB3aWR0aCA5OC4wMDogImx0R2x5cGggY29udGVudCIKKyAgICBSZW5kZXJT VkdUZXh0IHt0ZXh0fQorICAgICAgUmVuZGVyU1ZHSW5saW5lIHthfSBhdCAoMCwwKSBzaXplIDB4 MApJbmRleDogTGF5b3V0VGVzdHMvc3ZnL2N1c3RvbS90ZXh0LWxpbmtpbmcuc3ZnCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL3N2Zy9jdXN0b20vdGV4dC1saW5raW5nLnN2ZwkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL3N2Zy9jdXN0b20vdGV4dC1saW5raW5nLnN2ZwkocmV2aXNpb24g MCkKQEAgLTAsMCArMSwyNiBAQAorPD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/ PgorPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEgQmFzaWMvL0VOIiAi aHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEtYmFzaWMuZHRkIj4K KzxzdmcgdmVyc2lvbj0iMS4xIiBiYXNlUHJvZmlsZT0iYmFzaWMiIGlkPSJzdmctcm9vdCIgd2lk dGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgCisgICAgIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3Lncz Lm9yZy8xOTk5L3hsaW5rIgorICAgICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmci PgorICA8ZGVmcz4KKyAgICA8dGV4dCBpZD0iUmVmZXJlbmNlZFRleHQiPgorICAgICAgUmVmZXJl bmNlZCBjaGFyYWN0ZXIgZGF0YQorICAgIDwvdGV4dD4KKyAgICA8cGF0aCBpZD0icGF0aDEiIGQ9 Ik0gMTAwIDE1MCBMIDE1MCAxNDAgTCAyMDAgMTUwIi8+CisgICAgPGZvbnQgaWQ9IkZvbnQxIiBo b3Jpei1hZHYteD0iNSI+CisgICAgICA8Zm9udC1mYWNlIGZvbnQtZmFtaWx5PSJIYXBweVNhZCIg Zm9udC13ZWlnaHQ9ImJvbGQiIGZvbnQtc3R5bGU9Im5vcm1hbCIgdW5pdHMtcGVyLWVtPSI4IiBj YXAtaGVpZ2h0PSI4IiB4LWhlaWdodD0iNCIgYXNjZW50PSI4IiBkZXNjZW50PSIyIiBhbHBoYWJl dGljPSIwIiBtYXRoZW1hdGljYWw9IjQiIGlkZW9ncmFwaGljPSItMiIgaGFuZ2luZz0iOCIvPgor ICAgICAgPG1pc3NpbmctZ2x5cGggZD0iTTEsM2gydjJoLTJ6Ii8+CisgICAgICAgICAgICA8Z2x5 cGggaWQ9IkExIiBkPSJNMCwwIEwyLDggTDQsMCBNMCw0IEMxLDMgMywzIDQsNCIvPgorICAgIDwv Zm9udD4KKyAgICA8YWx0R2x5cGhEZWYgaWQ9IkFzbWlsZSI+CisgICAgICA8Z2x5cGhSZWYgeGxp bms6aHJlZj0iI0ExIi8+CisgICAgPC9hbHRHbHlwaERlZj4KKyAgPC9kZWZzPgorICAgIDx0ZXh0 IHg9IjEwMCIgeT0iNTAiPjxhIHhsaW5rOmhyZWY9Imh0dHA6Ly93d3cud2Via2l0Lm9yZyI+PHRz cGFuPnRzcGFuIGluIGxpbms8L3RzcGFuPjwvYT48L3RleHQ+CisgICAgPHRleHQgeD0iMTAwIiB5 PSIxMDAiPjxhIHhsaW5rOmhyZWY9Imh0dHA6Ly93d3cud2Via2l0Lm9yZyI+PHRyZWYgeGxpbms6 aHJlZj0iI1JlZmVyZW5jZWRUZXh0Ij50cmVmIGluIGxpbms8L3RyZWY+PC9hPjwvdGV4dD4KKyAg ICA8dGV4dD48YSB4bGluazpocmVmPSJodHRwOi8vd3d3LndlYmtpdC5vcmciPjx0ZXh0UGF0aCB4 bGluazpocmVmPSIjcGF0aDEiPnRleHRQYXRoIGluIGxpbms8L3RleHRQYXRoPjwvYT48L3RleHQ+ CisgICAgPHRleHQgeD0iMTAwIiB5PSIyMDAiPjxhIHhsaW5rOmhyZWY9Imh0dHA6Ly93d3cud2Vi a2l0Lm9yZyI+PGFsdEdseXBoIHhsaW5rOmhyZWY9IiNBc21pbGUiPkE8L2FsdEdseXBoPmx0R2x5 cGggY29udGVudDwvYT48L3RleHQ+CisgICAgPHRleHQgeD0iMTAwIiB5PSIyNTAiPjxhIHhsaW5r OmhyZWY9Imh0dHA6Ly93d3cud2Via2l0Lm9yZyI+PGE+VGhpcyBzaG91bGQgbm90IGJlIHJlbmRl cmVkPC9hPjwvYT48L3RleHQ+Cis8L3N2Zz4KKwo=