diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 20:24:18 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 21:11:40 +0100 |
| commit | 428520d8eb1f60e2322411027805e8f4c6903c28 (patch) | |
| tree | 6389672cc80760e462f997f1cf4488881323978b /src/libs/utils/winutils.cpp | |
| parent | 919acf578673cbb0c75b53ccd21615df513ac8cc (diff) | |
don't include zero terminator into the string
fixes "run in terminal" and potentially numerous other bugs.
Task-number: QTCREATORBUG-4012
Diffstat (limited to 'src/libs/utils/winutils.cpp')
| -rw-r--r-- | src/libs/utils/winutils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/winutils.cpp b/src/libs/utils/winutils.cpp index 073aacfe54a..80ea37134b8 100644 --- a/src/libs/utils/winutils.cpp +++ b/src/libs/utils/winutils.cpp @@ -160,7 +160,7 @@ QTCREATOR_UTILS_EXPORT QString getShortPathName(const QString &name, QString *er return name; QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); (*getShortPathNameW)(nameC, buffer.data(), length); - const QString rc = QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.data()), length); + const QString rc = QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.data()), length - 1); return rc; } @@ -192,7 +192,7 @@ QTCREATOR_UTILS_EXPORT QString getLongPathName(const QString &name, QString *err return name; QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); (*getLongPathNameW)(nameC, buffer.data(), length); - const QString rc = QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.data()), length); + const QString rc = QString::fromUtf16(reinterpret_cast<const ushort *>(buffer.data()), length - 1); return rc; } |