From owner-svn-src-all@freebsd.org Thu Apr 21 07:43:18 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFCACB1612C; Thu, 21 Apr 2016 07:43:18 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 54683116E; Thu, 21 Apr 2016 07:43:18 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by mail-wm0-x241.google.com with SMTP id e201so15526146wme.2; Thu, 21 Apr 2016 00:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=twXT4gbnxP0pS+jxoAJ8xA0r/lQn1Gcrse2wrK0P3Us=; b=LL8FHSMG0DAp7eEJdmDu5zAFdSI7Zodkcv055+S1ZjSQBp2hL4foZnvvdj0C24SOLX akNZZI+vDh5ra8EncxmwhBGfx0vXQcEqr7vlbadGbOIGEANkEqkL1LBk8n9SwqP4XHNx JVvsFsopMl40ZneS/hywyM6zo4cpdTEQ4OKtuSTOs901rujYRAErtlFmbgqnU/RoNw6/ IDibxXLFo7bG2KsrLEq2NJsxKbItWr32vYN81V7AVE6dCalGKM17J4byc1oqXPKMjSuN OK96eW+86/QePCKa4BEM/CEvQUBBvF4M3Lrm9AJsVhSANgU80B3JyX4ThqNqG+R+SMlE jUXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=twXT4gbnxP0pS+jxoAJ8xA0r/lQn1Gcrse2wrK0P3Us=; b=bm6kiA9ZrYh0QLOfl1aNIqRcHJOBzdp3MiVPQ0F5V+QSTB/XEPOpaRWaZn4MSMv83G WcCSOKBG2va6bfXQo2gvHZKBQiKBHp3pXDJo4IhvoWLjWL6YpD04fpfiawxCSITkUOjZ UexRVnQX9IFD/Eg2SNujlhpwomwCGNxFvNReoOqFYS4sl258rFiA/8uZ9u5qXEnwZTkp sRx8czdqJ8V4YzSQhxWKctwwPlPjxx+KB7xCNF89uNdLxY1Rsf6lS8ywjCgrpvBRoEZK RA1uZaDgUk7SvWy7FNzYy0PQPKBA86Tn+iA7ITAJrLAMMKoMGiga+WkPCTsAJ/PhV1kk JaLQ== X-Gm-Message-State: AOPr4FU/6bBqFrv6DN3l0fwIbuOCL7y+7JIv+PRYSbNIPnNHMc4lh4ZN5tmW5CmW/tljfQ== X-Received: by 10.28.54.33 with SMTP id d33mr14016447wma.63.1461224596931; Thu, 21 Apr 2016 00:43:16 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id iv1sm1391863wjb.34.2016.04.21.00.43.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Apr 2016 00:43:15 -0700 (PDT) Sender: Baptiste Daroussin Date: Thu, 21 Apr 2016 09:43:13 +0200 From: Baptiste Daroussin To: Andrey Chernov Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r298367 - head/lib/libc/locale Message-ID: <20160421074313.GJ26116@ivaldir.etoilebsd.net> References: <201604202044.u3KKiUMq081452@repo.freebsd.org> <20160421062953.GI26116@ivaldir.etoilebsd.net> <7ef69cc0-4f38-788d-3fab-5058749cee8e@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="P6YfpwaDcfcOCJkJ" Content-Disposition: inline In-Reply-To: <7ef69cc0-4f38-788d-3fab-5058749cee8e@freebsd.org> User-Agent: Mutt/1.6.0 (2016-04-01) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2016 07:43:18 -0000 --P6YfpwaDcfcOCJkJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Apr 21, 2016 at 10:22:48AM +0300, Andrey Chernov wrote: > On 21.04.2016 9:29, Baptiste Daroussin wrote: > >>>> Modified: head/lib/libc/locale/ascii.c > >>>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > >>>> --- head/lib/libc/locale/ascii.c Wed Apr 20 20:43:05 2016 (r298366) > >>>> +++ head/lib/libc/locale/ascii.c Wed Apr 20 20:44:30 2016 (r298367) > >>>> @@ -133,11 +133,14 @@ _ascii_mbsnrtowcs(wchar_t * __restrict d > >>>> =20 > >>>> if (dst =3D=3D NULL) { > >>>> s =3D memchr(*src, '\0', nms); > >>>> + if (s =3D=3D NULL) > >>>> + return (nms); > >>>> + > >>>> if (*s & 0x80) { > >>>> errno =3D EILSEQ; > >>>> return ((size_t)-1); > >>>> } > >>>> - return (s !=3D NULL ? s - *src : nms); > >>>> + return (s - *src); > >>>> } > >>>> =20 > >>>> s =3D *src; > >>>> > >>> > >>> The whole code is incorrect, only the very first char is checked, the= re > >>> must be a loop like in -stable: > >>> > >>> if (dst =3D=3D NULL) { > >>> for (s =3D *src; nms > 0 && *s !=3D '\0'; s++, nms--)= { > >>> if (*s & 0x80) { > >>> errno =3D EILSEQ; > >>> return ((size_t)-1); > >>> } > >>> } > >>> return (s - *src); > >>> } > >>> > >>> Since svn history is lost on deleting, I don't know why incorrect > >>> version was committed. > >>> > >> > >> Typo, the very first =3D=3D the very last, i.e. only NUL char is check= ed > >> which always pass. > >> > >=20 > > I have restored the history (I hope correctly) > >=20 > > Bapt > >=20 >=20 I backed it out to the original version, I really sorry for all the mess I = made there. Bapt --P6YfpwaDcfcOCJkJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXGISRAAoJEGOJi9zxtz5aNrIQALfP2xXapdyu/Tm9ROGoSKiN RGTpRh38J8BLYi4/hqFbIoj0uUbFgKW3uJK+aKAxYFODU3KsMFnb8DAuPHEUc6jY bjWvVMNlvfd9bccDL6KhZEWSUa1IitZfrDKRIRXakN3EeQ6mPDYKBHJK9U1l5aF9 j+IPyZwMX/n18FLFF8u8fBgpVZWkHrujR4VgO4v0jxUXkx14VCM7q4FUHrqXWhqN ZGx4bSsUfJvzbX+ozYoLa5l1dt/v/CnIZNagsnTpOa1XJ6iK7E9o0XIjGJmWL99P 2ghoKnXAhAAR4tlgPgcV6fXCljBEXWFeQE8UVESNg9/AlZtIuZQAqfC/BvJxpe0U drGSAdo16Q0D9pqsNyERrsS37vWWnNLcTgGGg6OGC8D2dYz9rWqetvTvKeWdBBAZ RLhB1hwWBbnWJWw1RNOvIRCDWpNKQYxr+kkzXyggB65jS9hcZNW4Bmax0zooFX4W ITQrtp0LdCCfQwz0Qbo7XXk9OWbpTj/QHU6xQ0ojGSUrkiIULFhm4dXtDRM5dOTM /JiStD3ITaQ6j2bLEUQx43lZozUS3/bggqCynW6MMjlF5miekgHrvWtGNs1NvwgQ Rc6SQpBoWcm3cv8yi66P+plFLg+qtqRxY9ozxKrHvBTT73T1z9nGIuLL/l7bvEad QaTnpyYVqhr/3tx6/P1h =cZxm -----END PGP SIGNATURE----- --P6YfpwaDcfcOCJkJ--