From 08537771bdf9a4759915deda2534337c5cbd12e1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 22 Apr 2010 20:49:49 +0200 Subject: Revert "Fix strerror_r in case it returns a pointer that is not our buffer" This reverts commit 56891588a23adfe4ac6a8fbe01083464dc67e79b. --- src/corelib/global/qglobal.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index e29ad79..dfa2c17 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2126,7 +2126,8 @@ QString qt_error_string(int errorCode) #elif !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && _POSIX_VERSION >= 200112L && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_QNX) QByteArray buf(1024, '\0'); - ret = QString::fromLocal8Bit(strerror_r(errorCode, buf.data(), buf.size())); + strerror_r(errorCode, buf.data(), buf.size()); + ret = QString::fromLocal8Bit(buf.constData()); #else ret = QString::fromLocal8Bit(strerror(errorCode)); #endif -- cgit v0.12