29929 2009-09-30 10:02:44 -0700 Need to check NULL frame in EventHandler::updateDragAndDrop. 2009-09-30 10:56:20 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 jianli jianli oldest_to_newest 151276 0 jianli 2009-09-30 10:02:44 -0700 We need to check NULL frame in EventHandler::updateDragAndDrop. Otherwise, if we drag something to an iframe with invalid source, it might crash. 151279 1 40379 jianli 2009-09-30 10:09:18 -0700 Created attachment 40379 Proposed Patch 151281 2 40379 darin 2009-09-30 10:10:51 -0700 Comment on attachment 40379 Proposed Patch > - if (newTarget->hasTagName(frameTag) || newTarget->hasTagName(iframeTag)) > - accept = static_cast<HTMLFrameElementBase*>(newTarget)->contentFrame()->eventHandler()->updateDragAndDrop(event, clipboard); > + Frame* frame = (newTarget->hasTagName(frameTag) || newTarget->hasTagName(iframeTag)) > + ? static_cast<HTMLFrameElementBase*>(newTarget)->contentFrame() : 0; We don't line up ? characters like this. In fact, I'm not sure why it's indented the way it is. Just indent four characters as you would anywhere else. r=me 151289 3 jianli 2009-09-30 10:16:41 -0700 (In reply to comment #2) > (From update of attachment 40379 [details]) > > - if (newTarget->hasTagName(frameTag) || newTarget->hasTagName(iframeTag)) > > - accept = static_cast<HTMLFrameElementBase*>(newTarget)->contentFrame()->eventHandler()->updateDragAndDrop(event, clipboard); > > + Frame* frame = (newTarget->hasTagName(frameTag) || newTarget->hasTagName(iframeTag)) > > + ? static_cast<HTMLFrameElementBase*>(newTarget)->contentFrame() : 0; > > We don't line up ? characters like this. In fact, I'm not sure why it's > indented the way it is. Just indent four characters as you would anywhere else. > > r=me I just copied the same code structure from the nearby code. I will fix both occurrences when I land the change. Thanks. 151295 4 jianli 2009-09-30 10:56:20 -0700 Committed as http://trac.webkit.org/changeset/48934. 40379 2009-09-30 10:09:18 -0700 2009-09-30 10:10:51 -0700 Proposed Patch 29929 text/plain 4822 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYWI1ZmQ2Li5mZTU2YjM2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDkt MzAgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgdG8gY2hlY2sgTlVMTCBmcmFtZSBpbiBF dmVudEhhbmRsZXI6OnVwZGF0ZURyYWdBbmREcm9wLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk5MjkKKworICAgICAgICBBZGQgYSBuZXcgdGVzdCBm b3IgdGhlIGJ1Zy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvbWlzYy9kcmFnLW92ZXItaWZyYW1l LWludmFsaWQtc291cmNlLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0 cC90ZXN0cy9taXNjL2RyYWctb3Zlci1pZnJhbWUtaW52YWxpZC1zb3VyY2UtY3Jhc2guaHRtbDog QWRkZWQuCisKIDIwMDktMDktMjggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQnJhZHkgRWlkc29uLgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9taXNjL2RyYWctb3Zlci1pZnJhbWUtaW52YWxpZC1zb3VyY2UtY3Jh c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNjL2RyYWctb3Zlci1p ZnJhbWUtaW52YWxpZC1zb3VyY2UtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NzU1CmluZGV4IDAwMDAwMDAuLmI0YmNjY2MKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL21pc2MvZHJhZy1vdmVyLWlmcmFtZS1pbnZhbGlkLXNvdXJjZS1jcmFzaC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw2IEBACitDT05TT0xFIE1FU1NBR0U6IGxpbmUgMDogTm90 IGFsbG93ZWQgdG8gbG9hZCBsb2NhbCByZXNvdXJjZTogZmlsZToKK1RoaXMgcGFnZSB0ZXN0cyB0 aGF0IHdlIGRvbid0IGNyYXNoIGlmIHdlIGRyYWcgc29tZXRoaW5nIHRvIGFuIGlmcmFtZSB0aGF0 IGhhcyBhbiBpbnZhbGlkIHNvdXJjZS4KKworCitTVUNDRVNTIC0gZGlkbid0IGNyYXNoCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy9kcmFnLW92ZXItaWZyYW1lLWlu dmFsaWQtc291cmNlLWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvZHJh Zy1vdmVyLWlmcmFtZS1pbnZhbGlkLXNvdXJjZS1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NzU1CmluZGV4IDAwMDAwMDAuLjNkMzczMjYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL21pc2MvZHJhZy1vdmVyLWlmcmFtZS1pbnZhbGlkLXNvdXJjZS1jcmFzaC5o dG1sCkBAIC0wLDAgKzEsMjIgQEAKKzxoZWFkPgorPHNjcmlwdD4KK3dpbmRvdy5vbmxvYWQgPSBm dW5jdGlvbiAoKSB7CisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOyAKKworICAgIHZhciBhYmUgPSBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYWJlIik7CisgICAgdmFyIGRyYWdUYXJnZXQgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZHJhZ1RhcmdldCIpOworCisgICAgZXZlbnRTZW5kZXIubW91 c2VNb3ZlVG8oYWJlLm9mZnNldExlZnQgKyA1MCwgYWJlLm9mZnNldFRvcCArIDUwKTsKKyAgICBl dmVudFNlbmRlci5tb3VzZURvd24oKTsKKyAgICBldmVudFNlbmRlci5sZWFwRm9yd2FyZCg1MDAp OworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKGRyYWdUYXJnZXQub2Zmc2V0TGVmdCArIDEw LCBkcmFnVGFyZ2V0Lm9mZnNldFRvcCArIDEwKTsKKyAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7 Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKworPHA+VGhpcyBwYWdlIHRlc3RzIHRoYXQgd2UgZG9u J3QgY3Jhc2ggaWYgd2UgZHJhZyBzb21ldGhpbmcgdG8gYW4gaWZyYW1lIHRoYXQgaGFzIGFuIGlu dmFsaWQgc291cmNlLjwvcD4KKzxpbWcgaWQ9ImFiZSIgc3JjPSJodHRwOi8vMTI3LjAuMC4xOjgw MDAvc2VjdXJpdHkvcmVzb3VyY2VzL2FiZS5wbmciPgorPGRpdj5TVUNDRVNTIC0gZGlkbid0IGNy YXNoPC9kaXY+Cis8aWZyYW1lIGlkPSJkcmFnVGFyZ2V0IiBzcmM9ImZpbGU6Ij48L2lmcmFtZT4g CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4 IDQ1NDJiZjQuLjNhNTAxNmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDktMDktMzAgIEppYW4gTGkgIDxq aWFubGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIE5lZWQgdG8gY2hlY2sgTlVMTCBmcmFtZSBpbiBFdmVudEhhbmRsZXI6OnVw ZGF0ZURyYWdBbmREcm9wLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9Mjk5MjkKKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21pc2MvZHJhZy1vdmVy LWlmcmFtZS1pbnZhbGlkLXNvdXJjZS1jcmFzaC5odG1sCisKKyAgICAgICAgKiBwYWdlL0V2ZW50 SGFuZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OnVwZGF0ZURyYWdB bmREcm9wKToKKwogMjAwOS0wOS0yOCAgR2VvZmZyZXkgR2FyZW4gIDxnZ2FyZW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmlu ZGV4IDM3NzJkNjUuLjI5OGVlMTggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0xNTI2LDggKzE1 MjYsMTAgQEAgYm9vbCBFdmVudEhhbmRsZXI6OnVwZGF0ZURyYWdBbmREcm9wKGNvbnN0IFBsYXRm b3JtTW91c2VFdmVudCYgZXZlbnQsIENsaXBib2FyZCoKICAgICAgICAgLy8gaXQgaXMgc29tZXRp bWVzIGluY29ycmVjdCB3aGVuIGRyYWdnaW5nIHdpdGhpbiBzdWJmcmFtZXMsIGFzIHNlZW4gd2l0 aAogICAgICAgICAvLyBMYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9kcmFnLWluLWZyYW1lcy5odG1s LgogICAgICAgICBpZiAobmV3VGFyZ2V0KSB7Ci0gICAgICAgICAgICBpZiAobmV3VGFyZ2V0LT5o YXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBuZXdUYXJnZXQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkK LSAgICAgICAgICAgICAgICBhY2NlcHQgPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVtZW50QmFz ZSo+KG5ld1RhcmdldCktPmNvbnRlbnRGcmFtZSgpLT5ldmVudEhhbmRsZXIoKS0+dXBkYXRlRHJh Z0FuZERyb3AoZXZlbnQsIGNsaXBib2FyZCk7CisgICAgICAgICAgICBGcmFtZSogZnJhbWUgPSAo bmV3VGFyZ2V0LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBuZXdUYXJnZXQtPmhhc1RhZ05hbWUo aWZyYW1lVGFnKSkgCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgPyBzdGF0aWNfY2FzdDxI VE1MRnJhbWVFbGVtZW50QmFzZSo+KG5ld1RhcmdldCktPmNvbnRlbnRGcmFtZSgpIDogMDsKKyAg ICAgICAgICAgIGlmIChmcmFtZSkKKyAgICAgICAgICAgICAgICBhY2NlcHQgPSBmcmFtZS0+ZXZl bnRIYW5kbGVyKCktPnVwZGF0ZURyYWdBbmREcm9wKGV2ZW50LCBjbGlwYm9hcmQpOwogICAgICAg ICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGFjY2VwdCA9IGRpc3BhdGNoRHJhZ0V2ZW50KGV2 ZW50TmFtZXMoKS5kcmFnZW50ZXJFdmVudCwgbmV3VGFyZ2V0LCBldmVudCwgY2xpcGJvYXJkKTsK ICAgICAgICAgfQpAQCAtMTU0Miw4ICsxNTQ0LDEwIEBAIGJvb2wgRXZlbnRIYW5kbGVyOjp1cGRh dGVEcmFnQW5kRHJvcChjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQmIGV2ZW50LCBDbGlwYm9hcmQq CiAgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBpZiAobmV3VGFyZ2V0KSB7Ci0gICAg ICAgICAgICBpZiAobmV3VGFyZ2V0LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBuZXdUYXJnZXQt Pmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkKLSAgICAgICAgICAgICAgICBhY2NlcHQgPSBzdGF0aWNf Y2FzdDxIVE1MRnJhbWVFbGVtZW50QmFzZSo+KG5ld1RhcmdldCktPmNvbnRlbnRGcmFtZSgpLT5l dmVudEhhbmRsZXIoKS0+dXBkYXRlRHJhZ0FuZERyb3AoZXZlbnQsIGNsaXBib2FyZCk7CisgICAg ICAgICAgICBGcmFtZSogZnJhbWUgPSAobmV3VGFyZ2V0LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8 fCBuZXdUYXJnZXQtPmhhc1RhZ05hbWUoaWZyYW1lVGFnKSkgCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPyBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVtZW50QmFzZSo+KG5ld1RhcmdldCkt PmNvbnRlbnRGcmFtZSgpIDogMDsKKyAgICAgICAgICAgIGlmIChmcmFtZSkKKyAgICAgICAgICAg ICAgICBhY2NlcHQgPSBmcmFtZS0+ZXZlbnRIYW5kbGVyKCktPnVwZGF0ZURyYWdBbmREcm9wKGV2 ZW50LCBjbGlwYm9hcmQpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgIGFjY2Vw dCA9IGRpc3BhdGNoRHJhZ0V2ZW50KGV2ZW50TmFtZXMoKS5kcmFnb3ZlckV2ZW50LCBuZXdUYXJn ZXQsIGV2ZW50LCBjbGlwYm9hcmQpOwogICAgICAgICB9Cg==