21011 2008-09-22 16:24:19 -0700 Need to clean up fix in PropertyWrapperGetter::equals a bit (and add test case) 2008-09-29 14:25:01 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 cmarrin cmarrin oldest_to_newest 92240 0 cmarrin 2008-09-22 16:24:19 -0700 The fix in changelist 36703 has one remaining problem. The test: if ((!a || !b) && b != a) will fall through in the case where both a and b are null, causing a crash in the deref on the next line. There is no evidence that it is possible for this to happen, but I think the patch I have submitted is a bit safer. The patch also includes a testcase for the crash. 92241 1 23681 cmarrin 2008-09-22 16:27:39 -0700 Created attachment 23681 Patch, including LayoutTest file 92610 2 23681 eric 2008-09-24 15:33:55 -0700 Comment on attachment 23681 Patch, including LayoutTest file if (!a && !b || a == b) is redundant. if (!a && !b) should be sufficient. Another way to write this woudl be: if (!a || !b) return (a == b); but I think the two ifs as you've written it is more clear (After removing the redundancy). 93285 3 simon.fraser 2008-09-29 14:25:01 -0700 Committed r37076 M WebCore/ChangeLog M WebCore/page/animation/CompositeAnimation.cpp M WebCore/page/animation/AnimationBase.cpp M LayoutTests/ChangeLog A LayoutTests/transitions/override-transition-crash-expected.txt A LayoutTests/transitions/override-transition-crash.html r37076 = ff91302a8b84e30eec65022e68b48301e3dac305 (trunk) 23681 2008-09-22 16:27:39 -0700 2008-09-24 15:33:55 -0700 Patch, including LayoutTest file 21011.patch text/plain 5152 cmarrin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNjc4NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDktMjIgIENocmlzIE1hcnJpbiAgPGNtYXJyaW5AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZp eCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDExCisKKyAg ICAgICAgVGVzdDogdHJhbnNpdGlvbnMvb3ZlcnJpZGUtdHJhbnNpdGlvbi1jcmFzaC5odG1sCisK KyAgICAgICAgKiBwYWdlL2FuaW1hdGlvbi9BbmltYXRpb25CYXNlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlByb3BlcnR5V3JhcHBlckdldHRlcjo6ZXF1YWxzKToKKyAgICAgICAgKiBwYWdlL2Fu aW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29tcG9z aXRlQW5pbWF0aW9uOjp1cGRhdGVUcmFuc2l0aW9ucyk6CisKIDIwMDgtMDktMjIgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTAwNwpJbmRleDogV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Bbmlt YXRpb25CYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0FuaW1h dGlvbkJhc2UuY3BwCShyZXZpc2lvbiAzNjc4MykKKysrIFdlYkNvcmUvcGFnZS9hbmltYXRpb24v QW5pbWF0aW9uQmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwMyw4ICsyMDMsMTEgQEAgcHVi bGljOgogCiAgICAgdmlydHVhbCBib29sIGVxdWFscyhjb25zdCBSZW5kZXJTdHlsZSogYSwgY29u c3QgUmVuZGVyU3R5bGUqIGIpIGNvbnN0CiAgICAgewotICAgICAgICAvLyBJZiBvbmUgc3R5bGUg aXMgbnVsbCBhbmQgdGhlIG90aGVyIGlzIG5vbi1udWxsIHJldHVybiBmYWxzZS4KLSAgICAgICAg aWYgKCghYSB8fCAhYikgJiYgYiAhPSBhKQorICAgICAgIC8vIElmIHRoZSBzdHlsZSBwb2ludGVy cyBhcmUgdGhlIHNhbWUsIGRvbid0IGJvdGhlciBkb2luZyB0aGUgdGVzdC4KKyAgICAgICAvLyBJ ZiBlaXRoZXIgaXMgbnVsbCwgcmV0dXJuIGZhbHNlLiBJZiBib3RoIGFyZSBudWxsLCByZXR1cm4g dHJ1ZS4KKyAgICAgICBpZiAoIWEgJiYgIWIgfHwgYSA9PSBiKQorICAgICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAgICBpZiAoIWEgfHwgIWIpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgIHJldHVybiAoYS0+Km1fZ2V0dGVyKSgpID09IChiLT4qbV9nZXR0ZXIpKCk7CiAgICAg fQpJbmRleDogV2ViQ29yZS9wYWdlL2FuaW1hdGlvbi9Db21wb3NpdGVBbmltYXRpb24uY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9hbmltYXRpb24vQ29tcG9zaXRlQW5pbWF0aW9uLmNw cAkocmV2aXNpb24gMzY3ODMpCisrKyBXZWJDb3JlL3BhZ2UvYW5pbWF0aW9uL0NvbXBvc2l0ZUFu aW1hdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5LDcgKzg5LDExIEBAIHZvaWQgQ29tcG9z aXRlQW5pbWF0aW9uOjp1cGRhdGVUcmFuc2l0aW8KICAgICAgICAgICAgIGJvb2wgZXF1YWwgPSB0 cnVlOwogCiAgICAgICAgICAgICBpZiAoaW1wbEFuaW0pIHsKLSAgICAgICAgICAgICAgICAvLyBU aGVyZSBpcyBvbmUsIGhhcyBvdXIgdGFyZ2V0IGNoYW5nZWQ/CisgICAgICAgICAgICAgICAvLyBU aGlzIGltcGxBbmltIG1pZ2h0IG5vdCBiZSBhbiBhbHJlYWR5IHJ1bm5pbmcgdHJhbnNpdGlvbi4g SXQgbWlnaHQgYmUKKyAgICAgICAgICAgICAgIC8vIG5ld2x5IGFkZGVkIHRvIHRoZSBsaXN0IGlu IGEgcHJldmlvdXMgaXRlcmF0aW9uLiBUaGlzIHdvdWxkIGhhcHBlbiBpZgorICAgICAgICAgICAg ICAgLy8geW91IGhhdmUgYm90aCBhbiBleHBsaWNpdCB0cmFuc2l0aW9uLXByb3BlcnR5IGFuZCAn YWxsJyBpbiB0aGUgc2FtZQorICAgICAgICAgICAgICAgLy8gbGlzdC4gSW4gdGhpcyBjYXNlLCB0 aGUgbGF0dGVyIG9uZSBvdmVycmlkZXMgdGhlIGVhcmxpZXIgb25lLCBzbyB3ZQorICAgICAgICAg ICAgICAgLy8gYmVoYXZlIGFzIHRob3VnaCB0aGlzIGlzIGEgcnVubmluZyBhbmltYXRpb24gYmVp bmcgcmVwbGFjZWQuCiAgICAgICAgICAgICAgICAgaWYgKCFpbXBsQW5pbS0+aXNUYXJnZXRQcm9w ZXJ0eUVxdWFsKHByb3AsIHRhcmdldFN0eWxlKSkgewogICAgICAgICAgICAgICAgICAgICBpbXBs QW5pbS0+cmVzZXQocmVuZGVyZXIpOwogICAgICAgICAgICAgICAgICAgICBkZWxldGUgaW1wbEFu aW07CkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiAzNjc4NSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDA4LTA5LTIyICBDaHJpcyBNYXJyaW4g IDxjbWFycmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUZXN0Y2FzZSBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxMDExCisKKyAgICAgICAgKiB0cmFuc2l0aW9ucy9vdmVycmlkZS10cmFuc2l0 aW9uLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogdHJhbnNpdGlvbnMvb3Zl cnJpZGUtdHJhbnNpdGlvbi1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAwOC0wOS0yMiAgRGF2aWQg SHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgTGF5b3V0IHRlc3QgZm9yIGRvdWJs ZSBjbGljayBzY3JvbGxiYXIgYnVnLgpJbmRleDogTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvb3Zl cnJpZGUtdHJhbnNpdGlvbi1jcmFzaC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvdHJhbnNpdGlvbnMvb3ZlcnJpZGUtdHJhbnNpdGlvbi1jcmFzaC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy90cmFuc2l0aW9ucy9vdmVycmlkZS10cmFuc2l0 aW9uLWNyYXNoLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzIEBACitUaGlz IHRlc3RzIGEgY3Jhc2ggdGhhdCB3YXMgb2NjdXJpbmcgd2hlbiB5b3UgaGF2ZSBib3RoIGFuIGV4 cGxpY2l0IHByb3BlcnR5IGFuZCAnYWxsJyBpbiB0aGUgLXdlYmtpdC10cmFuc2l0aW9uLXByb3Bl cnR5IENTUyBwcm9wZXJ0eS4gVGhlIGNyYXNoIHdvdWxkIG9jY3VyIHdoZW4geW91IHN0YXJ0IHRo ZSB0cmFuc2l0aW9uIG9mIHRoZSBleHBsaWNpdCBwcm9wZXJ0eS4gVGhpcyB0ZXN0IHNob3VsZCBu b3QgY3Jhc2guCisKKwpJbmRleDogTGF5b3V0VGVzdHMvdHJhbnNpdGlvbnMvb3ZlcnJpZGUtdHJh bnNpdGlvbi1jcmFzaC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3RyYW5zaXRpb25z L292ZXJyaWRlLXRyYW5zaXRpb24tY3Jhc2guaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL3RyYW5zaXRpb25zL292ZXJyaWRlLXRyYW5zaXRpb24tY3Jhc2guaHRtbAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSw0MyBAQAorPCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBI VE1MIDQuMDEgVHJhbnNpdGlvbmFsLy9FTiIKKyAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1s NC9sb29zZS5kdGQiPgorCis8aHRtbCBsYW5nPSJlbiI+Cis8aGVhZD4KKyAgPG1ldGEgaHR0cC1l cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgiPgor ICA8dGl0bGU+VGVzdCBGb3IgQ3Jhc2ggV2hlbiBUcmFuc2l0aW9uIFByb3BlcnRpZXMgT3ZlcnJp ZGRlbjwvdGl0bGU+CisgIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyIgbWVkaWE9InNjcmVlbiI+Cisg ICAgI2JveCB7CisgICAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgICBoZWlnaHQ6IDEwMHB4 OworICAgICAgd2lkdGg6IDEwMHB4OworICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAg ICAgIC13ZWJraXQtdHJhbnNpdGlvbi1kdXJhdGlvbjogMXM7CisgICAgICAtd2Via2l0LXRyYW5z aXRpb24tcHJvcGVydHk6IHRvcCwgYWxsOworICAgIH0KKyAgPC9zdHlsZT4KKyAgPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wQXNU ZXh0KCk7CisgICAgfQorICAgIAorICAgIGZ1bmN0aW9uIHN0YXJ0KCkKKyAgICB7CisgICAgICAg IHZhciBib3ggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnYm94Jyk7CisgICAgICAgIGJveC5z dHlsZS50b3AgPSAnMTAwcHgnOworICAgIH0KKyAgICAKKyAgICB3aW5kb3cuYWRkRXZlbnRMaXN0 ZW5lcignbG9hZCcsIHN0YXJ0LCBmYWxzZSk7CisgICAgCisgIDwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHk+CisKKzxwPgorVGhpcyB0ZXN0cyBhIGNyYXNoIHRoYXQgd2FzIG9jY3VyaW5nIHdoZW4g eW91IGhhdmUgYm90aCBhbiBleHBsaWNpdCBwcm9wZXJ0eSBhbmQgJ2FsbCcgaW4gdGhlIC13ZWJr aXQtdHJhbnNpdGlvbi1wcm9wZXJ0eQorQ1NTIHByb3BlcnR5LiBUaGUgY3Jhc2ggd291bGQgb2Nj dXIgd2hlbiB5b3Ugc3RhcnQgdGhlIHRyYW5zaXRpb24gb2YgdGhlIGV4cGxpY2l0IHByb3BlcnR5 LiBUaGlzIHRlc3Qgc2hvdWxkIG5vdAorY3Jhc2guCis8L3A+Cis8ZGl2IGlkPSJib3giPgorPC9k aXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg==