Fix mbtowc_test:mbtowc.

CTSRD-CHERI · Jul 23, 2018 · 92bb865 · 92bb865
1 parent 9b71798
commit 92bb865
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/lib/libc/locale/gb18030.c b/lib/libc/locale/gb18030.c
@@ -112,7 +112,19 @@ _GB18030_mbrtowc(wchar_t * __restrict pwc, const char * __restrict s,
 		pwc = NULL;
 	}
 
-	ncopy = MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count);
+	/*
+	 * CHERI CHANGES START
+	 * {
+	 *   "updated": 20180723,
+	 *   "target_type": "lib",
+	 *   "changes": [
+	 *     "buffer_overrun"
+	 *   ],
+	 *   "change_comment": "fixes mbtowc_test:mbtowc"
+	 * }
+	 * CHERI CHANGES END
+	 */
+	ncopy = MIN(MIN(MIN(n, MB_CUR_MAX), sizeof(gs->bytes) - gs->count), strlen(s));
 	memcpy(gs->bytes + gs->count, s, ncopy);
 	ocount = gs->count;
 	gs->count += ncopy;