Discard local array based on return values.

Pointed out by:	uqs
Found with:	Coverity Prevent(tm)
CID:	10089
This commit is contained in:
Kevin Lo 2011-12-24 15:49:52 +00:00
parent d1b02beefa
commit 824be4a073
3 changed files with 7 additions and 5 deletions

View File

@ -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;

View File

@ -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))

View File

@ -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;