Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	qmake/generators/makefile.cpp

Change-Id: Ib3715e626f2fd32804c75c16ea9aa06a1216e76d

1 files changed, 12 insertions, 2 deletions

diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index 4669c20711..1e72241e68 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -468,8 +468,18 @@ inline bool QStorageIterator::next()
     size_t len = strlen(buffer.data());
     if (len == 0)
         return false;
-    if (ptr[len - 1] == '\n')
-        ptr[len - 1] = '\0';
+    while (Q_UNLIKELY(ptr[len - 1] != '\n' && !feof(fp))) {
+        // buffer wasn't large enough. Enlarge and try again.
+        // (we're readidng from the kernel, so OOM is unlikely)
+        buffer.resize((buffer.size() + 4096) & ~4095);
+        ptr = buffer.data();
+        if (fgets(ptr + len, buffer.size() - len, fp) == nullptr)
+            return false;
+
+        len += strlen(ptr + len);
+        Q_ASSERT(len < size_t(buffer.size()));
+    }
+    ptr[len - 1] = '\0';
 
     // parse the line
     bool ok;