1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QBuffer: fix the setData() API re: int/qsizetype

Browse Source 
The setData(ptr, n) overload was still taking the size as int.

Widen it.

Task-number: QTBUG-103525
Change-Id: If1d6d6404d62bbae5e0defea9a2115648c1fd5da
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Marc Mutz 2022-08-17 13:19:10 +02:00
parent 3be99799a6
commit 817e47fbcd
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/compat/removed_api.cpp
View File

@ -285,6 +285,8 @@ QT_WARNING_POP
#if QT_CORE_REMOVED_SINCE(6, 5) #if QT_CORE_REMOVED_SINCE(6, 5)
#include "qbuffer.h" // inline removed API
#include "qenvironmentvariables.h" #include "qenvironmentvariables.h"
bool qputenv(const char *varName, const QByteArray &value) bool qputenv(const char *varName, const QByteArray &value)

5
src/corelib/io/qbuffer.cpp
View File

@ -267,12 +267,15 @@ void QBuffer::setData(const QByteArray &data)
} }
/*! /*!
\fn void QBuffer::setData(const char *data, int size) \fn void QBuffer::setData(const char *data, qsizetype size)
\overload \overload
Sets the contents of the internal buffer to be the first \a size Sets the contents of the internal buffer to be the first \a size
bytes of \a data. bytes of \a data.
\note In Qt versions prior to 6.5, this function took the length as
an \c{int} parameter, potentially truncating sizes.
*/ */
/*! /*!

9
src/corelib/io/qbuffer.h
View File

@ -33,7 +33,11 @@ public:
void setBuffer(QByteArray *a); void setBuffer(QByteArray *a);
void setData(const QByteArray &data); void setData(const QByteArray &data);
inline void setData(const char *data, int len); #if QT_CORE_REMOVED_SINCE(6, 5) && QT_POINTER_SIZE != 4
void setData(const char *data, int len) { setData(data, qsizetype(len)); }
#endif
void setData(const char *data, qsizetype len)
{ setData(QByteArray(data, len)); }
const QByteArray &data() const; const QByteArray &data() const;
bool open(OpenMode openMode) override; bool open(OpenMode openMode) override;
@ -60,9 +64,6 @@ private:
Q_PRIVATE_SLOT(d_func(), void _q_emitSignals()) Q_PRIVATE_SLOT(d_func(), void _q_emitSignals())
}; };
inline void QBuffer::setData(const char *adata, int alen)
{ setData(QByteArray(adata, alen)); }
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QBUFFER_H #endif // QBUFFER_H