From 21a8b9c2ac453dce1cfe26cca6f2ba14964c29f5 Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Mon, 11 May 2009 19:22:34 +0300 Subject: ubi-utils: fix memory corruptions This patch contains changes similar to the ones in the previous patch. Also, it changes all invocations of memset and makes sure the argument is 0, not '\0', because memset expects int, not char. Signed-off-by: Artem Bityutskiy --- ubi-utils/src/libubigen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ubi-utils/src/libubigen.c') diff --git a/ubi-utils/src/libubigen.c b/ubi-utils/src/libubigen.c index fddc1d8..a34963e 100644 --- a/ubi-utils/src/libubigen.c +++ b/ubi-utils/src/libubigen.c @@ -122,7 +122,7 @@ int ubigen_add_volume(const struct ubigen_info *ui, return errmsg("too large alignment %d, max is %d (LEB size)", vi->alignment, ui->leb_size); - memset(vtbl_rec, '\0', sizeof(struct ubi_vtbl_record)); + memset(vtbl_rec, 0, sizeof(struct ubi_vtbl_record)); tmp = (vi->bytes + ui->leb_size - 1) / ui->leb_size; vtbl_rec->reserved_pebs = cpu_to_be32(tmp); vtbl_rec->alignment = cpu_to_be32(vi->alignment); @@ -151,7 +151,7 @@ void ubigen_init_ec_hdr(const struct ubigen_info *ui, { uint32_t crc; - memset(hdr, '\0', sizeof(struct ubi_ec_hdr)); + memset(hdr, 0, sizeof(struct ubi_ec_hdr)); hdr->magic = cpu_to_be32(UBI_EC_HDR_MAGIC); hdr->version = ui->ubi_ver; @@ -183,7 +183,7 @@ static void init_vid_hdr(const struct ubigen_info *ui, { uint32_t crc; - memset(hdr, '\0', sizeof(struct ubi_vid_hdr)); + memset(hdr, 0, sizeof(struct ubi_vid_hdr)); hdr->magic = cpu_to_be32(UBI_VID_HDR_MAGIC); hdr->version = ui->ubi_ver; -- cgit v1.2.3