diff options
author | ngie <ngie@FreeBSD.org> | 2016-08-03 01:19:10 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2016-08-03 01:19:10 +0000 |
commit | f8b9e723cdb7d40e14042a6bb07a9b0f9a6aac6c (patch) | |
tree | 85f60f3273792934aa66940c54f60e09516c8fd1 /contrib/diff/src/diff3.c | |
parent | 41f0438c719565530fc588f9b0c1a5a5d443801b (diff) | |
download | FreeBSD-src-f8b9e723cdb7d40e14042a6bb07a9b0f9a6aac6c.zip FreeBSD-src-f8b9e723cdb7d40e14042a6bb07a9b0f9a6aac6c.tar.gz |
MFstable/11 r303691:
MFC r302550,r302551,r302552,r302553:
r302550:
Deobfuscate cleanup path in clnt_dg_create(..)
Similar to r300836 and r301800, cl and cu will always be non-NULL as they're
allocated using the mem_alloc routines, which always use
`malloc(..., M_WAITOK)`.
Deobfuscating the cleanup path fixes a leak where if cl was NULL and
cu was not, cu would not be free'd, and also removes a duplicate test for
cl not being NULL.
CID: 1007033, 1007344
r302551:
Deobfuscate cleanup path in clnt_vc_create(..)
Similar to r300836, r301800, and r302550, cl and ct will always
be non-NULL as they're allocated using the mem_alloc routines,
which always use `malloc(..., M_WAITOK)`.
CID: 1007342
r302552:
Convert `svc_xprt_alloc(..)` and `svc_xprt_free(..)`'s prototypes to
ANSI C style prototypes
r302553:
Don't test for xpt not being NULL before calling svc_xprt_free(..)
svc_xprt_alloc(..) will always return initialized memory as it uses
mem_alloc(..) under the covers, which uses malloc(.., M_WAITOK, ..).
CID: 1007341
Diffstat (limited to 'contrib/diff/src/diff3.c')
0 files changed, 0 insertions, 0 deletions