Merge branch 'maint' into next

[tools/e2fsprogs.git] / lib / ext2fs / imager.c

diff --git a/lib/ext2fs/imager.c b/lib/ext2fs/imager.c
index 1aebe62..586227f 100644 (file)
--- a/lib/ext2fs/imager.c
+++ b/lib/ext2fs/imager.c
@@ -249,10 +249,10 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd,
         * if needed
         */
        groups_per_block = EXT2_DESC_PER_BLOCK(fs->super);
-       gdp = (struct ext2_group_desc *) cp;
        for (j=0; j < groups_per_block*fs->desc_blocks; j++) {
                gdp = ext2fs_group_desc(fs, fs->group_desc, j);
-               ext2fs_swap_group_desc2(fs, gdp);
+               if (gdp)
+                       ext2fs_swap_group_desc2(fs, gdp);
        }
 #endif
 
@@ -261,10 +261,10 @@ errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd,
 
 #ifdef WORDS_BIGENDIAN
        groups_per_block = EXT2_DESC_PER_BLOCK(fs->super);
-       gdp = (struct ext2_group_desc *) cp;
        for (j=0; j < groups_per_block*fs->desc_blocks; j++) {
                gdp = ext2fs_group_desc(fs, fs->group_desc, j);
-               ext2fs_swap_group_desc2(fs, gdp);
+               if (gdp)
+                       ext2fs_swap_group_desc2(fs, gdp);
        }
 #endif