svn commit: r349624 - stable/11/lib/libc/iconv

[Ed Maste]

Author: emaste
Date: Wed Jul  3 00:03:14 2019
New Revision: 349624
URL: https://svnweb.freebsd.org/changeset/base/349624

Log:
  MFC r349619: libc: correct iconv buffer overflow
  
  admbugs:	920
  Submitted by:	Andrea Venturoli, gabor
  Reported by:	Andrea Venturoli <security at netfence.it>, NetFence
  Approved by:	so
  Security:	CVE-2019-5600
  Security:	FreeBSD-SA-19:09.iconv

Modified:
  stable/11/lib/libc/iconv/citrus_none.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libc/iconv/citrus_none.c
==============================================================================
--- stable/11/lib/libc/iconv/citrus_none.c	Wed Jul  3 00:02:16 2019	(r349623)
+++ stable/11/lib/libc/iconv/citrus_none.c	Wed Jul  3 00:03:14 2019	(r349624)
@@ -142,7 +142,7 @@ _citrus_NONE_stdenc_cstomb(struct _citrus_stdenc * __r
 		s[2] = (char)(idx >> 16);
 		*nresult = 3;
 	} else {
-		if (n < 3) {
+		if (n < 4) {
 			*nresult = (size_t)-1;
 			return (E2BIG);
 		}