From 22ca2f96318fd461cfbcc23fd450623fe08610a3 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 21 Jan 2019 19:20:35 +0200 Subject: 11109 librtld_db: NULL pointer errors Reviewed by: Jason Lippert Approved by: Dan McDonald --- usr/src/cmd/sgs/librtld_db/common/rd_elf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c index 410b819b30..737fb2ee0f 100644 --- a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c +++ b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c @@ -140,7 +140,7 @@ validate_rdebug32(struct rd_agent *rap) rd_err_e find_dynamic_ent32(struct rd_agent *rap, psaddr_t dynaddr, - Xword dyntag, Dyn *dyn) + Xword dyntag, Dyn *dyn) { struct ps_prochandle *php = rap->rd_psp; Dyn d; @@ -550,7 +550,7 @@ _rd_objpad_enable32(struct rd_agent *rap, size_t padsize) static rd_err_e iter_map(rd_agent_t *rap, unsigned long ident, psaddr_t lmaddr, - rl_iter_f *cb, void *client_data, uint_t *abort_iterp) + rl_iter_f *cb, void *client_data, uint_t *abort_iterp) { while (lmaddr) { Rt_map rmap; @@ -704,7 +704,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data, return (RD_DBERR); } - if (db_priv.rtd_dynlmlst == NULL) { + if (db_priv.rtd_dynlmlst == 0) { LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT), EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst))); return (RD_NOMAPS); @@ -717,7 +717,7 @@ _rd_loadobj_iter32_native(rd_agent_t *rap, rl_iter_f *cb, void *client_data, return (RD_DBERR); } - if (addr == NULL) { + if (addr == 0) { LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT_1), EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst))); return (RD_NOMAPS); -- cgit v1.2.3