Module Name: src
Committed By: christos
Date: Sat Jun 2 01:19:46 UTC 2018
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_module.c
Log Message:
Use a constant to prevent dynamic array allocation which messes up SSP.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.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/dt_module.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.16 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.17
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.16 Mon May 28 17:05:05 2018
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c Fri Jun 1 21:19:46 2018
@@ -1268,8 +1268,8 @@ dt_module_update(dtrace_hdl_t *dtp, stru
#ifdef __NetBSD__
mapbase = 0;
if (ismod) {
- int maxmodules = 512;
- modstat_t modstat_buf[maxmodules], *ms;
+#define MAXMODULES 512
+ modstat_t modstat_buf[MAXMODULES], *ms;
struct iovec iov = { modstat_buf, sizeof(modstat_buf) };
if (modctl(MODCTL_STAT, &iov) < 0) {
@@ -1278,14 +1278,14 @@ dt_module_update(dtrace_hdl_t *dtp, stru
return;
}
- for (i = 0; i < maxmodules; i++) {
+ for (i = 0; i < MAXMODULES; i++) {
ms = &modstat_buf[i];
if (!strcmp(name, ms->ms_name)) {
mapbase = ms->ms_addr;
break;
}
}
- if (i == maxmodules) {
+ if (i == MAXMODULES) {
dt_dprintf("module %s not found\n", name);
return;
}
