emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb/mtab: fix xrealloc_vector fallout

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-09 19:44:08 +00:00
parent 5606b1c4f3
commit 96c45b0e0b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libbb/mtab.c
View File

@ -13,8 +13,8 @@
#if ENABLE_FEATURE_MTAB_SUPPORT #if ENABLE_FEATURE_MTAB_SUPPORT
void FAST_FUNC erase_mtab(const char *name) void FAST_FUNC erase_mtab(const char *name)
{ {
struct mntent *entries = NULL; struct mntent *entries;
int i, count = 0; int i, count;
FILE *mountTable; FILE *mountTable;
struct mntent *m; struct mntent *m;
@ -26,18 +26,21 @@ void FAST_FUNC erase_mtab(const char *name)
return; return;
} }
entries = NULL;
count = 0;
while ((m = getmntent(mountTable)) != 0) { while ((m = getmntent(mountTable)) != 0) {
entries = xrealloc(entries, 3, count); entries = xrealloc_vector(entries, 3, count);
entries[count].mnt_fsname = xstrdup(m->mnt_fsname); entries[count].mnt_fsname = xstrdup(m->mnt_fsname);
entries[count].mnt_dir = xstrdup(m->mnt_dir); entries[count].mnt_dir = xstrdup(m->mnt_dir);
entries[count].mnt_type = xstrdup(m->mnt_type); entries[count].mnt_type = xstrdup(m->mnt_type);
entries[count].mnt_opts = xstrdup(m->mnt_opts); entries[count].mnt_opts = xstrdup(m->mnt_opts);
entries[count].mnt_freq = m->mnt_freq; entries[count].mnt_freq = m->mnt_freq;
entries[count].mnt_passno = m->mnt_passno; entries[count].mnt_passno = m->mnt_passno;
i = count++; count++;
} }
endmntent(mountTable); endmntent(mountTable);
//TODO: make update atomic
mountTable = setmntent(bb_path_mtab_file, "w"); mountTable = setmntent(bb_path_mtab_file, "w");
if (mountTable) { if (mountTable) {
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {