diff options
| author | Sverker Eriksson <[email protected]> | 2010-12-01 14:45:40 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2010-12-01 14:45:40 +0100 |
| commit | c7fa778ae11c33f4568fbfd91d58550c781b54d6 (patch) | |
| tree | 3d537f777e4950e62b683d31c2b38f9c805c371a /lib/erl_interface/src | |
| parent | b26d90c13902776c1a30bfeedc2131d2c0ac16bc (diff) | |
| parent | af9ee16efdb1f7fe45b2812b045157d8eb0a8d4c (diff) | |
| download | otp-c7fa778ae11c33f4568fbfd91d58550c781b54d6.tar.gz otp-c7fa778ae11c33f4568fbfd91d58550c781b54d6.tar.bz2 otp-c7fa778ae11c33f4568fbfd91d58550c781b54d6.zip | |
Merge branch 'sverker/erl_interface-32intfix/OTP-8945' into dev
* sverker/erl_interface-32intfix/OTP-8945:
Fix ei_decode_SUITE:test_ei_decode_long for halfword vm
erl_interface: Fix erl_term_len for integers and refs
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/legacy/erl_marshal.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c index 5084c65230..a6c2f64dd0 100644 --- a/lib/erl_interface/src/legacy/erl_marshal.c +++ b/lib/erl_interface/src/legacy/erl_marshal.c @@ -511,29 +511,28 @@ static int erl_term_len_helper(ETERM *ep, int dist) case ERL_INTEGER: i = ep->uval.ival.i; - if ((i > ERL_MAX) || (i < ERL_MIN)) len = 7; - else if ((i < 256) && (i >= 0)) len = 2; + if ((i < 256) && (i >= 0)) len = 2; else len = 5; break; case ERL_U_INTEGER: u = ep->uval.uival.u; - if (u > ERL_MAX) len = 7; + if ((int)u < 0) len = 7; else if (u < 256) len = 2; else len = 5; break; case ERL_LONGLONG: l = ep->uval.llval.i; - if ((l > ((long long) ERL_MAX)) || - (l < ((long long) ERL_MIN))) len = 11; + if ((l > ((long long) INT_MAX)) || + (l < ((long long) INT_MIN))) len = 11; else if ((l < 256) && (l >= 0)) len = 2; else len = 5; break; case ERL_U_LONGLONG: ul = ep->uval.ullval.u; - if (ul > ((unsigned long long) ERL_MAX)) len = 11; + if (ul > ((unsigned long long) INT_MAX)) len = 11; else if (ul < 256) len = 2; else len = 5; break; @@ -546,12 +545,7 @@ static int erl_term_len_helper(ETERM *ep, int dist) case ERL_REF: i = strlen((char *)ERL_REF_NODE(ep)); - if (dist >= 4 && ERL_REF_LEN(ep) > 1) { - len = 1 + 2 + (i+3) + 1 + ERL_REF_LEN(ep) * 4; - } else { - /* 1 + N + 4 + 1 where N = 3 + strlen */ - len = 9 + i; - } + len = 1 + 2 + (i+3) + 1 + ERL_REF_LEN(ep) * 4; break; case ERL_PORT: |