diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2012-06-20 22:06:47 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2012-06-20 22:06:47 +0000 |
| commit | 44487afb9d4785d91a89760b1e2225d7c9505871 (patch) | |
| tree | ed48c399cea490c825c4caceb0e328375f7001c9 /usr/src | |
| parent | d26ccb67c380bd8e12daf99987339ec493d84318 (diff) | |
| download | illumos-joyent-44487afb9d4785d91a89760b1e2225d7c9505871.tar.gz | |
OS-1278 svc.startd core dump
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/svc/startd/restarter.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/usr/src/cmd/svc/startd/restarter.c b/usr/src/cmd/svc/startd/restarter.c index 4cb4e121bb..203d6eba05 100644 --- a/usr/src/cmd/svc/startd/restarter.c +++ b/usr/src/cmd/svc/startd/restarter.c @@ -374,11 +374,9 @@ rep_retry: if (inst->ri_logstem != NULL) startd_free(inst->ri_logstem, PATH_MAX); if (inst->ri_common_name != NULL) - startd_free(inst->ri_common_name, - strlen(inst->ri_common_name) + 1); + free(inst->ri_common_name); if (inst->ri_C_common_name != NULL) - startd_free(inst->ri_C_common_name, - strlen(inst->ri_C_common_name) + 1); + free(inst->ri_C_common_name); snap = NULL; inst->ri_logstem = NULL; inst->ri_common_name = NULL; @@ -698,11 +696,9 @@ deleted: if (inst->ri_logstem != NULL) startd_free(inst->ri_logstem, PATH_MAX); if (inst->ri_common_name != NULL) - startd_free(inst->ri_common_name, - strlen(inst->ri_common_name) + 1); + free(inst->ri_common_name); if (inst->ri_C_common_name != NULL) - startd_free(inst->ri_C_common_name, - strlen(inst->ri_C_common_name) + 1); + free(inst->ri_C_common_name); startd_free(inst->ri_utmpx_prefix, max_scf_value_size); startd_free(inst, sizeof (restarter_inst_t)); return (ENOENT); @@ -762,11 +758,9 @@ restarter_delete_inst(restarter_inst_t *ri) startd_free((void *)ri->ri_i.i_fmri, strlen(ri->ri_i.i_fmri) + 1); startd_free(ri->ri_logstem, PATH_MAX); if (ri->ri_common_name != NULL) - startd_free(ri->ri_common_name, - strlen(ri->ri_common_name) + 1); + free(ri->ri_common_name); if (ri->ri_C_common_name != NULL) - startd_free(ri->ri_C_common_name, - strlen(ri->ri_C_common_name) + 1); + free(ri->ri_C_common_name); startd_free(ri->ri_utmpx_prefix, max_scf_value_size); (void) pthread_mutex_destroy(&ri->ri_lock); (void) pthread_mutex_destroy(&ri->ri_queue_lock); |