1 files changed, 7 insertions, 0 deletions

diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c
index 91c0e9c9ab3f1..a22ba136dc8e9 100644
--- a/usr.bin/tr/tr.c
+++ b/usr.bin/tr/tr.c
@@ -291,6 +291,13 @@ endloop:
 		for (cnt = 0; cnt < n; cnt++) {
 			(void)next(&s2);
 			string1[carray[cnt]] = s2.lastch;
+			/*
+			 * Chars taken from s2 can be different this time
+			 * due to lack of complex upper/lower processing,
+			 * so fill string2 again to not miss some.
+			 */
+			if (sflag)
+				string2[s2.lastch] = 1;
 		}
 	}