diff options
| author | Patrik Nyblom <[email protected]> | 2010-10-01 18:35:51 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-10-01 18:35:51 +0200 |
| commit | 35d4270f1e3d233bd3e0b2b001480c7bf32ff09d (patch) | |
| tree | 0784ae051047bac0123561c4b1a4dd06319ccf87 /erts/lib_src | |
| parent | 17224a3d31d25ce6daa4de63b52b26bee9564bcd (diff) | |
| download | otp-35d4270f1e3d233bd3e0b2b001480c7bf32ff09d.tar.gz otp-35d4270f1e3d233bd3e0b2b001480c7bf32ff09d.tar.bz2 otp-35d4270f1e3d233bd3e0b2b001480c7bf32ff09d.zip | |
Teach read_topology not to crash on W2K3
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 116c9886d8..498ce6837a 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -1228,7 +1228,10 @@ read_topology(erts_cpu_info_t *cpuinfo) nodes++; } - core_id = malloc(sizeof(int)*(packages ? packages : 1)); + if (!packages) { + packages = 1; + } + core_id = malloc(sizeof(int)*packages); if (!core_id) { res = -ENOMEM; goto error; @@ -1286,11 +1289,13 @@ read_topology(erts_cpu_info_t *cpuinfo) * Nodes and packages may not be supported; pretend * that there are one if this is the case... */ - if (!nodes) - cpuinfo->topology[l].node = 0; - if (!packages) - cpuinfo->topology[l].processor = 0; if (slpip[rix].ProcessorMask & (((ULONG_PTR) 1) << l)) { + if (!nodes) { + cpuinfo->topology[l].node = 0; + } + if (!packages) { + cpuinfo->topology[l].processor = 0; + } if (processor < 0) { processor = cpuinfo->topology[l].processor; if (processor < 0) { |