feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

don't include zero terminator into the string

Browse Source 
fixes "run in terminal" and potentially numerous other bugs.

Task-number: QTCREATORBUG-4012
This commit is contained in:
Oswald Buddenhagen
2011-03-21 20:24:18 +01:00
parent 919acf5786
commit 428520d8eb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/winutils.cpp
View File

@@ -160,7 +160,7 @@ QTCREATOR_UTILS_EXPORT QString getShortPathName(const QString &name, QString *er
return name; return name;
QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]);
(*getShortPathNameW)(nameC, buffer.data(), 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; return rc;
} }
@@ -192,7 +192,7 @@ QTCREATOR_UTILS_EXPORT QString getLongPathName(const QString &name, QString *err
return name; return name;
QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]); QScopedArrayPointer<TCHAR> buffer(new TCHAR[length]);
(*getLongPathNameW)(nameC, buffer.data(), 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; return rc;
} }