From 3c1a6de57ee4282dacf3ba9e09bb7ce2a1ed85ae Mon Sep 17 00:00:00 2001 From: "Andrey A. Chernov" Date: Mon, 25 Mar 2002 14:22:31 +0000 Subject: Remove double REC_D assignment Cast REC_D optarg assignment to (u_char) to prevent out of bounds indexing --- usr.bin/sort/sort.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/sort/sort.c b/usr.bin/sort/sort.c index 4c10233a0011..440363be963a 100644 --- a/usr.bin/sort/sort.c +++ b/usr.bin/sort/sort.c @@ -116,7 +116,7 @@ main(argc, argv) memset(fldtab, 0, (ND+2)*sizeof(struct field)); memset(d_mask, 0, NBINS); - d_mask[REC_D = '\n'] = REC_D_F; + d_mask[REC_D] = REC_D_F; SINGL_FLD = SEP_FLAG = 0; d_mask['\t'] = d_mask[' '] = BLANK | FLD_D; ftpos = fldtab; @@ -176,7 +176,7 @@ main(argc, argv) case 'R': if (REC_D != '\n') usage("multiple record delimiters"); - if ('\n' == (REC_D = *optarg)) + if ('\n' == (REC_D = (u_char)*optarg)) break; d_mask['\n'] = d_mask[' ']; d_mask[REC_D] = REC_D_F; -- cgit v1.3