aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ic/include/ic.h
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
committerErlang/OTP <[email protected]>2018-07-20 14:09:36 +0200
commit0c31b507248744582724a2112079edd09e62afb3 (patch)
treedb712f83a37a08196527bbc445afafac5af1ec48 /lib/ic/include/ic.h
parentc836bcd577762cef4b8475a7b6ad1bdf7aba9332 (diff)
parentb045265b77d7f495e9346b3671d503e3fdcbd7c6 (diff)
downloadotp-0c31b507248744582724a2112079edd09e62afb3.tar.gz
otp-0c31b507248744582724a2112079edd09e62afb3.tar.bz2
otp-0c31b507248744582724a2112079edd09e62afb3.zip
Merge branch 'sverker/ic/encode-long-buffer-overflow/OTP-15179' into maint-20
* sverker/ic/encode-long-buffer-overflow/OTP-15179: ic: Tweak tests to provoke more outbuf reallocations ic: Fix memory leak in oe_ei_decode_wstring ic: Fix correct external format sizes
Diffstat (limited to 'lib/ic/include/ic.h')
-rw-r--r--lib/ic/include/ic.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ic/include/ic.h b/lib/ic/include/ic.h
index 3dc5dbd4b5..1eb9e1e9d9 100644
--- a/lib/ic/include/ic.h
+++ b/lib/ic/include/ic.h
@@ -251,13 +251,13 @@ extern "C" {
#define __OE_MEMCHUNK__ 1024
#define __OE_VSNSZ__ 1
-#define __OE_LONGSZ__ 7
-#define __OE_LONGLONGSZ__ 7
-#define __OE_ULONGSZ__ 7
-#define __OE_ULONGLONGSZ__ 7
-#define __OE_DOUBLESZ__ 32
+#define __OE_LONGSZ__ (3+sizeof(long))
+#define __OE_LONGLONGSZ__ (3+sizeof(long))
+#define __OE_ULONGSZ__ (3+sizeof(long))
+#define __OE_ULONGLONGSZ__ (3+sizeof(long))
+#define __OE_DOUBLESZ__ 9
#define __OE_CHARSZ__ 2
-#define __OE_WCHARSZ__ 7
+#define __OE_WCHARSZ__ (3+sizeof(CORBA_wchar))
#define __OE_TUPLEHDRSZ__ 5
#define __OE_LISTHDRSZ__ 5