system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

- Remove extraneous null ptr deref checks

Browse source 
- Fix memory leak

Submitted by:	Slono Slono <slonoman2011@yandex.ru>
Approved by:	jhb
MFC after:	1 week
This commit is contained in:
Eitan Adler 2011-12-21 20:27:41 +00:00
parent ff0dd2e517
commit 520374b5aa
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=228790
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr.sbin/fwcontrol/fwcontrol.c
View file

@ -152,8 +152,7 @@ str2node(int fd, const char *nodestr)
fweui2eui64(&data->dev[i].eui, &tmpeui);
if (memcmp(&eui, &tmpeui, sizeof(struct eui64)) == 0) {
node = data->dev[i].dst;
if (data != NULL)
free(data);
free(data);
goto gotnode;
}
}

3
usr.sbin/newsyslog/newsyslog.c
View file

@ -1946,9 +1946,10 @@ do_zipwork(struct zipwork_entry *zwork)
char zresult[MAXPATHLEN];
int c;
assert(zwork != NULL);
pgm_path = NULL;
strlcpy(zresult, zwork->zw_fname, sizeof(zresult));
if (zwork != NULL && zwork->zw_conf != NULL &&
if (zwork->zw_conf != NULL &&
zwork->zw_conf->compress > COMPRESS_NONE)
for (c = 1; c < COMPRESS_TYPES; c++) {
if (zwork->zw_conf->compress == c) {

7
usr.sbin/ypserv/yp_main.c
View file

@ -256,6 +256,7 @@ create_service(const int sock, const struct netconfig *nconf,
const struct __rpc_sockinfo *si)
{
int error;
char *sname;
SVCXPRT *transp;
struct addrinfo hints, *res, *res0;
@ -263,6 +264,7 @@ create_service(const int sock, const struct netconfig *nconf,
struct bindaddrlistent *blep;
struct netbuf svcaddr;
sname = NULL;
SLIST_INIT(&sle_head);
memset(&hints, 0, sizeof(hints));
memset(&svcaddr, 0, sizeof(svcaddr));
@ -342,7 +344,6 @@ create_service(const int sock, const struct netconfig *nconf,
if (strncmp("0", servname, 1) == 0) {
struct sockaddr *sap;
socklen_t slen;
char *sname;
sname = malloc(NI_MAXSERV);
if (sname == NULL) {
@ -362,6 +363,7 @@ create_service(const int sock, const struct netconfig *nconf,
strerror(errno));
freeaddrinfo(res0);
close(s);
free(sname);
return -1;
}
error = getnameinfo(sap, slen,
@ -373,6 +375,7 @@ create_service(const int sock, const struct netconfig *nconf,
strerror(errno));
freeaddrinfo(res0);
close(s);
free(sname);
return -1;
}
servname = sname;
@ -441,7 +444,7 @@ create_service(const int sock, const struct netconfig *nconf,
}
/* XXX: ignore error intentionally */
rpcb_set(YPPROG, YPVERS, nconf, &svcaddr);
free (sname);
freeaddrinfo(res0);
return 0;
}