diff options
| author | Henrik Nord <[email protected]> | 2011-04-05 10:03:01 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-04-05 10:03:06 +0200 |
| commit | c60f40cc61347af363ccd4956daf67cc7079cf85 (patch) | |
| tree | a73e4a38b344dec43e433078bd552bf01a06cfe4 /erts | |
| parent | 923d311f2b06f9aa953b0099d51700c2c140e0c7 (diff) | |
| parent | 47f9ef2ee5f3d9a79038fe8318c740a7c4345541 (diff) | |
| download | otp-c60f40cc61347af363ccd4956daf67cc7079cf85.tar.gz otp-c60f40cc61347af363ccd4956daf67cc7079cf85.tar.bz2 otp-c60f40cc61347af363ccd4956daf67cc7079cf85.zip | |
Merge branch 'cg/fix-pointer-dereference' into dev
* cg/fix-pointer-dereference:
Fix some wrong pointer dereferences
OTP-9194
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/etc/common/inet_gethost.c | 2 | ||||
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/etc/common/inet_gethost.c b/erts/etc/common/inet_gethost.c index 8bd9368aa1..18ccf974aa 100644 --- a/erts/etc/common/inet_gethost.c +++ b/erts/etc/common/inet_gethost.c @@ -1297,7 +1297,7 @@ static int read_request(AddrByte **buff, size_t *buff_size) } if (siz > *buff_size) { - if (buff_size == 0) { + if (*buff_size == 0) { *buff = ALLOC((*buff_size = siz)); } else { *buff = REALLOC(*buff, (*buff_size = siz)); 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++) { |