diff options
| author | msmith <msmith@FreeBSD.org> | 1999-11-05 19:28:07 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1999-11-05 19:28:07 +0000 |
| commit | f2d8ea6d8e92b25010aa5c29e10639c1ab879532 (patch) | |
| tree | 017bbbf350d6d65fd4ee68d2862bece0c0f85c93 /sys/kern/vfs_conf.c | |
| parent | fad9b06dcd3b0b9e7f6f4f336dc657d42fe7153f (diff) | |
| download | FreeBSD-src-f2d8ea6d8e92b25010aa5c29e10639c1ab879532.zip FreeBSD-src-f2d8ea6d8e92b25010aa5c29e10639c1ab879532.tar.gz | |
Guard against freeing NULL if vfs_mountroot_try is called with NULL
as an argument (this is legal to make other code simpler).
Diffstat (limited to 'sys/kern/vfs_conf.c')
| -rw-r--r-- | sys/kern/vfs_conf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 23571eb..654d693 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -199,8 +199,10 @@ vfs_mountroot_try(char *mountfrom) error = VFS_MOUNT(mp, NULL, NULL, NULL, curproc); done: - free(vfsname, M_MOUNT); - free(path, M_MOUNT); + if (vfsname != NULL) + free(vfsname, M_MOUNT); + if (path != NULL) + free(path, M_MOUNT); if (error != 0) { if (mp != NULL) free(mp, M_MOUNT); |
