diff options
Diffstat (limited to 'meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0019-Make-sure-superblock-is-clear-on-allocation.patch')
-rw-r--r-- | meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0019-Make-sure-superblock-is-clear-on-allocation.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0019-Make-sure-superblock-is-clear-on-allocation.patch b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0019-Make-sure-superblock-is-clear-on-allocation.patch deleted file mode 100644 index a75a8128cc..0000000000 --- a/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/0019-Make-sure-superblock-is-clear-on-allocation.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: inappropriate | ||
2 | |||
3 | From a263cdabad01ba99581b26d1753cd459f2669413 Mon Sep 17 00:00:00 2001 | ||
4 | From: Corey Minyard <cminyard@mvista.com> | ||
5 | Date: Tue, 7 Jun 2011 09:14:19 -0500 | ||
6 | Subject: [PATCH 19/19] Make sure superblock is clear on allocation | ||
7 | |||
8 | Use calloc, not malloc, so the allocated superblock is zero-ed. Also, | ||
9 | get rid of some unnecessary casts. | ||
10 | --- | ||
11 | genext2fs.c | 6 +++--- | ||
12 | 1 files changed, 3 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/genext2fs.c b/genext2fs.c | ||
15 | index 28ba94f..fab90be 100644 | ||
16 | --- a/genext2fs.c | ||
17 | +++ b/genext2fs.c | ||
18 | @@ -2447,10 +2447,10 @@ init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, | ||
19 | fs->nheadblocks = (((nbgroups * sizeof(groupdescriptor)) | ||
20 | + sizeof(superblock) + (BLOCKSIZE - 1)) | ||
21 | / BLOCKSIZE); | ||
22 | - fs->sb = (superblock *) malloc(BLOCKSIZE); | ||
23 | + fs->sb = calloc(1, BLOCKSIZE); | ||
24 | if (!fs->sb) | ||
25 | error_msg_and_die("error allocating header memory"); | ||
26 | - fs->gd = (groupdescriptor *) calloc(fs->nheadblocks - 1, BLOCKSIZE); | ||
27 | + fs->gd = calloc(fs->nheadblocks - 1, BLOCKSIZE); | ||
28 | if (!fs->gd) | ||
29 | error_msg_and_die("error allocating header memory"); | ||
30 | |||
31 | @@ -2595,7 +2595,7 @@ load_fs(FILE * fh, int swapit, char *fname) | ||
32 | |||
33 | /* Read and check the superblock, then read the superblock | ||
34 | * and all the group descriptors */ | ||
35 | - fs->sb = malloc(BLOCKSIZE); | ||
36 | + fs->sb = calloc(1, BLOCKSIZE); | ||
37 | if (!fs->sb) | ||
38 | error_msg_and_die("error allocating header memory"); | ||
39 | if (fseek(fs->f, BLOCKSIZE, SEEK_SET)) | ||
40 | -- | ||
41 | 1.7.4.1 | ||
42 | |||