diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2020-03-06 13:38:17 -0800 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2020-03-27 16:45:48 -0300 |
| commit | 783d574b932288b61f915b28d5b7b9c5a979f58e (patch) | |
| tree | ab647de1e22df5bd3b17eff462e96bd5339b2101 /src/corelib/text/qbytearray_p.h | |
| parent | 0b4ae8e6829e32b2648e66c010c325e9c9a0231c (diff) | |
CBOR support: prevent overflowing QByteArray's max allocation
QByteArray doesn't like it.
Apply the same protection to QString, which we know uses the same
backend but uses elements twice as big. That means it can contain
slightly more than half as many elements, but exact half will suffice
for our needs.
Change-Id: Iaa63461109844e978376fffd15f9d4c7a9137856
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/corelib/text/qbytearray_p.h')
| -rw-r--r-- | src/corelib/text/qbytearray_p.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/text/qbytearray_p.h b/src/corelib/text/qbytearray_p.h index 3c6257f786..ffec6dca22 100644 --- a/src/corelib/text/qbytearray_p.h +++ b/src/corelib/text/qbytearray_p.h @@ -56,10 +56,9 @@ QT_BEGIN_NAMESPACE -enum { - // Define as enum to force inlining. Don't expose MaxAllocSize in a public header. - MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type) -}; +// -1 because of the terminating NUL +constexpr qsizetype MaxByteArraySize = MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type) - 1; +constexpr qsizetype MaxStringSize = (MaxAllocSize - sizeof(std::remove_pointer<QByteArray::DataPtr>::type)) / 2 - 1; QT_END_NAMESPACE |