diff options
author | kevlo <kevlo@FreeBSD.org> | 2011-12-24 15:49:52 +0000 |
---|---|---|
committer | kevlo <kevlo@FreeBSD.org> | 2011-12-24 15:49:52 +0000 |
commit | cda3cff67fd0cc09335cea933337f09f3c47f603 (patch) | |
tree | 4ab1accb6f2b5e2fc48d7bd4af8b1e11d0b5d811 /sys/fs | |
parent | 9e6eb675fddd2c334c6ef57b3efbf72db0fc32fd (diff) | |
download | FreeBSD-src-cda3cff67fd0cc09335cea933337f09f3c47f603.zip FreeBSD-src-cda3cff67fd0cc09335cea933337f09f3c47f603.tar.gz |
Discard local array based on return values.
Pointed out by: uqs
Found with: Coverity Prevent(tm)
CID: 10089
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/ntfs/ntfs_subr.c | 6 | ||||
-rw-r--r-- | sys/fs/ntfs/ntfs_subr.h | 4 | ||||
-rw-r--r-- | sys/fs/ntfs/ntfs_vnops.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c index c84bea9..b223f87 100644 --- a/sys/fs/ntfs/ntfs_subr.c +++ b/sys/fs/ntfs/ntfs_subr.c @@ -670,6 +670,7 @@ ntfs_uastricmp(ntmp, ustr, ustrlen, astr, astrlen) size_t astrlen; { const char *astrp = astr; + char tmpbuf[5]; int len, res; size_t i, j, mbstrlen = astrlen; @@ -712,7 +713,7 @@ ntfs_uastrcmp(ntmp, ustr, ustrlen, astr, astrlen) const char *astr; size_t astrlen; { - char *c; + char *c, tmpbuf[5]; size_t i, j, mbstrlen = astrlen; int res; @@ -2131,10 +2132,11 @@ ntfs_82u_uninit(struct ntfsmount *ntmp) */ char * ntfs_u28( + char *outbuf, struct ntfsmount *ntmp, wchar wc) { - char *p, *outp, inbuf[3], outbuf[5];; + char *p, *outp, inbuf[3]; size_t ilen, olen; outp = outbuf; diff --git a/sys/fs/ntfs/ntfs_subr.h b/sys/fs/ntfs/ntfs_subr.h index 9f9cf4b..ce46986 100644 --- a/sys/fs/ntfs/ntfs_subr.h +++ b/sys/fs/ntfs/ntfs_subr.h @@ -112,9 +112,9 @@ int ntfs_u28_init(struct ntfsmount *ntmp, wchar *u2w, char *cs_local, char *cs_n int ntfs_u28_uninit(struct ntfsmount *ntmp); int ntfs_82u_init(struct ntfsmount *ntmp, char *cs_local, char *cs_ntfs); int ntfs_82u_uninit(struct ntfsmount *ntmp); -char * ntfs_u28(struct ntfsmount *ntmp, wchar wc); +char * ntfs_u28(char *outbuf, struct ntfsmount *ntmp, wchar wc); wchar ntfs_82u(struct ntfsmount *ntmp, const char *c, int *len); -#define NTFS_U28(ch) ntfs_u28(ntmp, (ch)) +#define NTFS_U28(ch) ntfs_u28(tmpbuf, ntmp, (ch)) #define NTFS_82U(ch, len) ntfs_82u(ntmp, (ch), len) #define NTFS_UASTRCMP(ustr, ustrlen, astr, astrlen) \ ntfs_uastrcmp(ntmp, (ustr), (ustrlen), (astr), (astrlen)) diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c index 3273790..76776a1 100644 --- a/sys/fs/ntfs/ntfs_vnops.c +++ b/sys/fs/ntfs/ntfs_vnops.c @@ -481,7 +481,7 @@ ntfs_readdir(ap) struct uio *uio = ap->a_uio; struct ntfsmount *ntmp = ip->i_mp; int i, j, error = 0; - char *c; + char *c, tmpbuf[5]; u_int32_t faked = 0, num; int ncookies = 0; struct dirent cde; |