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

Fix type mismatches for malloc(3) and Co.

Browse Source 
This is rather pedantic, as for most architectures it holds that
sizeof(type *) == sizeof(type **)

Found by:	clang static analyzer
Reviewed by:	ed
Differential Revision: https://reviews.freebsd.org/D4722
This commit is contained in:
Ulrich Spörlein 2015-12-29 11:24:41 +00:00
parent e96092e82b
commit c9e1c304c1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=292864
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.bin/column/column.c
View File

@ -244,7 +244,7 @@ maketbl(void)
p = NULL)
if (++coloff == maxcols) {
if (!(cols = realloc(cols, ((u_int)maxcols +
DEFCOLS) * sizeof(char *))) ||
DEFCOLS) * sizeof(wchar_t *))) ||
!(lens = realloc(lens,
((u_int)maxcols + DEFCOLS) * sizeof(int))))
err(1, NULL);

4
usr.bin/locate/locate/util.c
View File

@ -93,7 +93,7 @@ colon(dbv, path, dot)
char **pv;
if (dbv == NULL) {
if ((dbv = malloc(sizeof(char **))) == NULL)
if ((dbv = malloc(sizeof(char *))) == NULL)
err(1, "malloc");
*dbv = NULL;
}
@ -123,7 +123,7 @@ colon(dbv, path, dot)
*(p + slen) = '\0';
}
/* increase dbv with element p */
if ((dbv = realloc(dbv, sizeof(char **) * (vlen + 2)))
if ((dbv = realloc(dbv, sizeof(char *) * (vlen + 2)))
== NULL)
err(1, "realloc");
*(dbv + vlen) = p;

4
usr.bin/xargs/xargs.c
View File

@ -234,7 +234,7 @@ main(int argc, char *argv[])
* NULL.
*/
linelen = 1 + argc + nargs + 1;
if ((av = bxp = malloc(linelen * sizeof(char **))) == NULL)
if ((av = bxp = malloc(linelen * sizeof(char *))) == NULL)
errx(1, "malloc failed");
/*
@ -471,7 +471,7 @@ prerun(int argc, char *argv[])
* Allocate memory to hold the argument list, and
* a NULL at the tail.
*/
tmp = malloc((argc + 1) * sizeof(char**));
tmp = malloc((argc + 1) * sizeof(char *));
if (tmp == NULL) {
warnx("malloc failed");
xexit(*argv, 1);

2
usr.sbin/mountd/mountd.c
View File

@ -422,7 +422,7 @@ main(int argc, char **argv)
* list.
*/
if (nhosts == 0) {
hosts = malloc(sizeof(char**));
hosts = malloc(sizeof(char *));
if (hosts == NULL)
out_of_mem();
hosts[0] = "*";

2
usr.sbin/mpsutil/mps_cmd.c
View File

@ -486,7 +486,7 @@ mps_firmware_get(int fd, unsigned char **firmware, bool bios)
}
size = reply.ActualImageSize;
*firmware = calloc(1, sizeof(char) * size);
*firmware = calloc(1, sizeof(unsigned char) * size);
if (*firmware == NULL) {
warn("calloc");
return (-1);

2
usr.sbin/rpc.lockd/lockd.c
View File

@ -220,7 +220,7 @@ main(int argc, char **argv)
* list.
*/
if (nhosts == 0) {
hosts = malloc(sizeof(char**));
hosts = malloc(sizeof(char *));
if (hosts == NULL)
out_of_mem();

2
usr.sbin/rpc.statd/statd.c
View File

@ -150,7 +150,7 @@ main(int argc, char **argv)
* list.
*/
if (nhosts == 0) {
hosts = malloc(sizeof(char**));
hosts = malloc(sizeof(char *));
if (hosts == NULL)
out_of_mem();

4
usr.sbin/rtsold/rtsold.c
View File

@ -888,7 +888,7 @@ autoifprobe(void)
warnmsg(LOG_WARNING, __func__,
"multiple interfaces found");
a = (char **)realloc(argv, (n + 1) * sizeof(char **));
a = realloc(argv, (n + 1) * sizeof(char *));
if (a == NULL) {
warnmsg(LOG_ERR, __func__, "realloc");
exit(1);
@ -903,7 +903,7 @@ autoifprobe(void)
}
if (n) {
a = (char **)realloc(argv, (n + 1) * sizeof(char **));
a = realloc(argv, (n + 1) * sizeof(char *));
if (a == NULL) {
warnmsg(LOG_ERR, __func__, "realloc");
exit(1);