path: root/src/corelib/tools/qbytearray.h
diff options
authorUlf Hermann <>2015-06-03 15:57:42 +0200
committerUlf Hermann <>2015-06-16 14:30:45 +0000
commitef0f7f424872a27c8397f854eecff753428bcddc (patch)
tree72cc245da16bc233f7586a312c3ea2890f0ffd6c /src/corelib/tools/qbytearray.h
parent8d5516b58541b2ad63497437271f0a4e36ed311d (diff)
Unify QByteArray::MaxSize and MaxAllocSize
We have established the maximum size qAllocMore can deal with in commit 880986be2357a1f80827d038d770dc2f80300201 and we should use it. The maximum size for byte arrays is reduced by one byte as with the previous code we could make qAllocMore produce ((1 << 31) - extra) by passing (1 << 30). That is not a problem for qAllocMore itself (as long as extra > 0) but it's hard to verify that no related code casts the total sum back to signed int, which would overflow to -1. To make the compiler inline access to the maximum size, a private enum MaxByteArraySize is provided, which can be used in internal code. This fixes the merge of commits 880986be2357a1f80827d038d770dc2f80300201 and c70658d301e274c3aaa1fb6cebe2a5e56db12779 Change-Id: Idb04856f7c2e53ef383063e7555d3083020ff2b7 Reviewed-by: Thiago Macieira <>
Diffstat (limited to 'src/corelib/tools/qbytearray.h')
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 6d14cd5131..38f277533b 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -162,9 +162,6 @@ private:
typedef QTypedArrayData<char> Data;
- // undocumented:
- static const quint64 MaxSize = (1 << 30) - sizeof(Data);
enum Base64Option {
Base64Encoding = 0,
Base64UrlEncoding = 1,