diff options
author | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
commit | 42ef7086abd717e7a428804fe387b782abab9827 (patch) | |
tree | b4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /erts/etc/common/inet_gethost.c | |
parent | 30a9f962d349f322f389ebc056e972f871e689a8 (diff) | |
parent | 9022ef27b8628ca680654d542b4d520426480c2d (diff) | |
download | otp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2 otp-42ef7086abd717e7a428804fe387b782abab9827.zip |
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'erts/etc/common/inet_gethost.c')
-rw-r--r-- | erts/etc/common/inet_gethost.c | 2 |
1 files changed, 1 insertions, 1 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)); |