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

QHostInfo: simplify assignment operator

Browse Source 
The d_ptr is never nullptr. If it could be, then other's d_ptr could
also be nullptr, and we would dereference the null pointer.

Guarding against self-assignment is nevertheless a good practice.

Fixes static analyzer warning
5fc3780532e30c6350a0aa1ad2188a4c.

Change-Id: I07ff808e4c4f5bf07b4d6663f1fb4a3301a0fec7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 6e334a85a82f1fedc39f54511a9d1b0c7b512d5b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2021-03-03 17:16:37 +01:00 committed by Qt Cherry-pick Bot
parent 5af06405a6
commit 69951fec45
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/kernel/qhostinfo.cpp
View File

@ -609,10 +609,11 @@ QHostInfo::QHostInfo(const QHostInfo &other)
*/ */
QHostInfo &QHostInfo::operator=(const QHostInfo &other) QHostInfo &QHostInfo::operator=(const QHostInfo &other)
{ {
if (d_ptr) if (this == &other)
*d_ptr = *other.d_ptr; return *this;
else
d_ptr = new QHostInfoPrivate(*other.d_ptr); Q_ASSERT(d_ptr && other.d_ptr);
*d_ptr = *other.d_ptr;
return *this; return *this;
} }