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

* all mallocs now use xmalloc (and so are OOM error safe), and

Browse Source 
the common error handling saves a few bytes.  Thanks to
Bob Tinsley <bob@earthrise.demon.co.uk> for the patch.
 -Erik
This commit is contained in:
Erik Andersen 2000-03-21 22:32:57 +00:00
parent c053e41fa0
commit 0d068a2067
19 changed files with 47 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -52,6 +52,9 @@
to match the terminal (defaults to width=79 when this is off). to match the terminal (defaults to width=79 when this is off).
* Fixed mount'ing loop devices when the filesystem type was not * Fixed mount'ing loop devices when the filesystem type was not
specified. It used to revert to non-loop after the first try. specified. It used to revert to non-loop after the first try.
* all mallocs now use xmalloc (and so are OOM error safe), and
the common error handling saves a few bytes. Thanks to
Bob Tinsley <bob@earthrise.demon.co.uk> for the patch.
-Erik Andersen -Erik Andersen

2
coreutils/date.c
View File

@ -276,7 +276,7 @@ int date_main(int argc, char **argv)
} }
/* Print OUTPUT (after ALL that!) */ /* Print OUTPUT (after ALL that!) */
t_buff = malloc(201); t_buff = xmalloc(201);
strftime(t_buff, 200, date_fmt, &tm_time); strftime(t_buff, 200, date_fmt, &tm_time);
printf("%s\n", t_buff); printf("%s\n", t_buff);

6
coreutils/dd.c
View File

@ -114,11 +114,7 @@ extern int dd_main(int argc, char **argv)
argv++; argv++;
} }
buf = malloc(blockSize); buf = xmalloc(blockSize);
if (buf == NULL) {
fprintf(stderr, "Cannot allocate buffer\n");
exit(FALSE);
}
intotal = 0; intotal = 0;
outTotal = 0; outTotal = 0;

5
coreutils/tr.c
View File

@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: tr.c,v 1.1 2000/03/05 08:07:00 erik Exp $"; "$Id: tr.c,v 1.2 2000/03/21 22:32:57 erik Exp $";
#endif /* not lint */ #endif /* not lint */
#endif /* #if 0 */ #endif /* #if 0 */
@ -433,8 +433,7 @@ STR *s;
"unknown class %s", "unknown class %s",
s->str); s->str);
if ((cp->set = p = malloc((NCHARS + 1) * sizeof(int))) == NULL) cp->set = p = xmalloc((NCHARS + 1) * sizeof(int));
errx(1, "malloc");
bzero(p, (NCHARS + 1) * sizeof(int)); bzero(p, (NCHARS + 1) * sizeof(int));
for (cnt = 0, func = cp->func; cnt < NCHARS; ++cnt) for (cnt = 0, func = cp->func; cnt < NCHARS; ++cnt)

2
date.c
View File

@ -276,7 +276,7 @@ int date_main(int argc, char **argv)
} }
/* Print OUTPUT (after ALL that!) */ /* Print OUTPUT (after ALL that!) */
t_buff = malloc(201); t_buff = xmalloc(201);
strftime(t_buff, 200, date_fmt, &tm_time); strftime(t_buff, 200, date_fmt, &tm_time);
printf("%s\n", t_buff); printf("%s\n", t_buff);

6
dd.c
View File

@ -114,11 +114,7 @@ extern int dd_main(int argc, char **argv)
argv++; argv++;
} }
buf = malloc(blockSize); buf = xmalloc(blockSize);
if (buf == NULL) {
fprintf(stderr, "Cannot allocate buffer\n");
exit(FALSE);
}
intotal = 0; intotal = 0;
outTotal = 0; outTotal = 0;

2
dmesg.c
View File

@ -95,7 +95,7 @@ int dmesg_main(int argc, char **argv)
if (bufsize < 4096) if (bufsize < 4096)
bufsize = 4096; bufsize = 4096;
buf = (char *) malloc(bufsize); buf = (char *) xmalloc(bufsize);
n = klogctl(cmd, buf, bufsize); n = klogctl(cmd, buf, bufsize);
if (n < 0) { if (n < 0) {
goto klogctl_error; goto klogctl_error;

35
fsck_minix.c
View File

@ -603,23 +603,13 @@ static void read_superblock(void)
static void read_tables(void) static void read_tables(void)
{ {
inode_map = malloc(IMAPS * BLOCK_SIZE); inode_map = xmalloc(IMAPS * BLOCK_SIZE);
if (!inode_map) zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
die("Unable to allocate buffer for inode map");
zone_map = malloc(ZMAPS * BLOCK_SIZE);
if (!inode_map)
die("Unable to allocate buffer for zone map");
memset(inode_map, 0, sizeof(inode_map)); memset(inode_map, 0, sizeof(inode_map));
memset(zone_map, 0, sizeof(zone_map)); memset(zone_map, 0, sizeof(zone_map));
inode_buffer = malloc(INODE_BUFFER_SIZE); inode_buffer = xmalloc(INODE_BUFFER_SIZE);
if (!inode_buffer) inode_count = xmalloc(INODES + 1);
die("Unable to allocate buffer for inodes"); zone_count = xmalloc(ZONES);
inode_count = malloc(INODES + 1);
if (!inode_count)
die("Unable to allocate buffer for inode count");
zone_count = malloc(ZONES);
if (!zone_count)
die("Unable to allocate buffer for zone count");
if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE)) if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE))
die("Unable to read inode map"); die("Unable to read inode map");
if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE)) if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE))
@ -1247,18 +1237,9 @@ static void alloc_name_list(void)
{ {
int i; int i;
name_list = malloc(sizeof(char *) * MAX_DEPTH); name_list = xmalloc(sizeof(char *) * MAX_DEPTH);
if (!name_list) { for (i = 0; i < MAX_DEPTH; i++)
fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno)); name_list[i] = xmalloc(sizeof(char) * PATH_MAX + 1);
exit(1);
}
for (i = 0; i < MAX_DEPTH; i++) {
name_list[i] = malloc(sizeof(char) * PATH_MAX + 1);
if (!name_list[i]) {
fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno));
exit(1);
}
}
} }
/* execute this atexit() to deallocate name_list[] */ /* execute this atexit() to deallocate name_list[] */

10
mkfs_minix.c
View File

@ -530,19 +530,15 @@ static void setup_tables(void)
die("unable to allocate buffers for maps"); die("unable to allocate buffers for maps");
} }
FIRSTZONE = NORM_FIRSTZONE; FIRSTZONE = NORM_FIRSTZONE;
inode_map = malloc(IMAPS * BLOCK_SIZE); inode_map = xmalloc(IMAPS * BLOCK_SIZE);
zone_map = malloc(ZMAPS * BLOCK_SIZE); zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
if (!inode_map || !zone_map)
die("unable to allocate buffers for maps");
memset(inode_map, 0xff, IMAPS * BLOCK_SIZE); memset(inode_map, 0xff, IMAPS * BLOCK_SIZE);
memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE); memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE);
for (i = FIRSTZONE; i < ZONES; i++) for (i = FIRSTZONE; i < ZONES; i++)
unmark_zone(i); unmark_zone(i);
for (i = MINIX_ROOT_INO; i <= INODES; i++) for (i = MINIX_ROOT_INO; i <= INODES; i++)
unmark_inode(i); unmark_inode(i);
inode_buffer = malloc(INODE_BUFFER_SIZE); inode_buffer = xmalloc(INODE_BUFFER_SIZE);
if (!inode_buffer)
die("unable to allocate buffer for inodes");
memset(inode_buffer, 0, INODE_BUFFER_SIZE); memset(inode_buffer, 0, INODE_BUFFER_SIZE);
printf("%ld inodes\n", INODES); printf("%ld inodes\n", INODES);
printf("%ld blocks\n", ZONES); printf("%ld blocks\n", ZONES);

6
mkswap.c
View File

@ -116,7 +116,7 @@ static void init_signature_page()
if (pagesize != PAGE_SIZE) if (pagesize != PAGE_SIZE)
fprintf(stderr, "Assuming pages of size %d\n", pagesize); fprintf(stderr, "Assuming pages of size %d\n", pagesize);
#endif #endif
signature_page = (int *) malloc(pagesize); signature_page = (int *) xmalloc(pagesize);
memset(signature_page, 0, pagesize); memset(signature_page, 0, pagesize);
p = (struct swap_header_v1 *) signature_page; p = (struct swap_header_v1 *) signature_page;
} }
@ -230,9 +230,7 @@ void check_blocks(void)
int do_seek = 1; int do_seek = 1;
char *buffer; char *buffer;
buffer = malloc(pagesize); buffer = xmalloc(pagesize);
if (!buffer)
die("Out of memory");
current_page = 0; current_page = 0;
while (current_page < PAGES) { while (current_page < PAGES) {
if (!check) { if (!check) {

3
sfdisk.c
View File

@ -300,8 +300,7 @@ static struct sector *get_sector(char *dev, int fd, unsigned long sno)
if (!sseek(dev, fd, sno)) if (!sseek(dev, fd, sno))
return 0; return 0;
if (!(s = (struct sector *) malloc(sizeof(struct sector)))) s = (struct sector *) xmalloc(sizeof(struct sector));
fatalError("out of memory - giving up\n");
if (read(fd, s->data, sizeof(s->data)) != sizeof(s->data)) { if (read(fd, s->data, sizeof(s->data)) != sizeof(s->data)) {
perror("read"); perror("read");

5
tr.c
View File

@ -44,7 +44,7 @@ static char sccsid[] = "@(#)tr.c 8.2 (Berkeley) 5/4/95";
#endif #endif
static const char rcsid[] = static const char rcsid[] =
"$Id: tr.c,v 1.1 2000/03/05 08:07:00 erik Exp $"; "$Id: tr.c,v 1.2 2000/03/21 22:32:57 erik Exp $";
#endif /* not lint */ #endif /* not lint */
#endif /* #if 0 */ #endif /* #if 0 */
@ -433,8 +433,7 @@ STR *s;
"unknown class %s", "unknown class %s",
s->str); s->str);
if ((cp->set = p = malloc((NCHARS + 1) * sizeof(int))) == NULL) cp->set = p = xmalloc((NCHARS + 1) * sizeof(int));
errx(1, "malloc");
bzero(p, (NCHARS + 1) * sizeof(int)); bzero(p, (NCHARS + 1) * sizeof(int));
for (cnt = 0, func = cp->func; cnt < NCHARS; ++cnt) for (cnt = 0, func = cp->func; cnt < NCHARS; ++cnt)

3
umount.c
View File

@ -89,8 +89,7 @@ void mtab_read(void)
return; return;
} }
while ((e = getmntent(fp))) { while ((e = getmntent(fp))) {
entry = malloc(sizeof(struct _mtab_entry_t)); entry = xmalloc(sizeof(struct _mtab_entry_t));
entry->device = strdup(e->mnt_fsname); entry->device = strdup(e->mnt_fsname);
entry->mountpt = strdup(e->mnt_dir); entry->mountpt = strdup(e->mnt_dir);
entry->next = mtab_cache; entry->next = mtab_cache;

2
util-linux/dmesg.c
View File

@ -95,7 +95,7 @@ int dmesg_main(int argc, char **argv)
if (bufsize < 4096) if (bufsize < 4096)
bufsize = 4096; bufsize = 4096;
buf = (char *) malloc(bufsize); buf = (char *) xmalloc(bufsize);
n = klogctl(cmd, buf, bufsize); n = klogctl(cmd, buf, bufsize);
if (n < 0) { if (n < 0) {
goto klogctl_error; goto klogctl_error;

35
util-linux/fsck_minix.c
View File

@ -603,23 +603,13 @@ static void read_superblock(void)
static void read_tables(void) static void read_tables(void)
{ {
inode_map = malloc(IMAPS * BLOCK_SIZE); inode_map = xmalloc(IMAPS * BLOCK_SIZE);
if (!inode_map) zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
die("Unable to allocate buffer for inode map");
zone_map = malloc(ZMAPS * BLOCK_SIZE);
if (!inode_map)
die("Unable to allocate buffer for zone map");
memset(inode_map, 0, sizeof(inode_map)); memset(inode_map, 0, sizeof(inode_map));
memset(zone_map, 0, sizeof(zone_map)); memset(zone_map, 0, sizeof(zone_map));
inode_buffer = malloc(INODE_BUFFER_SIZE); inode_buffer = xmalloc(INODE_BUFFER_SIZE);
if (!inode_buffer) inode_count = xmalloc(INODES + 1);
die("Unable to allocate buffer for inodes"); zone_count = xmalloc(ZONES);
inode_count = malloc(INODES + 1);
if (!inode_count)
die("Unable to allocate buffer for inode count");
zone_count = malloc(ZONES);
if (!zone_count)
die("Unable to allocate buffer for zone count");
if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE)) if (IMAPS * BLOCK_SIZE != read(IN, inode_map, IMAPS * BLOCK_SIZE))
die("Unable to read inode map"); die("Unable to read inode map");
if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE)) if (ZMAPS * BLOCK_SIZE != read(IN, zone_map, ZMAPS * BLOCK_SIZE))
@ -1247,18 +1237,9 @@ static void alloc_name_list(void)
{ {
int i; int i;
name_list = malloc(sizeof(char *) * MAX_DEPTH); name_list = xmalloc(sizeof(char *) * MAX_DEPTH);
if (!name_list) { for (i = 0; i < MAX_DEPTH; i++)
fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno)); name_list[i] = xmalloc(sizeof(char) * PATH_MAX + 1);
exit(1);
}
for (i = 0; i < MAX_DEPTH; i++) {
name_list[i] = malloc(sizeof(char) * PATH_MAX + 1);
if (!name_list[i]) {
fprintf(stderr,"fsck_minix: name_list: %s\n", strerror(errno));
exit(1);
}
}
} }
/* execute this atexit() to deallocate name_list[] */ /* execute this atexit() to deallocate name_list[] */

10
util-linux/mkfs_minix.c
View File

@ -530,19 +530,15 @@ static void setup_tables(void)
die("unable to allocate buffers for maps"); die("unable to allocate buffers for maps");
} }
FIRSTZONE = NORM_FIRSTZONE; FIRSTZONE = NORM_FIRSTZONE;
inode_map = malloc(IMAPS * BLOCK_SIZE); inode_map = xmalloc(IMAPS * BLOCK_SIZE);
zone_map = malloc(ZMAPS * BLOCK_SIZE); zone_map = xmalloc(ZMAPS * BLOCK_SIZE);
if (!inode_map || !zone_map)
die("unable to allocate buffers for maps");
memset(inode_map, 0xff, IMAPS * BLOCK_SIZE); memset(inode_map, 0xff, IMAPS * BLOCK_SIZE);
memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE); memset(zone_map, 0xff, ZMAPS * BLOCK_SIZE);
for (i = FIRSTZONE; i < ZONES; i++) for (i = FIRSTZONE; i < ZONES; i++)
unmark_zone(i); unmark_zone(i);
for (i = MINIX_ROOT_INO; i <= INODES; i++) for (i = MINIX_ROOT_INO; i <= INODES; i++)
unmark_inode(i); unmark_inode(i);
inode_buffer = malloc(INODE_BUFFER_SIZE); inode_buffer = xmalloc(INODE_BUFFER_SIZE);
if (!inode_buffer)
die("unable to allocate buffer for inodes");
memset(inode_buffer, 0, INODE_BUFFER_SIZE); memset(inode_buffer, 0, INODE_BUFFER_SIZE);
printf("%ld inodes\n", INODES); printf("%ld inodes\n", INODES);
printf("%ld blocks\n", ZONES); printf("%ld blocks\n", ZONES);

6
util-linux/mkswap.c
View File

@ -116,7 +116,7 @@ static void init_signature_page()
if (pagesize != PAGE_SIZE) if (pagesize != PAGE_SIZE)
fprintf(stderr, "Assuming pages of size %d\n", pagesize); fprintf(stderr, "Assuming pages of size %d\n", pagesize);
#endif #endif
signature_page = (int *) malloc(pagesize); signature_page = (int *) xmalloc(pagesize);
memset(signature_page, 0, pagesize); memset(signature_page, 0, pagesize);
p = (struct swap_header_v1 *) signature_page; p = (struct swap_header_v1 *) signature_page;
} }
@ -230,9 +230,7 @@ void check_blocks(void)
int do_seek = 1; int do_seek = 1;
char *buffer; char *buffer;
buffer = malloc(pagesize); buffer = xmalloc(pagesize);
if (!buffer)
die("Out of memory");
current_page = 0; current_page = 0;
while (current_page < PAGES) { while (current_page < PAGES) {
if (!check) { if (!check) {

3
util-linux/umount.c
View File

@ -89,8 +89,7 @@ void mtab_read(void)
return; return;
} }
while ((e = getmntent(fp))) { while ((e = getmntent(fp))) {
entry = malloc(sizeof(struct _mtab_entry_t)); entry = xmalloc(sizeof(struct _mtab_entry_t));
entry->device = strdup(e->mnt_fsname); entry->device = strdup(e->mnt_fsname);
entry->mountpt = strdup(e->mnt_dir); entry->mountpt = strdup(e->mnt_dir);
entry->next = mtab_cache; entry->next = mtab_cache;

18
utility.c
View File

@ -172,9 +172,7 @@ void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
i = hash_inode(statbuf->st_ino); i = hash_inode(statbuf->st_ino);
s = name ? strlen(name) : 0; s = name ? strlen(name) : 0;
bucket = malloc(sizeof(ino_dev_hashtable_bucket_t) + s); bucket = xmalloc(sizeof(ino_dev_hashtable_bucket_t) + s);
if (bucket == NULL)
fatalError("Not enough memory.");
bucket->ino = statbuf->st_ino; bucket->ino = statbuf->st_ino;
bucket->dev = statbuf->st_dev; bucket->dev = statbuf->st_dev;
if (name) if (name)
@ -1003,7 +1001,7 @@ extern int replace_match(char *haystack, char *needle, char *newNeedle,
if (strcmp(needle, newNeedle) == 0) if (strcmp(needle, newNeedle) == 0)
return FALSE; return FALSE;
oldhayStack = (char *) malloc((unsigned) (strlen(haystack))); oldhayStack = (char *) xmalloc((unsigned) (strlen(haystack)));
while (where != NULL) { while (where != NULL) {
foundOne++; foundOne++;
strcpy(oldhayStack, haystack); strcpy(oldhayStack, haystack);
@ -1364,22 +1362,16 @@ extern pid_t findPidByName( char* pidName)
#endif /* BB_FEATURE_USE_DEVPS_PATCH */ #endif /* BB_FEATURE_USE_DEVPS_PATCH */
#endif /* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */ #endif /* BB_KILLALL || ( BB_FEATURE_LINUXRC && ( BB_HALT || BB_REBOOT || BB_POWEROFF )) */
#if defined BB_GUNZIP \ /* this should really be farmed out to libbusybox.a */
|| defined BB_GZIP \
|| defined BB_PRINTF \
|| defined BB_TAIL
extern void *xmalloc(size_t size) extern void *xmalloc(size_t size)
{ {
void *cp = malloc(size); void *cp = malloc(size);
if (cp == NULL) { if (cp == NULL)
errorMsg("out of memory"); fatalError("out of memory");
}
return cp; return cp;
} }
#endif /* BB_GUNZIP || BB_GZIP || BB_PRINTF || BB_TAIL */
#if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT) #if (__GLIBC__ < 2) && (defined BB_SYSLOGD || defined BB_INIT)
extern int vdprintf(int d, const char *format, va_list ap) extern int vdprintf(int d, const char *format, va_list ap)
{ {