diff options
| author | Micael Karlberg <[email protected]> | 2011-04-12 13:31:22 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-12 13:31:22 +0200 |
| commit | 7263707193d974050f485bd034e91ce4c3c7cb8f (patch) | |
| tree | 42ae12b4c3234d1428fc09a4195546bf6237fa3c /erts/lib_src | |
| parent | 057911fd21db849ff4f6a9fa28674002945f725f (diff) | |
| parent | 47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff) | |
| download | otp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.gz otp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.bz2 otp-7263707193d974050f485bd034e91ce4c3c7cb8f.zip | |
Merge branch 'dev' into bmk/snmp/manager/request_override_options
Diffstat (limited to 'erts/lib_src')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 4c881993a5..ec729407bb 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -813,7 +813,7 @@ read_topology(erts_cpu_info_t *cpuinfo) cpuinfo->topology = malloc(sizeof(erts_cpu_topology_t) * cpuinfo->configured); - if (!cpuinfo) + if (!cpuinfo->topology) goto error; for (ix = 0; ix < cpuinfo->configured; ix++) { @@ -1023,7 +1023,7 @@ read_topology(erts_cpu_info_t *cpuinfo) cpuinfo->topology = malloc(sizeof(erts_cpu_topology_t) * cpuinfo->configured); - if (!cpuinfo) + if (!cpuinfo->topology) goto error; for (ix = 0; ix < cpuinfo->configured; ix++) { |