Date: Sun, 29 Mar 2020 00:15:44 +0200 From: Toomas Soome <tsoome@me.com> To: Oliver Pinter <oliver.pntr@gmail.com> Cc: Toomas Soome <tsoome@freebsd.org>, "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> Subject: Re: svn commit: r359408 - head/stand/libsa/zfs Message-ID: <12C6C7A4-F1F8-469A-860A-9DD064DE8240@me.com> In-Reply-To: <CAPjTQNHrfg=ZH5P3wr6U4=wkciNsFZOYf87mn8a%2B7vBATxOugQ@mail.gmail.com> References: <202003282150.02SLoRao067734@repo.freebsd.org> <CAPjTQNHrfg=ZH5P3wr6U4=wkciNsFZOYf87mn8a%2B7vBATxOugQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 29. Mar 2020, at 00:04, Oliver Pinter <oliver.pntr@gmail.com> = wrote: >=20 >=20 >=20 > On Saturday, March 28, 2020, Toomas Soome <tsoome@freebsd.org = <mailto: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 = <https://svnweb.freebsd.org/changeset/base/359408>; >=20 > Log: > loader: strdup name strings from dataset walker >=20 > The removal of zfs scratch buffer did miss the fact the dataset > lookup was picking up the names from zap list. >=20 > Modified: > head/stand/libsa/zfs/zfs.c >=20 > Modified: head/stand/libsa/zfs/zfs.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/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 =3D = SLIST_HEAD_INITIALIZER(zfs_be_head); > struct zfs_be_list *zfs_be_headp; > struct zfs_be_entry { > - const char *name; > + cha *name; >=20 > I think this will be "char *".=20 Yes, I guess I must have (accidentally) removed the =E2=80=98r' after = the build. The fix is already posted. rgds, toomas > =20 > SLIST_ENTRY(zfs_be_entry) entries; > } *zfs_be, *zfs_be_tmp; >=20 > @@ -906,6 +906,7 @@ zfs_bootenv_initial(const char *name) > while (!SLIST_EMPTY(&zfs_be_head)) { > zfs_be =3D SLIST_FIRST(&zfs_be_head); > SLIST_REMOVE_HEAD(&zfs_be_head, entries); > + free(zfs_be->name); > free(zfs_be); > } >=20 > @@ -973,6 +974,7 @@ zfs_bootenv(const char *name) > while (!SLIST_EMPTY(&zfs_be_head)) { > zfs_be =3D SLIST_FIRST(&zfs_be_head); > SLIST_REMOVE_HEAD(&zfs_be_head, entries); > + free(zfs_be->name); > free(zfs_be); > } >=20 > @@ -992,7 +994,11 @@ zfs_belist_add(const char *name, uint64_t value = __unus > if (zfs_be =3D=3D NULL) { > return (ENOMEM); > } > - zfs_be->name =3D name; > + zfs_be->name =3D strdup(name); > + if (zfs_be->name =3D=3D NULL) { > + free(zfs_be); > + return (ENOMEM); > + } > SLIST_INSERT_HEAD(&zfs_be_head, zfs_be, entries); > zfs_env_count++; >=20 > _______________________________________________ > svn-src-head@freebsd.org <mailto:svn-src-head@freebsd.org> mailing = list > https://lists.freebsd.org/mailman/listinfo/svn-src-head = <https://lists.freebsd.org/mailman/listinfo/svn-src-head>; > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org = <mailto:svn-src-head-unsubscribe@freebsd.org>"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?12C6C7A4-F1F8-469A-860A-9DD064DE8240>