diff options
| author | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-09-19 19:26:54 +0200 |
| commit | 7c730a573a7e239f41bc619b024a675667767428 (patch) | |
| tree | 1265ca1ddae47b094af21f669d0526c9c1b074dd /lib/erl_interface/src/encode/encode_string.c | |
| parent | 13fcdd5c954ddbb8ac9401d73f8e77423fbd976c (diff) | |
| parent | e84f232326b2800ca806c867b2bfbe3652d423cb (diff) | |
| download | otp-7c730a573a7e239f41bc619b024a675667767428.tar.gz otp-7c730a573a7e239f41bc619b024a675667767428.tar.bz2 otp-7c730a573a7e239f41bc619b024a675667767428.zip | |
Merge branch 'dev' of super:otp into bmk/inets/inets571_integration
Diffstat (limited to 'lib/erl_interface/src/encode/encode_string.c')
| -rw-r--r-- | lib/erl_interface/src/encode/encode_string.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/erl_interface/src/encode/encode_string.c b/lib/erl_interface/src/encode/encode_string.c index 1d342cb605..593bbf2b6d 100644 --- a/lib/erl_interface/src/encode/encode_string.c +++ b/lib/erl_interface/src/encode/encode_string.c @@ -17,6 +17,7 @@ * %CopyrightEnd% */ #include <string.h> +#include <limits.h> #include "eidef.h" #include "eiext.h" #include "putget.h" @@ -24,7 +25,10 @@ int ei_encode_string(char *buf, int *index, const char *p) { - return ei_encode_string_len(buf, index, p, strlen(p)); + size_t len = strlen(p); + + if (len >= INT_MAX) return -1; + return ei_encode_string_len(buf, index, p, len); } int ei_encode_string_len(char *buf, int *index, const char *p, int len) |