17201 2008-02-06 14:28:33 -0800 Use RefPtr in CSSParser::parseFont() to get rid of goto silliness 2008-02-11 13:06:48 -0800 1 1 1 Unclassified WebKit CSS 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED EasyFix P2 Minor --- 1 ddkilzer webkit-unassigned oldest_to_newest 69612 0 ddkilzer 2008-02-06 14:28:33 -0800 CSSParser::parseFont() uses goto statements to release the FontValue object on early exit. It should be using a RefPtr<FontValue> instead. 70192 1 19059 rwlbuis 2008-02-10 23:31:24 -0800 Created attachment 19059 First attempt Gets rid of the goto usage in parseFont. Cheers, Rob. 70245 2 19059 ddkilzer 2008-02-11 06:23:22 -0800 Comment on attachment 19059 First attempt Thanks Rob!! r=me Please remove tabs from the ChangeLog before landing! 70302 3 rwlbuis 2008-02-11 13:06:48 -0800 Landed in 30152. 19059 2008-02-10 23:31:24 -0800 2008-02-11 06:25:22 -0800 First attempt parsefont.diff text/plain 3702 rwlbuis SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMDEyMykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDgtMDItMTAgIFJvYiBCdWlzICA8YnVpc0BrZGUub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdBUk5JTkc6IE5P IFRFU1QgQ0FTRVMgQURERUQgT1IgQ0hBTkdFRAorCisJaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTcyMDEKKwlCdWcgMTcyMDE6IFVzZSBSZWZQdHIgaW4gQ1NTUGFyc2Vy OjpwYXJzZUZvbnQoKSB0byBnZXQgcmlkIG9mIGdvdG8KKwlzaWxsaW5lc3MKKworCUdldHMgcmlk IG9mIGdvdG8gdXNhZ2UgaW4gcGFyc2VGb250LgorCisgICAgICAgICogY3NzL0NTU1BhcnNlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRm9udCk6CisKIDIwMDgtMDIt MTAgIEFuZHJldyBXZWxsaW5ndG9uICA8cHJvdG9uQHdpcmV0YXBwZWQubmV0PgogCiAgICAgICAg IFJldmlld2VkIGFuZCB0d2Vha2VkIGJ5IERhcmluLgpJbmRleDogV2ViQ29yZS9jc3MvQ1NTUGFy c2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCShyZXZpc2lv biAzMDEyMykKKysrIFdlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTI1NTgsNyArMjU1OCw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUZvbnQoYm9vbCBpbXBvcnRh bnQKIHsKICAgICBib29sIHZhbGlkID0gdHJ1ZTsKICAgICBWYWx1ZSAqdmFsdWUgPSB2YWx1ZUxp c3QtPmN1cnJlbnQoKTsKLSAgICBGb250VmFsdWUgKmZvbnQgPSBuZXcgRm9udFZhbHVlOworICAg IFJlZlB0cjxGb250VmFsdWU+IGZvbnQgPSBuZXcgRm9udFZhbHVlOwogICAgIC8vIG9wdGlvbmFs IGZvbnQtc3R5bGUsIGZvbnQtdmFyaWFudCBhbmQgZm9udC13ZWlnaHQKICAgICB3aGlsZSAodmFs dWUpIHsKICAgICAgICAgaW50IGlkID0gdmFsdWUtPmlkOwpAQCAtMjU2NywxNSArMjU2NywxNSBA QCBib29sIENTU1BhcnNlcjo6cGFyc2VGb250KGJvb2wgaW1wb3J0YW50CiAgICAgICAgICAgICAg ICAgLy8gZG8gbm90aGluZywgaXQncyB0aGUgaW5pdGFsIHZhbHVlIGZvciBhbGwgdGhyZWUKICAg ICAgICAgICAgIH0gZWxzZSBpZiAoaWQgPT0gQ1NTX1ZBTF9JVEFMSUMgfHwgaWQgPT0gQ1NTX1ZB TF9PQkxJUVVFKSB7CiAgICAgICAgICAgICAgICAgaWYgKGZvbnQtPnN0eWxlKQotICAgICAgICAg ICAgICAgICAgICBnb3RvIGludmFsaWQ7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKICAgICAgICAgICAgICAgICBmb250LT5zdHlsZSA9IG5ldyBDU1NQcmltaXRpdmVWYWx1ZShp ZCk7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKGlkID09IENTU19WQUxfU01BTExfQ0FQUykgewog ICAgICAgICAgICAgICAgIGlmIChmb250LT52YXJpYW50KQotICAgICAgICAgICAgICAgICAgICBn b3RvIGludmFsaWQ7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAg ICAgICAgICBmb250LT52YXJpYW50ID0gbmV3IENTU1ByaW1pdGl2ZVZhbHVlKGlkKTsKICAgICAg ICAgICAgIH0gZWxzZSBpZiAoaWQgPj0gQ1NTX1ZBTF9CT0xEICYmIGlkIDw9IENTU19WQUxfTElH SFRFUikgewogICAgICAgICAgICAgICAgIGlmIChmb250LT53ZWlnaHQpCi0gICAgICAgICAgICAg ICAgICAgIGdvdG8gaW52YWxpZDsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICAgICAgICAgIGZvbnQtPndlaWdodCA9IG5ldyBDU1NQcmltaXRpdmVWYWx1ZShpZCk7 CiAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgIHZhbGlkID0gZmFsc2U7CkBA IC0yNjE0LDcgKzI2MTQsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VGb250KGJvb2wgaW1wb3J0 YW50CiAgICAgICAgIHZhbHVlID0gdmFsdWVMaXN0LT5uZXh0KCk7CiAgICAgfQogICAgIGlmICgh dmFsdWUpCi0gICAgICAgIGdvdG8gaW52YWxpZDsKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAg ICAgLy8gc2V0IHVuZGVmaW5lZCB2YWx1ZXMgdG8gZGVmYXVsdAogICAgIGlmICghZm9udC0+c3R5 bGUpCkBAIC0yNjMyLDIyICsyNjMyLDIyIEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUZvbnQoYm9v bCBpbXBvcnRhbnQKICAgICAgICAgZm9udC0+c2l6ZSA9IG5ldyBDU1NQcmltaXRpdmVWYWx1ZSh2 YWx1ZS0+ZlZhbHVlLCAoQ1NTUHJpbWl0aXZlVmFsdWU6OlVuaXRUeXBlcykgdmFsdWUtPnVuaXQp OwogICAgIHZhbHVlID0gdmFsdWVMaXN0LT5uZXh0KCk7CiAgICAgaWYgKCFmb250LT5zaXplIHx8 ICF2YWx1ZSkKLSAgICAgICAgZ290byBpbnZhbGlkOworICAgICAgICByZXR1cm4gZmFsc2U7CiAK ICAgICBpZiAodmFsdWUtPnVuaXQgPT0gVmFsdWU6Ok9wZXJhdG9yICYmIHZhbHVlLT5pVmFsdWUg PT0gJy8nKSB7CiAgICAgICAgIC8vIGxpbmUtaGVpZ2h0CiAgICAgICAgIHZhbHVlID0gdmFsdWVM aXN0LT5uZXh0KCk7CiAgICAgICAgIGlmICghdmFsdWUpCi0gICAgICAgICAgICBnb3RvIGludmFs aWQ7CisgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGlmICh2YWx1ZS0+aWQgPT0g Q1NTX1ZBTF9OT1JNQUwpIHsKICAgICAgICAgICAgIC8vIGRlZmF1bHQgdmFsdWUsIG5vdGhpbmcg dG8gZG8KICAgICAgICAgfSBlbHNlIGlmICh2YWxpZFVuaXQodmFsdWUsIEZOdW1iZXJ8Rkxlbmd0 aHxGUGVyY2VudCwgc3RyaWN0KSkKICAgICAgICAgICAgIGZvbnQtPmxpbmVIZWlnaHQgPSBuZXcg Q1NTUHJpbWl0aXZlVmFsdWUodmFsdWUtPmZWYWx1ZSwgKENTU1ByaW1pdGl2ZVZhbHVlOjpVbml0 VHlwZXMpIHZhbHVlLT51bml0KTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgZ290byBpbnZh bGlkOworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB2YWx1ZSA9IHZhbHVlTGlz dC0+bmV4dCgpOwogICAgICAgICBpZiAoIXZhbHVlKQotICAgICAgICAgICAgZ290byBpbnZhbGlk OworICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KICAgICAKICAgICBpZiAoIWZvbnQt PmxpbmVIZWlnaHQpCkBAIC0yNjU3LDE0ICsyNjU3LDEwIEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJz ZUZvbnQoYm9vbCBpbXBvcnRhbnQKICAgICBmb250LT5mYW1pbHkgPSBwYXJzZUZvbnRGYW1pbHko KTsKIAogICAgIGlmICh2YWx1ZUxpc3QtPmN1cnJlbnQoKSB8fCAhZm9udC0+ZmFtaWx5KQotICAg ICAgICBnb3RvIGludmFsaWQ7CisgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGFkZFByb3Bl cnR5KENTU19QUk9QX0ZPTlQsIGZvbnQsIGltcG9ydGFudCk7CisgICAgYWRkUHJvcGVydHkoQ1NT X1BST1BfRk9OVCwgZm9udC5yZWxlYXNlKCksIGltcG9ydGFudCk7CiAgICAgcmV0dXJuIHRydWU7 Ci0KLSBpbnZhbGlkOgotICAgIGRlbGV0ZSBmb250OwotICAgIHJldHVybiBmYWxzZTsKIH0KIAog UGFzc1JlZlB0cjxDU1NWYWx1ZUxpc3Q+IENTU1BhcnNlcjo6cGFyc2VGb250RmFtaWx5KCkK