59464 2011-04-26 09:22:56 -0700 Fix more strict OwnPtr in WebCore (round N). 2011-04-26 10:17:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 levin levin abarth oldest_to_newest 392507 0 levin 2011-04-26 09:22:56 -0700 Fix more strict OwnPtr in WebCore (round N). 392508 1 91117 levin 2011-04-26 09:23:26 -0700 Created attachment 91117 Patch 392527 2 91117 darin 2011-04-26 09:48:52 -0700 Comment on attachment 91117 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91117&action=review > Source/WebCore/fileapi/FileReader.cpp:171 > - m_loader = 0; > + m_loader.clear(); Anders Carlsson would much prefer that we use "= nullptr" rather than "clear()". > Source/WebCore/loader/DocumentThreadableLoader.cpp:334 > - m_actualRequest = 0; // Prevent didFinishLoading() from bypassing access check. > + m_actualRequest.clear(); // Prevent didFinishLoading() from bypassing access check. Ditto. 392543 3 levin 2011-04-26 10:17:13 -0700 Committed as http://trac.webkit.org/changeset/84923 91117 2011-04-26 09:23:26 -0700 2011-04-26 09:48:52 -0700 Patch bug-59464-20110426092325.patch text/plain 4543 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5MTcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNzRjYzk4ZTM4OWJlNWUx ODM5NTY0YzhkMjhlNWFkNjdjNTMwZjUzLi5iYWYzNGI1ZjMyYTdkOGZkZDA5N2ExNGQ4ZTBhZDhk NzU1YmEyN2Y5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDQtMjYgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEZpeCBtb3JlIHN0cmljdCBPd25QdHIgaW4gV2ViQ29yZSAo cm91bmQgTikuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01OTQ2NAorCisgICAgICAgICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6YXR0YWNo KToKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVSZWFkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RmlsZVJlYWRlcjo6dGVybWluYXRlKToKKyAgICAgICAgKiBsb2FkZXIvRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRl cjo6cHJlZmxpZ2h0RmFpbHVyZSk6CisgICAgICAgICogd29ya2Vycy9EZWZhdWx0U2hhcmVkV29y a2VyUmVwb3NpdG9yeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTaGFyZWRXb3JrZXJDb25uZWN0 VGFzazo6Y3JlYXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlNoYXJlZFdvcmtlclNjcmlwdExvYWRl cjo6bG9hZCk6CisKIDIwMTEtMDQtMjYgIEdhYm9yIExva2kgIDxsb2tpQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQ3NhYmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKaW5kZXggMzVmZTA5NmFjZDY2OTAzZTg2MTYzMTYyM2Q4ZjhiNDg2NDg2ZGM3MC4uNjky MGM1NDM0NjhlNzE4ODk5OGQ1ODgzZDU4ZGVjOWUxN2IyZTZlYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCkBAIC00NTMsOSArNDUzLDkgQEAgRG9jdW1lbnQ6OkRvY3VtZW50KEZyYW1lKiBmcmFt ZSwgY29uc3QgS1VSTCYgdXJsLCBib29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MKQogCiAgICAgbV9h eE9iamVjdENhY2hlID0gMDsKIAotICAgIG1fbWFya2VycyA9IG5ldyBEb2N1bWVudE1hcmtlckNv bnRyb2xsZXIoKTsKKyAgICBtX21hcmtlcnMgPSBhZG9wdFB0cihuZXcgRG9jdW1lbnRNYXJrZXJD b250cm9sbGVyKTsKIAotICAgIG1fY2FjaGVkUmVzb3VyY2VMb2FkZXIgPSBuZXcgQ2FjaGVkUmVz b3VyY2VMb2FkZXIodGhpcyk7CisgICAgbV9jYWNoZWRSZXNvdXJjZUxvYWRlciA9IGFkb3B0UHRy KG5ldyBDYWNoZWRSZXNvdXJjZUxvYWRlcih0aGlzKSk7CiAKICAgICBtX3Zpc3VhbGx5T3JkZXJl ZCA9IGZhbHNlOwogICAgIG1fYlBhcnNpbmcgPSBmYWxzZTsKQEAgLTE2ODEsNyArMTY4MSw3IEBA IHZvaWQgRG9jdW1lbnQ6OmF0dGFjaCgpCiAgICAgQVNTRVJUKCFtX2F4T2JqZWN0Q2FjaGUpOwog CiAgICAgaWYgKCFtX3JlbmRlckFyZW5hKQotICAgICAgICBtX3JlbmRlckFyZW5hID0gbmV3IFJl bmRlckFyZW5hKCk7CisgICAgICAgIG1fcmVuZGVyQXJlbmEgPSBhZG9wdFB0cihuZXcgUmVuZGVy QXJlbmEpOwogICAgIAogICAgIC8vIENyZWF0ZSB0aGUgcmVuZGVyaW5nIHRyZWUKICAgICBzZXRS ZW5kZXJlcihuZXcgKG1fcmVuZGVyQXJlbmEuZ2V0KCkpIFJlbmRlclZpZXcodGhpcywgdmlldygp KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyLmNwcAppbmRleCBmZDJlMjYzN2IyOWQw N2YyYWRiODY1MjQyMjU2NDkwZmRmNmNhYWU1Li5hZjhkNTk2YjRmNGZkNWNjNWI5YmJhZjRlYzAw ZTNiMjAyMjE4MGNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlci5jcHAKQEAgLTE2 OCw3ICsxNjgsNyBAQCB2b2lkIEZpbGVSZWFkZXI6OnRlcm1pbmF0ZSgpCiB7CiAgICAgaWYgKG1f bG9hZGVyKSB7CiAgICAgICAgIG1fbG9hZGVyLT5jYW5jZWwoKTsKLSAgICAgICAgbV9sb2FkZXIg PSAwOworICAgICAgICBtX2xvYWRlci5jbGVhcigpOwogICAgIH0KICAgICBtX3N0YXRlID0gQ29t cGxldGVkOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhy ZWFkYWJsZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRh YmxlTG9hZGVyLmNwcAppbmRleCBmMDI5OTRhZWQ3NDQ5MDA5MjcyOTU4NzlhOTNhMTIwYTM4Y2Nj YTI5Li5jYWQ5NThmMGRjNzM1NjVjMTg1ZDk1ZWViYjlkMDIwY2Q4YWRkOWYxIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyLmNwcApAQCAt MzMxLDcgKzMzMSw3IEBAIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpwcmVmbGlnaHRT dWNjZXNzKCkKIAogdm9pZCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OnByZWZsaWdodEZhaWx1 cmUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgZXJyb3JEZXNjcmlwdGlvbikKIHsK LSAgICBtX2FjdHVhbFJlcXVlc3QgPSAwOyAvLyBQcmV2ZW50IGRpZEZpbmlzaExvYWRpbmcoKSBm cm9tIGJ5cGFzc2luZyBhY2Nlc3MgY2hlY2suCisgICAgbV9hY3R1YWxSZXF1ZXN0LmNsZWFyKCk7 IC8vIFByZXZlbnQgZGlkRmluaXNoTG9hZGluZygpIGZyb20gYnlwYXNzaW5nIGFjY2VzcyBjaGVj ay4KICAgICBtX2NsaWVudC0+ZGlkRmFpbChSZXNvdXJjZUVycm9yKGVycm9yRG9tYWluV2ViS2l0 SW50ZXJuYWwsIDAsIHVybCwgZXJyb3JEZXNjcmlwdGlvbikpOwogfQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS93b3JrZXJzL0RlZmF1bHRTaGFyZWRXb3JrZXJSZXBvc2l0b3J5LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3Bw CmluZGV4IDMxYjJkNGZmZmZjNjk4M2JkNDlmODRiYTNlMjRlODUyMTMxMDU2NGEuLmM0Nzc4ZTMz Y2E5OTBkMGFlNWU4MjgzMWZiMDFlOTg0ZTA3NGYwYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvRGVmYXVsdFNoYXJlZFdvcmtlclJlcG9zaXRvcnkuY3BwCkBAIC0y MjUsNyArMjI1LDcgQEAgY2xhc3MgU2hhcmVkV29ya2VyQ29ubmVjdFRhc2sgOiBwdWJsaWMgU2Ny aXB0RXhlY3V0aW9uQ29udGV4dDo6VGFzayB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25Q dHI8U2hhcmVkV29ya2VyQ29ubmVjdFRhc2s+IGNyZWF0ZShQYXNzT3duUHRyPE1lc3NhZ2VQb3J0 Q2hhbm5lbD4gY2hhbm5lbCkKICAgICB7Ci0gICAgICAgIHJldHVybiBuZXcgU2hhcmVkV29ya2Vy Q29ubmVjdFRhc2soY2hhbm5lbCk7CisgICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgU2hhcmVk V29ya2VyQ29ubmVjdFRhc2soY2hhbm5lbCkpOwogICAgIH0KIAogcHJpdmF0ZToKQEAgLTI3NSw3 ICsyNzUsNyBAQCBTaGFyZWRXb3JrZXJTY3JpcHRMb2FkZXI6OlNoYXJlZFdvcmtlclNjcmlwdExv YWRlcihQYXNzUmVmUHRyPFNoYXJlZFdvcmtlcj4gd29yawogdm9pZCBTaGFyZWRXb3JrZXJTY3Jp cHRMb2FkZXI6OmxvYWQoY29uc3QgS1VSTCYgdXJsKQogewogICAgIC8vIE1hcmsgdGhpcyBvYmpl Y3QgYXMgYWN0aXZlIGZvciB0aGUgZHVyYXRpb24gb2YgdGhlIGxvYWQuCi0gICAgbV9zY3JpcHRM b2FkZXIgPSBuZXcgV29ya2VyU2NyaXB0TG9hZGVyKFJlc291cmNlUmVxdWVzdEJhc2U6OlRhcmdl dElzU2hhcmVkV29ya2VyKTsKKyAgICBtX3NjcmlwdExvYWRlciA9IGFkb3B0UHRyKG5ldyBXb3Jr ZXJTY3JpcHRMb2FkZXIoUmVzb3VyY2VSZXF1ZXN0QmFzZTo6VGFyZ2V0SXNTaGFyZWRXb3JrZXIp KTsKICAgICBtX3NjcmlwdExvYWRlci0+bG9hZEFzeW5jaHJvbm91c2x5KG1fd29ya2VyLT5zY3Jp cHRFeGVjdXRpb25Db250ZXh0KCksIHVybCwgRGVueUNyb3NzT3JpZ2luUmVxdWVzdHMsIHRoaXMp OwogCiAgICAgLy8gU3RheSBhbGl2ZSAoYW5kIGtlZXAgdGhlIFNoYXJlZFdvcmtlciBhbmQgSlMg d3JhcHBlciBhbGl2ZSkgdW50aWwgdGhlIGxvYWQgZmluaXNoZXMuCg==