Mercurial > illumos > illumos-gate
changeset 13739:f6a4c9dc9b80
2910 svc.startd core dump
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
| author | Jerry Jelinek <jerry.jelinek@joyent.com> |
|---|---|
| date | Fri, 22 Jun 2012 11:22:18 -0400 |
| parents | e10d315d1821 |
| children | 836bfdf31fc4 |
| files | usr/src/cmd/svc/startd/restarter.c |
| diffstat | 1 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/svc/startd/restarter.c Wed Jun 20 14:16:36 2012 -0500 +++ b/usr/src/cmd/svc/startd/restarter.c Fri Jun 22 11:22:18 2012 -0400 @@ -374,11 +374,9 @@ 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 @@ 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 @@ 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);