58172 2011-04-08 16:10:58 -0700 Fix -Wcast-align warning in WebBasePluginPackage.mm 2011-04-13 12:31:10 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ddkilzer ddkilzer andersca darin webkit.review.bot zwarich oldest_to_newest 382631 0 88891 ddkilzer 2011-04-08 16:10:58 -0700 Created attachment 88891 Patch Reviewed by NOBODY (OOPS!). Fixes the following warning with -Wcast-align enabled: Source/WebKit/mac/Plugins/WebBasePluginPackage.mm:402:21:{402:21-402:93}{402:39-402:93}: error: cast from 'uint8_t *' (aka 'unsigned char *') to 'struct fat_arch *' increases required alignment from 1 to 4 [-Werror,-Wcast-align,3] archs = (struct fat_arch*)((uint8_t*)rawData.data() + sizeof(struct fat_header)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Plugins/WebBasePluginPackage.mm: (-[WebBasePluginPackage isNativeLibraryData:]): Remove cast to (uint8_t*). The rawData Vector uses a type of uint32_t, and struct fat_header contains two uint32_t data members, so there is no need to cast to uint8_t* here. --- 2 files changed, 19 insertions(+), 1 deletions(-) 382632 1 webkit.review.bot 2011-04-08 16:13:46 -0700 Attachment 88891 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/mac/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/mac/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 382644 2 88891 ddkilzer 2011-04-08 16:40:17 -0700 Comment on attachment 88891 Patch Cameron pointed out that my pointer math is incorrect. New patch forthcoming. 382679 3 88907 ddkilzer 2011-04-08 17:31:22 -0700 Created attachment 88907 Patch v2 385144 4 ddkilzer 2011-04-13 12:31:10 -0700 Committed r83755: <http://trac.webkit.org/changeset/83755> 88891 2011-04-08 16:10:58 -0700 2011-04-08 16:40:38 -0700 Patch 20110408161057.patch text/plain 2306 ddkilzer U3VidmVyc2lvbiBSZXZpc2lvbjogODMzMDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAzMWQzNDcxMzI5 NzM1MThlNDYyM2UxMmNmZDRmYjQ0NTRiNWNjNDhmLi5iMjcyYmViODRiZmY4Y2M3NmRlY2ZkMmUx MjI0YWJhNmJhMzdhNTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEt MDQtMDggIERhdmlkIEtpbHplciAgPGRka2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0 cDovL3dlYmtpdC5vcmcvYi8wMDAwMD4gRml4IC1XY2FzdC1hbGlnbiB3YXJuaW5nIGluIFdlYkJh c2VQbHVnaW5QYWNrYWdlLm1tCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRml4ZXMgdGhlIGZvbGxvd2luZyB3YXJuaW5nIHdpdGggLVdjYXN0LWFsaWdu IGVuYWJsZWQ6CisKKyAgICAgICAgICAgIFNvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFz ZVBsdWdpblBhY2thZ2UubW06NDAyOjIxOns0MDI6MjEtNDAyOjkzfXs0MDI6MzktNDAyOjkzfTog ZXJyb3I6IGNhc3QgZnJvbSAndWludDhfdCAqJyAoYWthICd1bnNpZ25lZCBjaGFyIConKSB0byAn c3RydWN0IGZhdF9hcmNoIConIGluY3JlYXNlcyByZXF1aXJlZCBhbGlnbm1lbnQgZnJvbSAxIHRv IDQgWy1XZXJyb3IsLVdjYXN0LWFsaWduLDNdCisgICAgICAgICAgICAgICAgICAgICAgICAgYXJj aHMgPSAoc3RydWN0IGZhdF9hcmNoKikoKHVpbnQ4X3QqKXJhd0RhdGEuZGF0YSgpICsgc2l6ZW9m KHN0cnVjdCBmYXRfaGVhZGVyKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBe fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn4KKworICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2Uu bW06CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIGlzTmF0aXZlTGlicmFyeURhdGE6 XSk6IFJlbW92ZSBjYXN0IHRvCisgICAgICAgICh1aW50OF90KikuICBUaGUgcmF3RGF0YSBWZWN0 b3IgdXNlcyBhIHR5cGUgb2YgdWludDMyX3QsIGFuZAorICAgICAgICBzdHJ1Y3QgZmF0X2hlYWRl ciBjb250YWlucyB0d28gdWludDMyX3QgZGF0YSBtZW1iZXJzLCBzbyB0aGVyZQorICAgICAgICBp cyBubyBuZWVkIHRvIGNhc3QgdG8gdWludDhfdCogaGVyZS4KKwogMjAxMS0wNC0wNyAgQW5kcmV3 IFNjaGVya3VzICA8c2NoZXJrdXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmVydCBFTkFC TEVfVFJBQ0sgcGF0Y2ggZHVlIHRvIGNvbXBpbGUgZmFpbHVyZXMuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tIGIvU291cmNlL1dl YktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQppbmRleCAzZmI4NmNiOTMy ZDkxNTUwNWEwZGY4MmU4NmExNzkzMTdmYjk5ZmQzLi5kYzhhNjE1ZWRkMDg4MjUwM2Y1YWU5NzFj NWQ4YjNiODQ5YTQ5NmVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5zL1dl YkJhc2VQbHVnaW5QYWNrYWdlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2Vi QmFzZVBsdWdpblBhY2thZ2UubW0KQEAgLTQwMyw3ICs0MDMsNyBAQCAtIChCT09MKWlzTmF0aXZl TGlicmFyeURhdGE6KE5TRGF0YSAqKWRhdGEKICAgICAgICAgICAgIGlmIChtYWdpYyA9PSBGQVRf Q0lHQU0pCiAgICAgICAgICAgICAgICAgc3dhcEludHNJbkhlYWRlcihyYXdEYXRhLmRhdGEoKSwg cmF3RGF0YS5zaXplKCkpOwogICAgICAgICAgICAgCi0gICAgICAgICAgICBhcmNocyA9IChzdHJ1 Y3QgZmF0X2FyY2gqKSgodWludDhfdCopcmF3RGF0YS5kYXRhKCkgKyBzaXplb2Yoc3RydWN0IGZh dF9oZWFkZXIpKTsgICAgICAgICAgICAKKyAgICAgICAgICAgIGFyY2hzID0gKHN0cnVjdCBmYXRf YXJjaCopKHJhd0RhdGEuZGF0YSgpICsgc2l6ZW9mKHN0cnVjdCBmYXRfaGVhZGVyKSk7ICAgICAg ICAgICAgCiAgICAgICAgICAgICBudW1BcmNocyA9ICgoc3RydWN0IGZhdF9oZWFkZXIgKilyYXdE YXRhLmRhdGEoKSktPm5mYXRfYXJjaDsKICAgICAgICAgICAgIAogICAgICAgICAgICAgdW5zaWdu ZWQgbWF4QXJjaHMgPSAoc2l6ZUluQnl0ZXMgLSBzaXplb2Yoc3RydWN0IGZhdF9oZWFkZXIpKSAv IHNpemVvZihzdHJ1Y3QgZmF0X2FyY2gpOwo= 88907 2011-04-08 17:31:22 -0700 2011-04-12 13:39:25 -0700 Patch v2 fix-bug-58172-v2.diff text/plain 3577 ddkilzer Y29tbWl0IDIwZWNmOTFjMTA4OGMxYzYwNDViYmVjMDE0NmU1ZWQ4YmY2YTNiMTUKQXV0aG9yOiBE YXZpZCBLaWx6ZXIgPGRka2lsemVyQGFwcGxlLmNvbT4KRGF0ZTogICBGcmkgQXByIDggMTc6MjU6 NDAgMjAxMSAtMDcwMAoKICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzU4MTcyPiBGaXggLVdjYXN0 LWFsaWduIHdhcm5pbmcgaW4gV2ViQmFzZVBsdWdpblBhY2thZ2UubW0KICAgIAogICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAgICAKICAgIEZpeGVzIHRoZSBmb2xsb3dpbmcgd2Fybmlu ZyB3aXRoIC1XY2FzdC1hbGlnbiBlbmFibGVkOgogICAgCiAgICAgICAgU291cmNlL1dlYktpdC9t YWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbTo0MDI6MjE6ezQwMjoyMS00MDI6OTN9 ezQwMjozOS00MDI6OTN9OiBlcnJvcjogY2FzdCBmcm9tICd1aW50OF90IConIChha2EgJ3Vuc2ln bmVkIGNoYXIgKicpIHRvICdzdHJ1Y3QgZmF0X2FyY2ggKicgaW5jcmVhc2VzIHJlcXVpcmVkIGFs aWdubWVudCBmcm9tIDEgdG8gNCBbLVdlcnJvciwtV2Nhc3QtYWxpZ24sM10KICAgICAgICAgICAg ICAgICAgICAgYXJjaHMgPSAoc3RydWN0IGZhdF9hcmNoKikoKHVpbnQ4X3QqKXJhd0RhdGEuZGF0 YSgpICsgc2l6ZW9mKHN0cnVjdCBmYXRfaGVhZGVyKSk7CiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgXn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+CiAgICAKICAgICogUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFj a2FnZS5tbToKICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIGlzTmF0aXZlTGlicmFyeURhdGE6 XSk6IEFkZGVkCiAgICBDT01QSUxFX0FTU0VSVCgpIHRvIG1ha2Ugc3VyZSBvdXIgcG9pbnRlciBt YXRoIGlzIHZhbGlkLgogICAgUmVtb3ZlZCBjYXN0IHRvICh1aW50OF90KikgYW5kIGRpdmlkZSBz aXplb2Yoc3RydWN0IGZhdF9oZWFkZXIpCiAgICBieSBzaXplb2YodWludDMyX3QpIHRvIGZpeCB0 aGUgcG9pbnRlciBtYXRoLiAgUmVwbGFjZWQgQy1zdHlsZQogICAgY2FzdHMgd2l0aCByZWludGVy cHJldF9jYXN0LgoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAzMWQzNDcxLi40NTU0ZDQ1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDQtMDggIERhdmlkIEtpbHplciAgPGRk a2lsemVyQGFwcGxlLmNvbT4KKworICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi81ODE3Mj4g Rml4IC1XY2FzdC1hbGlnbiB3YXJuaW5nIGluIFdlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZXMgdGhlIGZv bGxvd2luZyB3YXJuaW5nIHdpdGggLVdjYXN0LWFsaWduIGVuYWJsZWQ6CisKKyAgICAgICAgICAg IFNvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW06NDAyOjIx Ons0MDI6MjEtNDAyOjkzfXs0MDI6MzktNDAyOjkzfTogZXJyb3I6IGNhc3QgZnJvbSAndWludDhf dCAqJyAoYWthICd1bnNpZ25lZCBjaGFyIConKSB0byAnc3RydWN0IGZhdF9hcmNoIConIGluY3Jl YXNlcyByZXF1aXJlZCBhbGlnbm1lbnQgZnJvbSAxIHRvIDQgWy1XZXJyb3IsLVdjYXN0LWFsaWdu LDNdCisgICAgICAgICAgICAgICAgICAgICAgICAgYXJjaHMgPSAoc3RydWN0IGZhdF9hcmNoKiko KHVpbnQ4X3QqKXJhd0RhdGEuZGF0YSgpICsgc2l6ZW9mKHN0cnVjdCBmYXRfaGVhZGVyKSk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBefn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+ fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn4KKworICAgICAg ICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW06CisgICAgICAgICgtW1dlYkJhc2VQ bHVnaW5QYWNrYWdlIGlzTmF0aXZlTGlicmFyeURhdGE6XSk6IEFkZGVkCisgICAgICAgIENPTVBJ TEVfQVNTRVJUKCkgdG8gbWFrZSBzdXJlIG91ciBwb2ludGVyIG1hdGggaXMgdmFsaWQuCisgICAg ICAgIFJlbW92ZWQgY2FzdCB0byAodWludDhfdCopIGFuZCBkaXZpZGUgc2l6ZW9mKHN0cnVjdCBm YXRfaGVhZGVyKQorICAgICAgICBieSBzaXplb2YodWludDMyX3QpIHRvIGZpeCB0aGUgcG9pbnRl ciBtYXRoLiAgUmVwbGFjZWQgQy1zdHlsZQorICAgICAgICBjYXN0cyB3aXRoIHJlaW50ZXJwcmV0 X2Nhc3QuCisKIDIwMTEtMDQtMDcgIEFuZHJldyBTY2hlcmt1cyAgPHNjaGVya3VzQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBSZXZlcnQgRU5BQkxFX1RSQUNLIHBhdGNoIGR1ZSB0byBjb21waWxl IGZhaWx1cmVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNl UGx1Z2luUGFja2FnZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdp blBhY2thZ2UubW0KaW5kZXggM2ZiODZjYi4uMTI4ODM0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCkBAIC00MDMsOCArNDAzLDkg QEAgLSAoQk9PTClpc05hdGl2ZUxpYnJhcnlEYXRhOihOU0RhdGEgKilkYXRhCiAgICAgICAgICAg ICBpZiAobWFnaWMgPT0gRkFUX0NJR0FNKQogICAgICAgICAgICAgICAgIHN3YXBJbnRzSW5IZWFk ZXIocmF3RGF0YS5kYXRhKCksIHJhd0RhdGEuc2l6ZSgpKTsKICAgICAgICAgICAgIAotICAgICAg ICAgICAgYXJjaHMgPSAoc3RydWN0IGZhdF9hcmNoKikoKHVpbnQ4X3QqKXJhd0RhdGEuZGF0YSgp ICsgc2l6ZW9mKHN0cnVjdCBmYXRfaGVhZGVyKSk7ICAgICAgICAgICAgCi0gICAgICAgICAgICBu dW1BcmNocyA9ICgoc3RydWN0IGZhdF9oZWFkZXIgKilyYXdEYXRhLmRhdGEoKSktPm5mYXRfYXJj aDsKKyAgICAgICAgICAgIENPTVBJTEVfQVNTRVJUKHNpemVvZihzdHJ1Y3QgZmF0X2hlYWRlcikg JSBzaXplb2YodWludDMyX3QpID09IDAsIHN0cnVjdF9mYXRfaGVhZGVyX211c3RfYmVfaW50ZWdy YWxfc2l6ZV9vZl91aW50MzJfdCk7CisgICAgICAgICAgICBhcmNocyA9IHJlaW50ZXJwcmV0X2Nh c3Q8c3RydWN0IGZhdF9hcmNoKj4ocmF3RGF0YS5kYXRhKCkgKyBzaXplb2Yoc3RydWN0IGZhdF9o ZWFkZXIpIC8gc2l6ZW9mKHVpbnQzMl90KSk7CisgICAgICAgICAgICBudW1BcmNocyA9IHJlaW50 ZXJwcmV0X2Nhc3Q8c3RydWN0IGZhdF9oZWFkZXIqPihyYXdEYXRhLmRhdGEoKSktPm5mYXRfYXJj aDsKICAgICAgICAgICAgIAogICAgICAgICAgICAgdW5zaWduZWQgbWF4QXJjaHMgPSAoc2l6ZUlu Qnl0ZXMgLSBzaXplb2Yoc3RydWN0IGZhdF9oZWFkZXIpKSAvIHNpemVvZihzdHJ1Y3QgZmF0X2Fy Y2gpOwogICAgICAgICAgICAgaWYgKG51bUFyY2hzID4gbWF4QXJjaHMpCg==