From owner-svn-src-all@freebsd.org Sat Mar 28 22:12:06 2020
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6B097268541;
Sat, 28 Mar 2020 22:12:06 +0000 (UTC)
(envelope-from oliver.pntr@gmail.com)
Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com
[IPv6:2607:f8b0:4864:20::331])
(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 48qXyC6GrTz4LG9;
Sat, 28 Mar 2020 22:12:03 +0000 (UTC)
(envelope-from oliver.pntr@gmail.com)
Received: by mail-ot1-x331.google.com with SMTP id c9so13862200otl.12;
Sat, 28 Mar 2020 15:12:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=mime-version:in-reply-to:references:from:date:message-id:subject:to
:cc; bh=KLp80RYfRZDGsUGkL+4ZNB7R9FbuHdwMMqKitQNbcaI=;
b=ZKKOiXsqJVgK2Hy3m2pxyEA/anNF8hOnHwRragmJ5W5C7BTyNaHcEnqcvI9n4w/ZFD
VO3uWpygM6ukVhi2mfATy2K9kcVcv7jtsLCmJUctVaMbSHudPWUcoCvrf4ZvHcCXd1yR
AUJTUxCkebuqkkw6Vfpmw03u6pJUXvP7824SPVBY0GaJoZQc2NAsNFHQbyMSEmrXpxjG
5eGjGATbW2r985XVMHFS2/pm+OUQw74F4mXnoTOHbpsfjqv36t/gNFDZbrwJ9xpM0ORh
2eauOiAiz1ptlWJupPgrxozs73yaEB+J2Pz/hCp0EECg59XS8WxjSwFSRBXg5eZ/rkCd
6u+A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:mime-version:in-reply-to:references:from:date
:message-id:subject:to:cc;
bh=KLp80RYfRZDGsUGkL+4ZNB7R9FbuHdwMMqKitQNbcaI=;
b=mIvC66dLAYCXPhwqwqZ32zWApReFLFUhQqZE0V3pDcNXLSH6hnb7r1KV7VjZgj8mLg
6ZsnwfBE+HrWrSrgFl5pRS7TKaIqlWge+j69acAUcj5DmVfpggkAMTNmsEOwtGtn2MoB
H01nH0gIkhVu1gyfRYPJGQWzibBCywb2BKZFM/XlElEyktDrmhyqBd7tzOLAxXCCSiyW
wJ77jzDXuk/PBsH0yhsrCpzlTNRWsqmgIQ56024U0q5p9MBM8LZlgQOG9mZ+nQ1I1zdV
pwmMpWjLsr8Mv3n+0oUZfMUy+teaTdmsFeqxfc/53NllOQAVYYr7M9z96arq7RmczjwH
saeQ==
X-Gm-Message-State: ANhLgQ0jk4T94D/7OUlrHq2FVMcrgxq2AOr9NF6YbsCnFqSLQfPzrvyC
BCB/Jt5jKe+PWFfr2L3xCDjBb4/APsNTlOUt2XKStg==
X-Google-Smtp-Source: ADFU+vtIQbEjTI3TJkK6Mi2WOaObyjiN31Z3IgUMsa5IQLfoJ/vAIEhYbpY9xj+TOvbZjNQFKXl/7fzilkLFionXcpU=
X-Received: by 2002:a25:61c7:: with SMTP id v190mr8812371ybb.314.1585433042624;
Sat, 28 Mar 2020 15:04:02 -0700 (PDT)
MIME-Version: 1.0
Received: by 2002:a25:a291:0:0:0:0:0 with HTTP; Sat, 28 Mar 2020 15:04:01
-0700 (PDT)
In-Reply-To: <202003282150.02SLoRao067734@repo.freebsd.org>
References: <202003282150.02SLoRao067734@repo.freebsd.org>
From: Oliver Pinter <oliver.pntr@gmail.com>
Date: Sat, 28 Mar 2020 23:04:01 +0100
Message-ID: <CAPjTQNHrfg=ZH5P3wr6U4=wkciNsFZOYf87mn8a+7vBATxOugQ@mail.gmail.com>
Subject: Re: svn commit: r359408 - head/stand/libsa/zfs
To: Toomas Soome <tsoome@freebsd.org>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
"svn-src-all@freebsd.org" <svn-src-all@freebsd.org>,
"svn-src-head@freebsd.org" <svn-src-head@freebsd.org>
X-Rspamd-Queue-Id: 48qXyC6GrTz4LG9
X-Spamd-Bar: -----
Authentication-Results: mx1.freebsd.org;
none
X-Spamd-Result: default: False [-6.00 / 15.00];
NEURAL_HAM_MEDIUM(-1.00)[-1.000,0];
NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[];
TAGGED_FROM(0.00)[]
Content-Type: text/plain; charset="UTF-8"
X-Content-Filtered-By: Mailman/MimeDel 2.1.29
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" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Mar 2020 22:12:06 -0000
On Saturday, March 28, 2020, Toomas Soome <tsoome@freebsd.org> wrote:
> Author: tsoome
> Date: Sat Mar 28 21:50:27 2020
> New Revision: 359408
> URL: https://svnweb.freebsd.org/changeset/base/359408
>
> Log:
> loader: strdup name strings from dataset walker
>
> The removal of zfs scratch buffer did miss the fact the dataset
> lookup was picking up the names from zap list.
>
> Modified:
> head/stand/libsa/zfs/zfs.c
>
> Modified: head/stand/libsa/zfs/zfs.c
> ============================================================
> ==================
> --- head/stand/libsa/zfs/zfs.c Sat Mar 28 21:47:44 2020 (r359407)
> +++ head/stand/libsa/zfs/zfs.c Sat Mar 28 21:50:27 2020 (r359408)
> @@ -92,7 +92,7 @@ static int zfs_env_count;
> SLIST_HEAD(zfs_be_list, zfs_be_entry) zfs_be_head =
> SLIST_HEAD_INITIALIZER(zfs_be_head);
> struct zfs_be_list *zfs_be_headp;
> struct zfs_be_entry {
> - const char *name;
> + cha *name;
I think this will be "char *".
> SLIST_ENTRY(zfs_be_entry) entries;
> } *zfs_be, *zfs_be_tmp;
>
> @@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> + free(zfs_be->name);
> free(zfs_be);
> }
>
> @@ -973,6 +974,7 @@ zfs_bootenv(const char *name)
> while (!SLIST_EMPTY(&zfs_be_head)) {
> zfs_be = SLIST_FIRST(&zfs_be_head);
> SLIST_REMOVE_HEAD(&zfs_be_head, entries);
> + free(zfs_be->name);
> free(zfs_be);
> }
>
> @@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value __unus
> if (zfs_be == NULL) {
> return (ENOMEM);
> }
> - zfs_be->name = name;
> + zfs_be->name = strdup(name);
> + if (zfs_be->name == NULL) {
> + free(zfs_be);
> + return (ENOMEM);
> + }
> SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries);
> zfs_env_count++;
>
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"
>