fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(libarchive): use multibyte encoding aware libarchive functions when dealing with filenames

Browse Source 
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
This commit is contained in:
Rachel Powers
2025-12-08 20:11:53 -07:00
parent 2e3097d5ca
commit 87286fa6a3
2 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/archive/ArchiveReader.cpp
View File

@@ -41,7 +41,7 @@ bool ArchiveReader::collectFiles(bool onlyFiles)
QString ArchiveReader::File::filename()
{
return QString::fromUtf8(archive_entry_pathname(m_entry));
return QString::fromUtf8(archive_entry_pathname_utf8(m_entry));
}
QByteArray ArchiveReader::File::readAll(int* outStatus)
@@ -83,8 +83,8 @@ auto ArchiveReader::goToFile(QString filename) -> std::unique_ptr<File>
auto a = f->m_archive.get();
archive_read_support_format_all(a);
archive_read_support_filter_all(a);
auto fileName = m_archivePath.toUtf8();
if (archive_read_open_filename(a, fileName.constData(), m_blockSize) != ARCHIVE_OK) {
auto fileName = m_archivePath.toStdWString();
if (archive_read_open_filename_w(a, fileName.data(), m_blockSize) != ARCHIVE_OK) {
qCritical() << "Failed to open archive file:" << m_archivePath << "-" << archive_error_string(a);
return nullptr;
}
@@ -133,7 +133,7 @@ bool ArchiveReader::File::writeFile(archive* out, QString targetFileName, bool n
if (!targetFileName.isEmpty()) {
entry = archive_entry_clone(m_entry);
auto nameUtf8 = targetFileName.toUtf8();
archive_entry_set_pathname(entry, nameUtf8.constData());
archive_entry_set_pathname_utf8(entry, nameUtf8.constData());
}
if (archive_write_header(out, entry) < ARCHIVE_OK) {
qCritical() << "Failed to write header to entry:" << filename() << "-" << archive_error_string(out);
@@ -157,8 +157,8 @@ bool ArchiveReader::parse(std::function<bool(File*, bool&)> doStuff)
auto a = f->m_archive.get();
archive_read_support_format_all(a);
archive_read_support_filter_all(a);
auto fileName = m_archivePath.toUtf8();
if (archive_read_open_filename(a, fileName.constData(), m_blockSize) != ARCHIVE_OK) {
auto fileName = m_archivePath.toStdWString();
if (archive_read_open_filename_w(a, fileName.data(), m_blockSize) != ARCHIVE_OK) {
qCritical() << "Failed to open archive file:" << m_archivePath << "-" << f->error();
return false;
}