From 67391f0a572ddc9c53bdff35dac893b07a862fe5 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 22 Nov 2017 01:05:52 +0100
Subject: Fix aliasing problem in QVector::removeAll()

Since removeAll() takes its argument by cref, if passing a reference
to an element of the container to removeAll(), the element may be
deleted (overwritten) by anyother value, leading to UB.

Add a test that actually happens to fail for me without the patch,
even though that might not be guaranteed (we may invoke UB).

Change-Id: If8c795113aeb515f4a9bdf1e072395b932295667
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/tools/qvector/tst_qvector.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 374fec221e..6975452d76 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -245,6 +245,7 @@ private slots:
     void qhashInt() const { qhash<int>(); }
     void qhashMovable() const { qhash<Movable>(); }
     void qhashCustom() const { qhash<Custom>(); }
+    void removeAllWithAlias() const;
     void removeInt() const;
     void removeMovable() const;
     void removeCustom() const;
@@ -1722,6 +1723,13 @@ void tst_QVector::prependCustom() const
     QCOMPARE(instancesCount, Custom::counter.loadAcquire());
 }
 
+void tst_QVector::removeAllWithAlias() const
+{
+    QVector<QString> strings;
+    strings << "One" << "Two" << "Three" << "One" /* must be distinct, but equal */;
+    QCOMPARE(strings.removeAll(strings.front()), 2); // will trigger asan/ubsan
+}
+
 template<typename T>
 void tst_QVector::remove() const
 {
-- 
cgit v1.2.3


From bc9941db42172b7f55c69bad27a7b6ae378f4e4a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Wed, 29 Nov 2017 14:17:58 +0100
Subject: tst_QNetworkReply: Blacklist putToFtpWithInvalidCredentials for
 Windows

Task-number: QTBUG-62860
Change-Id: Ibf4d7de9eedc2236375ad10ca4bea08055c7ae00
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 tests/auto/network/access/qnetworkreply/BLACKLIST | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST
index 57f33d5863..d4c83bc40b 100644
--- a/tests/auto/network/access/qnetworkreply/BLACKLIST
+++ b/tests/auto/network/access/qnetworkreply/BLACKLIST
@@ -32,6 +32,8 @@ linux
 windows
 [putToFtp]
 windows ci
+[putToFtpWithInvalidCredentials]
+windows ci
 [putWithServerClosingConnectionImmediately]
 windows
 [qtbug28035browserDoesNotLoadQtProjectOrgCorrectly]
-- 
cgit v1.2.3