svn commit: r228864 - head/sys/fs/ntfs

[Kevin Lo]

Author: kevlo
Date: Sat Dec 24 15:49:52 2011
New Revision: 228864
URL: http://svn.freebsd.org/changeset/base/228864

Log:
  Discard local array based on return values.
  
  Pointed out by:	uqs
  Found with:	Coverity Prevent(tm)
  CID:	10089

Modified:
  head/sys/fs/ntfs/ntfs_subr.c
  head/sys/fs/ntfs/ntfs_subr.h
  head/sys/fs/ntfs/ntfs_vnops.c

Modified: head/sys/fs/ntfs/ntfs_subr.c
==============================================================================
--- head/sys/fs/ntfs/ntfs_subr.c	Sat Dec 24 15:31:06 2011	(r228863)
+++ head/sys/fs/ntfs/ntfs_subr.c	Sat Dec 24 15:49:52 2011	(r228864)
@@ -670,6 +670,7 @@ ntfs_uastricmp(ntmp, ustr, ustrlen, astr
 	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,
 	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;

Modified: head/sys/fs/ntfs/ntfs_subr.h
==============================================================================
--- head/sys/fs/ntfs/ntfs_subr.h	Sat Dec 24 15:31:06 2011	(r228863)
+++ head/sys/fs/ntfs/ntfs_subr.h	Sat Dec 24 15:49:52 2011	(r228864)
@@ -112,9 +112,9 @@ int ntfs_u28_init(struct ntfsmount *ntmp
 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))

Modified: head/sys/fs/ntfs/ntfs_vnops.c
==============================================================================
--- head/sys/fs/ntfs/ntfs_vnops.c	Sat Dec 24 15:31:06 2011	(r228863)
+++ head/sys/fs/ntfs/ntfs_vnops.c	Sat Dec 24 15:49:52 2011	(r228864)
@@ -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;