Fix online installation into directory with elevated permissions.

Inside the Resource class we can't use QFile, as that will access
the elevated running server to read from a only client side mapped
file. Adjust Resource::readData to behave properly with the file
engine's nativeRead(...) implementation, e.g. on Unix it returns
-1 if called to read with a size of 0 bytes.
Do not write to the socket if we are running in a different thread
than the one the socket was created in. Fix logically broken connect
function.

Task-number: QTIFW-572
Change-Id: I993b5d3a5c217b0aedbbc27837dce2619e51d224
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Takayuki ORITO <iori.ayane@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp
index 9cf7ef28a..015e21b2f 100644
--- a/src/libs/installer/binaryformat.cpp
+++ b/src/libs/installer/binaryformat.cpp
@@ -197,9 +197,14 @@ qint64 Resource::size() const
  */
 qint64 Resource::readData(char* data, qint64 maxSize)
 {
+    // check if there is anything left to read
+    maxSize = qMin<quint64>(maxSize, m_segment.length() - pos());
+    if (maxSize <= 0)
+        return 0;
+
     const qint64 p = m_file.pos();
     m_file.seek(m_segment.start() + pos());
-    const qint64 amountRead = m_file.read(data, qMin<quint64>(maxSize, m_segment.length() - pos()));
+    const qint64 amountRead = m_file.read(data, maxSize);
     m_file.seek(p);
     return amountRead;
 }