Author: bapt
Date: Wed Apr 20 20:44:30 2016
New Revision: 298367
URL: https://svnweb.freebsd.org/changeset/base/298367
Log:
Check the returned value of memchr(3) before using it
Reported by: Coverity
CID: 1338530
Modified:
head/lib/libc/locale/ascii.c
Modified: head/lib/libc/locale/ascii.c
==============================================================================
--- head/lib/libc/locale/ascii.c Wed Apr 20 20:43:05 2016
(r298366)
+++ head/lib/libc/locale/ascii.c Wed Apr 20 20:44:30 2016
(r298367)
@@ -133,11 +133,14 @@ _ascii_mbsnrtowcs(wchar_t * __restrict d
if (dst == NULL) {
s = memchr(*src, '\0', nms);
+ if (s == NULL)
+ return (nms);
+
if (*s & 0x80) {
errno = EILSEQ;
return ((size_t)-1);
}
- return (s != NULL ? s - *src : nms);
+ return (s - *src);
}
s = *src;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
