svn commit: r336115 - head/lib/libiconv_modules/mapper_std
Pedro F. Giffuni
pfg at FreeBSD.org
Sun Jul 8 23:22:06 UTC 2018
Author: pfg
Date: Sun Jul 8 23:22:04 2018
New Revision: 336115
URL: https://svnweb.freebsd.org/changeset/base/336115
Log:
libiconv: correct undefined behavior.
Detected on NetBSD:
# nm /usr/lib/libc.so|grep sanit
/public/src.git/lib/libc/citrus/modules/citrus_mapper_std.c:173:8:
runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
Obtained from: NetBSD (CVS Rev. 1.11)
MFC after: 1 week
Modified:
head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
Modified: head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c
==============================================================================
--- head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c Sun Jul 8 23:12:27 2018 (r336114)
+++ head/lib/libiconv_modules/mapper_std/citrus_mapper_std.c Sun Jul 8 23:22:04 2018 (r336115)
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $NetBSD: citrus_mapper_std.c,v 1.10 2011/11/19 18:48:39 tnozaki Exp $ */
+/* $NetBSD: citrus_mapper_std.c,v 1.11 2018/06/11 18:03:38 kamil Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause
@@ -161,7 +161,7 @@ rowcol_parse_variable_compat(struct _citrus_mapper_std
rc->rc_dst_invalid = be32toh(rcx->rcx_dst_invalid);
rc->rc_dst_unit_bits = be32toh(rcx->rcx_dst_unit_bits);
m = be32toh(rcx->rcx_src_col_bits);
- n = 1 << (m - 1);
+ n = 1U << (m - 1);
n |= n - 1;
rc->rc_src_rowcol_bits = m;
rc->rc_src_rowcol_mask = n;
More information about the svn-src-head
mailing list