From owner-svn-src-all@FreeBSD.ORG Wed Jul 17 04:48:31 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E7B3A25 for ; Wed, 17 Jul 2013 04:48:31 +0000 (UTC) (envelope-from mailer-daemon@vniz.net) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx1.freebsd.org (Postfix) with ESMTP id DB08635E for ; Wed, 17 Jul 2013 04:48:30 +0000 (UTC) Received: by mail-lb0-f182.google.com with SMTP id r11so1232527lbv.27 for ; Tue, 16 Jul 2013 21:48:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:openpgp:content-type :content-transfer-encoding:x-gm-message-state; bh=+/11/BDdVori7rBfdSPfufwJJ0N6ytnNlahlci/1FoE=; b=A755A7uOWODoVL6PmzBZNpgxMVeJOajhLgG0dLmE/5BLy/+tUvRxBsz68a83yz2v4L 9SKi9tAmt3da2Fd7JftIB23T+rPhSU06BAJkIRaj/4TcC8DdFQote0wTrJEZmugRPq2a OrkF9j9SR73Jeivc6sZcnqeRAdFVVYkxFwVdEfUH8aVUE6U8BCyzOylmZGIu1QPh3bpJ w3Bdi4yD/Cd6fv4ss0K9xdFKRQjUq4f2RVlPItW/2rhPAtiAScY0XU3MMGUmE7+cYPWg xVaLHrL5sf7Hl2LxLJtZ3gCgZoFcfHcIpId1VffePDBS37C4yVI6tBJanhQDjg0VOhzi ydjQ== X-Received: by 10.112.13.199 with SMTP id j7mr2480258lbc.25.1374036509455; Tue, 16 Jul 2013 21:48:29 -0700 (PDT) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id p10sm1647754lap.8.2013.07.16.21.48.28 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 16 Jul 2013 21:48:28 -0700 (PDT) Message-ID: <51E62219.1090006@freebsd.org> Date: Wed, 17 Jul 2013 08:48:25 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130620 Thunderbird/17.0.7 MIME-Version: 1.0 To: Andriy Gapon Subject: Re: svn commit: r253380 - head/lib/libc/stdlib References: <201307160726.r6G7QlwE045679@svn.freebsd.org> <51E61950.5090206@freebsd.org> In-Reply-To: <51E61950.5090206@freebsd.org> OpenPGP: id=964474DD Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Gm-Message-State: ALoCoQnWLs53oAsgPGU4JVNGnZl6wPOhxLFaBPVQxRECNmgZmv+JPEWv6cPo4ArtF9MK0vWjk2jk Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 17 Jul 2013 04:48:31 -0000 On 17.07.2013 8:10, Andrey Chernov wrote: > On 16.07.2013 11:26, Andriy Gapon wrote: >> Modified: head/lib/libc/stdlib/getenv.c >> ============================================================================== >> --- head/lib/libc/stdlib/getenv.c Tue Jul 16 06:50:22 2013 (r253379) >> +++ head/lib/libc/stdlib/getenv.c Tue Jul 16 07:26:46 2013 (r253380) >> @@ -505,7 +505,7 @@ __setenv(const char *name, size_t nameLe >> envVars[envNdx].valueSize = valueLen; >> >> /* Save name of name/value pair. */ >> - env = stpcpy(envVars[envNdx].name, name); >> + env = stpncpy(envVars[envNdx].name, name, nameLen); >> if ((envVars[envNdx].name)[nameLen] != '=') >> env = stpcpy(env, "="); >> } >> > > I am not sure what you are trying to fix, but you just made next line > condition unpredictable random, since (envVars[envNdx].name)[nameLen] is > never filled now and there is freshly malloced memory content, which is > picked for != '=' comparison. > > Please back it out or fix. If I understand that right, correct version will be: env = stpncpy(envVars[envNdx].name, name, nameLen); env = stpcpy(env, "="); Condition check is not needed. -- http://ache.vniz.net/ bitcoin:1G6ugdNY6e5jx1GVnAU2ntj2NEfmjKG85r