Module Name: src
Committed By: joerg
Date: Tue Mar 1 21:09:17 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: drti.c
Log Message:
Don't crash when relocbase was 0.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.7
--- src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c:1.6 Mon Feb 29 02:19:37 2016
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c Tue Mar 1 21:09:17 2016
@@ -149,7 +149,7 @@ dtrace_dof_init(void)
elf = (void *)lmp->l_addr;
dh.dofhp_dof = (uintptr_t)dof;
- dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0;
+ dh.dofhp_addr = elf && elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0;
#if defined(__FreeBSD__) || defined(__NetBSD__)
dh.dofhp_pid = getpid();
#endif
