OSDN Git Service
(root)
/
android-x86
/
external-exfat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d77d7dc
)
Fix heap corruption: bitmap_size is in bits, not bytes.
author
relan
<relan@users.noreply.github.com>
Mon, 10 Nov 2014 21:17:12 +0000
(21:17 +0000)
committer
relan
<relan@users.noreply.github.com>
Mon, 24 Aug 2015 05:26:17 +0000
(08:26 +0300)
mkfs/cbm.c
patch
|
blob
|
history
diff --git
a/mkfs/cbm.c
b/mkfs/cbm.c
index
e3e9dd2
..
e30928c
100644
(file)
--- a/
mkfs/cbm.c
+++ b/
mkfs/cbm.c
@@
-45,7
+45,7
@@
static int cbm_write(struct exfat_dev* dev)
DIV_ROUND_UP(cbm.get_size(), get_cluster_size()) +
DIV_ROUND_UP(uct.get_size(), get_cluster_size()) +
DIV_ROUND_UP(rootdir.get_size(), get_cluster_size());
DIV_ROUND_UP(cbm.get_size(), get_cluster_size()) +
DIV_ROUND_UP(uct.get_size(), get_cluster_size()) +
DIV_ROUND_UP(rootdir.get_size(), get_cluster_size());
- size_t bitmap_size =
DIV_
ROUND_UP(allocated_clusters, CHAR_BIT);
+ size_t bitmap_size = ROUND_UP(allocated_clusters, CHAR_BIT);
bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size));
size_t i;
bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size));
size_t i;
@@
-57,13
+57,14
@@
static int cbm_write(struct exfat_dev* dev)
}
memset(bitmap, 0, BMAP_SIZE(bitmap_size));
}
memset(bitmap, 0, BMAP_SIZE(bitmap_size));
- for (i = 0; i < bitmap_size
* CHAR_BIT
; i++)
+ for (i = 0; i < bitmap_size; i++)
if (i < allocated_clusters)
BMAP_SET(bitmap, i);
if (i < allocated_clusters)
BMAP_SET(bitmap, i);
- if (exfat_write(dev, bitmap, bitmap_size) < 0)
+ if (exfat_write(dev, bitmap, bitmap_size
/ CHAR_BIT
) < 0)
{
free(bitmap);
{
free(bitmap);
- exfat_error("failed to write bitmap of %zu bytes", bitmap_size);
+ exfat_error("failed to write bitmap of %zu bytes",
+ bitmap_size / CHAR_BIT);
return 1;
}
free(bitmap);
return 1;
}
free(bitmap);