aboutsummaryrefslogtreecommitdiffstats
path: root/lib/erl_interface/src/encode/encode_atom.c
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-08 16:36:26 +0200
committerHenrik Nord <[email protected]>2011-09-08 16:36:26 +0200
commitf602ae4f0c727c1ff37e69887ba33f46b24c54e1 (patch)
tree340525e4b69e6971854de896b4f64d70b2224b0a /lib/erl_interface/src/encode/encode_atom.c
parent6fae573fc291f4a77282b918cae346064bece80e (diff)
parent262a9af33d3ceb4cb032c434b100cea7d4b0d60e (diff)
downloadotp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.gz
otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.tar.bz2
otp-f602ae4f0c727c1ff37e69887ba33f46b24c54e1.zip
Merge branch 'dev' into major
Diffstat (limited to 'lib/erl_interface/src/encode/encode_atom.c')
-rw-r--r--lib/erl_interface/src/encode/encode_atom.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/erl_interface/src/encode/encode_atom.c b/lib/erl_interface/src/encode/encode_atom.c
index 69f2d1451c..b1a4479034 100644
--- a/lib/erl_interface/src/encode/encode_atom.c
+++ b/lib/erl_interface/src/encode/encode_atom.c
@@ -17,13 +17,17 @@
* %CopyrightEnd%
*/
#include <string.h>
+#include <limits.h>
#include "eidef.h"
#include "eiext.h"
#include "putget.h"
int ei_encode_atom(char *buf, int *index, const char *p)
{
- return ei_encode_atom_len(buf, index, p, strlen(p));
+ size_t len = strlen(p);
+
+ if (len >= INT_MAX) return -1;
+ return ei_encode_atom_len(buf, index, p, len);
}
int ei_encode_atom_len(char *buf, int *index, const char *p, int len)