diff options
| author | Robert Mustacchi <rm@joyent.com> | 2011-09-07 16:29:20 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2013-11-06 09:40:53 -0800 |
| commit | 93ed8d0d4b068b95d0bb50d57bb854df462a8485 (patch) | |
| tree | 21f23e5dc456361ccb8ecf453c332aadeca46359 | |
| parent | dc9df4786b08572d6032efbd47f727287e691656 (diff) | |
| download | illumos-joyent-93ed8d0d4b068b95d0bb50d57bb854df462a8485.tar.gz | |
4251 libdtrace leaks open file handles
4250 libdtrace should use "F" specifier on fopen()
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Eric Schrock <eric.schrock@delphix.com>
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_cc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr/src/lib/libdtrace/common/dt_cc.c b/usr/src/lib/libdtrace/common/dt_cc.c index 9661ad9d0b..f4b0509b4a 100644 --- a/usr/src/lib/libdtrace/common/dt_cc.c +++ b/usr/src/lib/libdtrace/common/dt_cc.c @@ -2149,7 +2149,7 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) (void) snprintf(fname, sizeof (fname), "%s/%s", path, dp->d_name); - if ((fp = fopen(fname, "r")) == NULL) { + if ((fp = fopen(fname, "rF")) == NULL) { dt_dprintf("skipping library %s: %s\n", fname, strerror(errno)); continue; @@ -2171,12 +2171,15 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) dt_dprintf("skipping library %s, already processed " "library with the same name: %s", dp->d_name, dld->dtld_library); + (void) fclose(fp); continue; } dtp->dt_filetag = fname; - if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) + if (dt_lib_depend_add(dtp, &dtp->dt_lib_dep, fname) != 0) { + (void) fclose(fp); return (-1); /* preserve dt_errno */ + } rv = dt_compile(dtp, DT_CTX_DPROG, DTRACE_PROBESPEC_NAME, NULL, @@ -2184,8 +2187,10 @@ dt_load_libs_dir(dtrace_hdl_t *dtp, const char *path) if (rv != NULL && dtp->dt_errno && (dtp->dt_errno != EDT_COMPILER || - dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) + dtp->dt_errtag != dt_errtag(D_PRAGMA_DEPEND))) { + (void) fclose(fp); return (-1); /* preserve dt_errno */ + } if (dtp->dt_errno) dt_dprintf("error parsing library %s: %s\n", |