diff options
author | Björn-Egil Dahlberg <[email protected]> | 2011-02-22 16:43:58 +0100 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2011-02-22 16:44:05 +0100 |
commit | 91275b07fb6151b1ec201ac9c8380b7b96724b63 (patch) | |
tree | 6c19d9745ff984796f6c62b2d36093016c69417d /lib/erl_interface/src/legacy/erl_marshal.c | |
parent | b0d6abb72cf32df548703b284b737a4a7c0a9d8a (diff) | |
parent | eed4341a21b8e2c8e00d0321bde1213d7a4359df (diff) | |
download | otp-91275b07fb6151b1ec201ac9c8380b7b96724b63.tar.gz otp-91275b07fb6151b1ec201ac9c8380b7b96724b63.tar.bz2 otp-91275b07fb6151b1ec201ac9c8380b7b96724b63.zip |
Merge branch 'ms/ei-fix-buffer-overflows' into dev
* ms/ei-fix-buffer-overflows:
erl_interface: fix buffer overflows
OTP-9071
Diffstat (limited to 'lib/erl_interface/src/legacy/erl_marshal.c')
-rw-r--r-- | lib/erl_interface/src/legacy/erl_marshal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c index 70949a7adf..5cfb5e2124 100644 --- a/lib/erl_interface/src/legacy/erl_marshal.c +++ b/lib/erl_interface/src/legacy/erl_marshal.c @@ -662,7 +662,7 @@ len = i #define STATIC_NODE_BUF_SZ 30 #define SET_NODE(node,node_buf,cp,len) \ -if (len >= STATIC_NODE_BUF_SZ) node = malloc(len+1); \ +if (len >= STATIC_NODE_BUF_SZ) node = erl_malloc(len+1); \ else node = node_buf; \ memcpy(node, cp, len); \ node[len] = '\0' @@ -1534,7 +1534,7 @@ static int cmp_string_list(unsigned char **e1, unsigned char **e2) { if ( e1_len < 256 ) { bp = buf; } else { - bp = malloc(5+(2*e1_len)+1); + bp = erl_malloc(5+(2*e1_len)+1); } bp[0] = ERL_LIST_EXT; |