Imported Upstream version 1.1.0

[sven/exfat-utils.git] / mkfs / cbm.c

diff --git a/mkfs/cbm.c b/mkfs/cbm.c
index c631d8a0d66edb7480a439f4010626a78a9999ec..e3e9dd28511bc629a4a698162946c81e24a8fff4 100644 (file)
--- a/mkfs/cbm.c
+++ b/mkfs/cbm.c
@@ -2,11 +2,12 @@
        cbm.c (09.11.10)
        Clusters Bitmap creation code.
 
-       Copyright (C) 2011-2013  Andrew Nayenko
+       Free exFAT implementation.
+       Copyright (C) 2011-2014  Andrew Nayenko
 
-       This program is free software: you can redistribute it and/or modify
+       This program is free software; you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
-       the Free Software Foundation, either version 3 of the License, or
+       the Free Software Foundation, either version 2 of the License, or
        (at your option) any later version.
 
        This program is distributed in the hope that it will be useful,
@@ -14,11 +15,13 @@
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.
 
-       You should have received a copy of the GNU General Public License
-       along with this program.  If not, see <http://www.gnu.org/licenses/>.
+       You should have received a copy of the GNU General Public License along
+       with this program; if not, write to the Free Software Foundation, Inc.,
+       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include <limits.h>
+#include <string.h>
 #include "cbm.h"
 #include "fat.h"
 #include "uct.h"
@@ -43,22 +46,23 @@ static int cbm_write(struct exfat_dev* dev)
                        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);
-       uint8_t* bitmap = malloc(bitmap_size);
+       bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size));
        size_t i;
 
        if (bitmap == NULL)
        {
-               exfat_error("failed to allocate bitmap of %zu bytes", bitmap_size);
+               exfat_error("failed to allocate bitmap of %zu bytes",
+                               BMAP_SIZE(bitmap_size));
                return 1;
        }
+       memset(bitmap, 0, BMAP_SIZE(bitmap_size));
 
        for (i = 0; i < bitmap_size * CHAR_BIT; i++)
                if (i < allocated_clusters)
                        BMAP_SET(bitmap, i);
-               else
-                       BMAP_CLR(bitmap, i);
        if (exfat_write(dev, bitmap, bitmap_size) < 0)
        {
+               free(bitmap);
                exfat_error("failed to write bitmap of %zu bytes", bitmap_size);
                return 1;
        }