d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly check malloc(3) return values

Browse Source 
Approved by:	ken
This commit is contained in:
jedgar 2000-12-01 12:02:16 +00:00
parent e3960a89e4
commit 24771a5a3c
3 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sbin/camcontrol/camcontrol.c
View File

@ -282,6 +282,11 @@ getdevtree(void)
bufsize = sizeof(struct dev_match_result) * 100;
ccb.cdm.match_buf_len = bufsize;
ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
if (ccb.cdm.matches == NULL) {
warnx("can't malloc memory for matches");
close(fd);
return(1);
}
ccb.cdm.num_matches = 0;
/*
@ -1202,6 +1207,11 @@ readdefects(struct cam_device *device, int argc, char **argv,
* to hold them all.
*/
defect_list = malloc(dlist_length);
if (defect_list == NULL) {
warnx("can't malloc memory for defect list");
error = 1;
goto defect_bailout;
}
rdd_cdb =(struct scsi_read_defect_data_10 *)&ccb->csio.cdb_io.cdb_bytes;
@ -1678,6 +1688,11 @@ scsicmd(struct cam_device *device, int argc, char **argv, char *combinedopt,
fd_data = 1;
data_ptr = (u_int8_t *)malloc(data_bytes);
if (data_ptr == NULL) {
warnx("can't malloc memory for data_ptr");
error = 1;
goto scsicmd_bailout;
}
break;
case 'o':
if (arglist & CAM_ARG_CMD_IN) {
@ -1700,6 +1715,11 @@ scsicmd(struct cam_device *device, int argc, char **argv, char *combinedopt,
hook.got = 0;
datastr = cget(&hook, NULL);
data_ptr = (u_int8_t *)malloc(data_bytes);
if (data_ptr == NULL) {
warnx("can't malloc memory for data_ptr");
error = 1;
goto scsicmd_bailout;
}
/*
* If the user supplied "-" instead of a format, he
* wants the data to be read from stdin.

4
sbin/camcontrol/util.c
View File

@ -125,6 +125,10 @@ arg_put(void *hook, int letter, void *arg, int count, char *name)
char *p;
p = malloc(count + 1);
if (p == NULL) {
fprintf(stderr, "can't malloc memory for p\n");
exit(1);
}
bzero(p, count +1);
strncpy(p, (char *)arg, count);

11
usr.sbin/iostat/iostat.c
View File

@ -285,8 +285,12 @@ main(int argc, char **argv)
if ((num_devices = getnumdevs()) < 0)
err(1, "can't get number of devices");
cur.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
last.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo));
if ((cur.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo))) ==
NULL)
err(1, "devinfo malloc failed");
if ((last.dinfo = (struct devinfo *)malloc(sizeof(struct devinfo))) ==
NULL)
err(1, "devinfo malloc failed");
bzero(cur.dinfo, sizeof(struct devinfo));
bzero(last.dinfo, sizeof(struct devinfo));
@ -305,7 +309,8 @@ main(int argc, char **argv)
* If the user specified any devices on the command line, see if
* they are in the list of devices we have now.
*/
specified_devices = (char **)malloc(sizeof(char *));
if ((specified_devices = (char **)malloc(sizeof(char *))) == NULL)
err(1, "specified_devices malloc failed");
for (num_devices_specified = 0; *argv; ++argv) {
if (isdigit(**argv))
break;