summaryrefslogtreecommitdiff
path: root/usr/src/lib/libinstzones
diff options
context:
space:
mode:
authorAbhinandan Ekande <Abhinandan.Ekande@Sun.COM>2009-10-27 14:28:52 +0530
committerAbhinandan Ekande <Abhinandan.Ekande@Sun.COM>2009-10-27 14:28:52 +0530
commit94a65b20fd6706171eba5212ea3ca67570ba7e12 (patch)
treef3140a6b3487dba0441281de2a7f9a01728e6bfe /usr/src/lib/libinstzones
parentd05e3ebcd2969423a163f5d1cdf03fa576ca1c98 (diff)
downloadillumos-joyent-94a65b20fd6706171eba5212ea3ca67570ba7e12.tar.gz
6885730 beadm create can core dump due to bug in z_set_zone_root()
Diffstat (limited to 'usr/src/lib/libinstzones')
-rw-r--r--usr/src/lib/libinstzones/common/zones.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/lib/libinstzones/common/zones.c b/usr/src/lib/libinstzones/common/zones.c
index 8b62e15751..2e30c24281 100644
--- a/usr/src/lib/libinstzones/common/zones.c
+++ b/usr/src/lib/libinstzones/common/zones.c
@@ -1231,9 +1231,9 @@ z_set_zone_root(const char *zroot)
}
/* free any existing cached root path */
-
if (*_z_global_data._z_root_dir != '\0') {
free(_z_global_data._z_root_dir);
+ _z_global_data._z_root_dir = NULL;
}
/* store duplicate of new zone root path */
@@ -1241,7 +1241,7 @@ z_set_zone_root(const char *zroot)
if (*rootdir != '\0') {
_z_global_data._z_root_dir = _z_strdup(rootdir);
} else {
- *_z_global_data._z_root_dir = '\0';
+ _z_global_data._z_root_dir = "";
}
/* set zone root path */