whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix decoding of file paths in QLockFilePrivate::processNameByPid 

QFile::decodeName should be used instead of a simple QString::fromUtf8.

Change-Id: I76955ab01af55dd373f860f6e3dbffa37e60892c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
bb10
Joerg Bornemann 2015-06-08 11:27:43 +02:00
parent b23f1d2c8b
commit 2a0c003e6b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qlockfile_unix.cpp
View File

@ -218,7 +218,7 @@ QString QLockFilePrivate::processNameByPid(qint64 pid)
#if defined(Q_OS_OSX)
char name[1024];
proc_name(pid, name, sizeof(name) / sizeof(char));
return QString::fromUtf8(name);
return QFile::decodeName(name);
#elif defined(Q_OS_LINUX)
if (!QFile::exists(QStringLiteral("/proc/version")))
return QString();
@ -231,12 +231,12 @@ QString QLockFilePrivate::processNameByPid(qint64 pid)
return QStringLiteral("/ERROR/");
}
buf[len] = 0;
return QFileInfo(QString::fromUtf8(buf)).fileName();
return QFileInfo(QFile::decodeName(buf)).fileName();
#elif defined(Q_OS_BSD4) && !defined(Q_OS_IOS)
kinfo_proc *proc = kinfo_getproc(pid);
if (!proc)
return QString();
QString name = QString::fromUtf8(proc->ki_comm);
QString name = QFile::decodeName(proc->ki_comm);
free(proc);
return name;
#else