OpenWrt – Rev 4

Subversion Repositories:
Rev:
Index: genext2fs/genext2fs.c
===================================================================
--- genext2fs.orig/genext2fs.c  2011-11-29 17:36:06.000000000 +0100
+++ genext2fs/genext2fs.c       2011-11-29 17:37:37.000000000 +0100
@@ -1779,7 +1779,8 @@
        assert(nod->i_block[EXT2_DIND_BLOCK] != 0);
        for(i = 0; i < BLOCKSIZE/4; i++)
                if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
-                       swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+                       if (((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])
+                               swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
        swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
        if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
                return;
@@ -1792,7 +1793,8 @@
                                     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
                                     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
                                     j*(BLOCKSIZE/4)) ) 
-                         swap_block(get_blk(fs,b2[j]));
+                         if (b2[j])
+                               swap_block(get_blk(fs,b2[j]));
                        else {
                          done = 1;
                          break;
@@ -1825,7 +1827,8 @@
        swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]));
        for(i = 0; i < BLOCKSIZE/4; i++)
                if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i )
-                       swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
+                       if (((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])
+                               swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i]));
        if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4)
                return;
        /* Adding support for triple indirection */
@@ -1839,7 +1842,8 @@
                                     (BLOCKSIZE/4)*(BLOCKSIZE/4) + 
                                     i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + 
                                     j*(BLOCKSIZE/4)) ) 
-                         swap_block(get_blk(fs,b2[j]));
+                         if (b2[j])
+                               swap_block(get_blk(fs,b2[j]));
                        else {
                          done = 1;
                          break;