From owner-svn-src-head@freebsd.org Thu Apr 21 01:14:25 2016 Return-Path: Delivered-To: svn-src-head@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 BA6EBB16922 for ; Thu, 21 Apr 2016 01:14:25 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: from mail-lb0-f193.google.com (mail-lb0-f193.google.com [209.85.217.193]) (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 4F0681CE3 for ; Thu, 21 Apr 2016 01:14:24 +0000 (UTC) (envelope-from mailing-machine@vniz.net) Received: by mail-lb0-f193.google.com with SMTP id ot1so2283340lbb.0 for ; Wed, 20 Apr 2016 18:14:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=mQ4wPc7nPx18qgbDAore35XVCGwyK6ZHd6ybNzPhG5E=; b=WB3BxwPE4G4G/qqxHjPZCzPx6w/Cyfj823g8wD0NCFBa354sCvuWKSrrJxZegWrZNl zf8eK+aXV5LQF8qqgv7giV9qSF2IWRpMIliExVfj9W+2YiJcVCADCIa/+zQ39woTIxHV RDpQ9gDT6JmIHq5NFSn80oCc7AN+f7a58uSjEjkzYzhETJQaGwi8yQCiKKJugMgNGMHa XcPV6UTP6Mx+sp8EYFm1bg1QAjaQI6d1DUcqcq+2u53lcHqNOgmLQ9B9gvf2K5hl4pMh opYe+0bla9DKCmD/Zjc7RwCAk0n+PFiBpqyBsrGXrRzyKC1l8RjRT3NkLg1w0gh5w59L aqZA== X-Gm-Message-State: AOPr4FUBJUcX5z1HLhjByzqwIS3kifueNvEtRhnLyPGRaYhZyjEWH8YyXcyiry56xaSWCw== X-Received: by 10.112.28.75 with SMTP id z11mr4920557lbg.40.1461200230902; Wed, 20 Apr 2016 17:57:10 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by smtp.gmail.com with ESMTPSA id q13sm23179lfi.21.2016.04.20.17.57.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 20 Apr 2016 17:57:10 -0700 (PDT) Subject: Re: svn commit: r298367 - head/lib/libc/locale To: Baptiste Daroussin , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201604202044.u3KKiUMq081452@repo.freebsd.org> From: Andrey Chernov Message-ID: Date: Thu, 21 Apr 2016 03:57:09 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <201604202044.u3KKiUMq081452@repo.freebsd.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2016 01:14:25 -0000 On 20.04.2016 23:44, Baptiste Daroussin wrote: > Author: bapt > Date: Wed Apr 20 20:44:30 2016 > New Revision: 298367 > URL: https://svnweb.freebsd.org/changeset/base/298367 > > Log: > Check the returned value of memchr(3) before using it > > Reported by: Coverity > CID: 1338530 > > Modified: > head/lib/libc/locale/ascii.c > > Modified: head/lib/libc/locale/ascii.c > ============================================================================== > --- 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 > > if (dst == NULL) { > s = memchr(*src, '\0', nms); > + if (s == NULL) > + return (nms); > + > if (*s & 0x80) { > errno = EILSEQ; > return ((size_t)-1); > } > - return (s != NULL ? s - *src : nms); > + return (s - *src); > } > > s = *src; > The whole code is incorrect, only the very first char is checked, there must be a loop like in -stable: if (dst == NULL) { for (s = *src; nms > 0 && *s != '\0'; s++, nms--) { if (*s & 0x80) { errno = EILSEQ; return ((size_t)-1); } } return (s - *src); } Since svn history is lost on deleting, I don't know why incorrect version was committed.