1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index a4cc506089..206548d897 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -3723,6 +3723,15 @@ bool qEnvironmentVariableIsSet(const char *varName) noexcept
 */
 bool qputenv(const char *varName, const QByteArray& value)
 {
+    // protect against non-NUL-terminated QByteArrays:
+    #define IS_RAW_DATA(d) ((d)->offset != sizeof(QByteArrayData)) // copied from qbytearray.cpp
+    if (IS_RAW_DATA(const_cast<QByteArray&>(value).data_ptr())) {
+        QByteArray copy(value);
+        copy.detach(); // ensures NUL termination
+        return qputenv(varName, copy);
+    }
+    #undef IS_RAW_DATA
+
     const auto locker = qt_scoped_lock(environmentMutex);
 #if defined(Q_CC_MSVC)
     return _putenv_s(varName, value.constData()) == 0;