From owner-svn-src-all@freebsd.org Thu Jul 11 08:02:20 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B2D415CAC96; Thu, 11 Jul 2019 08:02:20 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D4E286BA81; Thu, 11 Jul 2019 08:02:19 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x52e.google.com with SMTP id w10so2537711pgj.7; Thu, 11 Jul 2019 01:02:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=2L+wyxSDhU1swICrUvbYRgi18tHZL7GALfpWn6mo/eo=; b=DAN4MPNQrW1/Eb3xcrV2i0petOVsM8kk6B2xhmvSBD45OxD4emWoYuYW744bHMQU47 ODp8mg01KvJTBds/su342jrB20L2c4KAZbdelKBkNpI5vg9xEG4iNIRrYNwtvePbwLi3 b8rwzLXbYBXXhkHa3tOcPLhijO7daN301NKGJCoZg4IxXzCZvaR6z3qVAkVJFiQKvvcR EblYjKfbv7mKbpbUMhydU1zBFTE2JGKcAqz0d+6XwiGIF3qtO/mXZeN7dsZQCSaLIncY Ym21QoYH3sqebnZU9Tv2hcAn8k5u+4m4byNxLJt4eEVjeeVfq+TEpwStP5F4KhheuxPV hi4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=2L+wyxSDhU1swICrUvbYRgi18tHZL7GALfpWn6mo/eo=; b=I9BIbeiWWO+2Cre8+I+9zLLuc1hLlGXNvSum7X4oE7F1KHAEzTPpsFAOKbT37v3/kX PefP8HDLJuitO+OwhRGLsPSylAsiCtJZJwDY7Z+JuVaPXjzxJ4bWgVewDJlOEA8e+s4A icaIBBXDs6eesBO1Ls1LUCVG/VlhEH3mVpqUmdONoZnvCoa1ly93O9fReLBt1h3zjWc7 twc5XF62W+Y4mrL7EJGy/KEa0SsUlQkGItfy0I21WgeQ3FGePAvEvm2l+PJszPMRmB+7 oXvRyfS+55picFfCJ1OPeU4IO3eG8Kj2JWBWUlYElrnEbtEVNrMT/YmgpKNLaJAcI02h Papg== X-Gm-Message-State: APjAAAUrqw5aGYHsr2zUzavYNHFVm8gboTEeXWA5C1Rtq6HZCbuxx4Zy gRqGkzAjSqKm+waiTUFJOaKiDQYqZq4= X-Google-Smtp-Source: APXvYqy2cj76h5c3hxFHlOnIss9JC47oxYdjQmzcPyBfBU973MaF+lK8OW+zX5m5ZaHQj2FpSlSqzw== X-Received: by 2002:a63:6981:: with SMTP id e123mr2970713pgc.136.1562832137234; Thu, 11 Jul 2019 01:02:17 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id j21sm4257444pfh.86.2019.07.11.01.02.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jul 2019 01:02:16 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: Re: svn commit: r349896 - head/contrib/telnet/telnet From: Enji Cooper In-Reply-To: <201907102236.x6AMaFLI067550@repo.freebsd.org> Date: Thu, 11 Jul 2019 01:02:15 -0700 Cc: src-committers , svn-src-all , svn-src-head@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <6031EBD8-84D7-46D4-A3E5-D78427D084B1@gmail.com> References: <201907102236.x6AMaFLI067550@repo.freebsd.org> To: Philip Paeps X-Mailer: Apple Mail (2.3445.104.11) X-Rspamd-Queue-Id: D4E286BA81 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.92)[-0.922,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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, 11 Jul 2019 08:02:20 -0000 > On Jul 10, 2019, at 3:36 PM, Philip Paeps wrote: >=20 > Author: philip > Date: Wed Jul 10 22:36:14 2019 > New Revision: 349896 > URL: https://svnweb.freebsd.org/changeset/base/349896 >=20 > Log: > telnet: fix minor style violation >=20 > While here also fix a very unlikely NULL pointer dereference. >=20 > Submitted by: Shawn Webb >=20 > Modified: > head/contrib/telnet/telnet/commands.c >=20 > Modified: head/contrib/telnet/telnet/commands.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/contrib/telnet/telnet/commands.c Wed Jul 10 22:23:59 2019 = (r349895) > +++ head/contrib/telnet/telnet/commands.c Wed Jul 10 22:36:14 2019 = (r349896) > @@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$"); > #include > #include >=20 > +#include > #include > #include > #include > @@ -1654,11 +1655,13 @@ env_init(void) > || (strncmp((char *)ep->value, "unix:", 5) =3D=3D 0))) { > char hbuf[256+1]; > char *cp2 =3D strchr((char *)ep->value, ':'); > + size_t buflen; >=20 > gethostname(hbuf, sizeof(hbuf)); > hbuf[sizeof(hbuf)-1] =3D '\0'; > - unsigned int buflen =3D strlen(hbuf) + strlen(cp2) + = 1; > + buflen =3D strlen(hbuf) + strlen(cp2) + 1; > cp =3D (char *)malloc(sizeof(char)*buflen); > + assert(cp !=3D NULL); This will unfortunately still segfault if assert is compiled out of the = system as a no-op (-DNDEBUG). I genuinely think using asprintf instead is the way to go, as Eitan and = Warner brought up, since it reduces complexity in the program. Thank you, -Enji=