diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-22 11:01:17 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-06-24 22:57:27 +0300 |
| commit | d60ff33691519a9505afc8818735139f4dfd0c31 (patch) | |
| tree | 0eb2ea8a18f2240fb042f2d4b50f104f9eb23315 | |
| parent | 7c207486dba29784d04c67b7d1a97e8cff0a4ff9 (diff) | |
| download | illumos-joyent-d60ff33691519a9505afc8818735139f4dfd0c31.tar.gz | |
11141 libdtrace: NULL pointer errors
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_consume.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_handle.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_map.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libdtrace/common/dt_module.c | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/usr/src/lib/libdtrace/common/dt_consume.c b/usr/src/lib/libdtrace/common/dt_consume.c index 549abb2e75..807d60a79a 100644 --- a/usr/src/lib/libdtrace/common/dt_consume.c +++ b/usr/src/lib/libdtrace/common/dt_consume.c @@ -1277,7 +1277,7 @@ dt_print_stack(dtrace_hdl_t *dtp, FILE *fp, const char *format, return (dt_set_errno(dtp, EDT_BADSTACKPC)); } - if (pc == NULL) + if (pc == 0) break; addr += size; @@ -1365,7 +1365,7 @@ dt_print_ustack(dtrace_hdl_t *dtp, FILE *fp, const char *format, if (P != NULL) dt_proc_lock(dtp, P); /* lock handle while we perform lookups */ - for (i = 0; i < depth && pc[i] != NULL; i++) { + for (i = 0; i < depth && pc[i] != 0; i++) { const prmap_t *map; if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0) diff --git a/usr/src/lib/libdtrace/common/dt_handle.c b/usr/src/lib/libdtrace/common/dt_handle.c index 9d27aee4de..49b7f22cf7 100644 --- a/usr/src/lib/libdtrace/common/dt_handle.c +++ b/usr/src/lib/libdtrace/common/dt_handle.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stddef.h> #include <stdlib.h> #include <strings.h> @@ -247,7 +245,7 @@ dt_handle_liberr(dtrace_hdl_t *dtp, const dtrace_probedata_t *data, err.dteda_action = -1; err.dteda_offset = -1; err.dteda_fault = DTRACEFLT_LIBRARY; - err.dteda_addr = NULL; + err.dteda_addr = 0; len = strlen(faultstr) + strlen(errpd->dtpd_provider) + strlen(errpd->dtpd_mod) + diff --git a/usr/src/lib/libdtrace/common/dt_map.c b/usr/src/lib/libdtrace/common/dt_map.c index 8a3ce817e4..16e3525b1e 100644 --- a/usr/src/lib/libdtrace/common/dt_map.c +++ b/usr/src/lib/libdtrace/common/dt_map.c @@ -384,7 +384,7 @@ dt_aggid_add(dtrace_hdl_t *dtp, dtrace_aggid_t id) * provide the compiler-generated aggregation information. */ if (dtp->dt_options[DTRACEOPT_GRABANON] == DTRACEOPT_UNSET && - agg->dtagd_rec[0].dtrd_uarg != NULL) { + agg->dtagd_rec[0].dtrd_uarg != 0) { dtrace_stmtdesc_t *sdp; dt_ident_t *aid; diff --git a/usr/src/lib/libdtrace/common/dt_module.c b/usr/src/lib/libdtrace/common/dt_module.c index 0288f329da..cc4cdbaa19 100644 --- a/usr/src/lib/libdtrace/common/dt_module.c +++ b/usr/src/lib/libdtrace/common/dt_module.c @@ -906,11 +906,11 @@ dt_module_unload(dtrace_hdl_t *dtp, dt_module_t *dmp) dmp->dm_asrsv = 0; dmp->dm_aslen = 0; - dmp->dm_text_va = NULL; + dmp->dm_text_va = 0; dmp->dm_text_size = 0; - dmp->dm_data_va = NULL; + dmp->dm_data_va = 0; dmp->dm_data_size = 0; - dmp->dm_bss_va = NULL; + dmp->dm_bss_va = 0; dmp->dm_bss_size = 0; if (dmp->dm_extern != NULL) { |