d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use a separate pointer to the allocated memory for freeing, as strsep may

Browse Source 
modify the pointer argument passed to it. This triggered an assert in malloc
  when a geom command being run under the livefs environment.

PR:		bin/130632
Submitted by:	Dimitry Andric <dimitry -at- andric.com>
Pointy hat to:	me
MFC after:	2 days
This commit is contained in:
Ulf Lilleengen 2009-02-02 19:22:53 +00:00
parent 0721773085
commit 5d82438617
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=188017
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/geom/core/geom.c
View File

@ -487,13 +487,13 @@ library_path(void)
static void
load_library(void)
{
char *curpath, path[MAXPATHLEN], *totalpath;
char *curpath, path[MAXPATHLEN], *tofree, *totalpath;
uint32_t *lib_version;
void *dlh;
int ret;
ret = 0;
totalpath = strdup(library_path());
tofree = totalpath = strdup(library_path());
if (totalpath == NULL)
err(EXIT_FAILURE, "Not enough memory for library path");
@ -519,7 +519,7 @@ load_library(void)
}
break;
}
free(totalpath);
free(tofree);
/* No library was found, but standard commands can still be used */
if (ret == -1)
return;