Katana_mirror/kde-playground
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-playground.git synced 2025-02-24 02:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

karchivemanager: fix stack buffer overflow

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-04-02 01:58:40 +03:00
parent 7fbaaf8268
commit aebb015286
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
karchivemanager/karchivemanager.cpp
View file

@ -178,14 +178,11 @@ QIcon KArchiveInfo::fancyIcon() const {
} }
bool KArchiveInfo::isNull() const { bool KArchiveInfo::isNull() const {
if (type == KArchiveType::None) { return (type == KArchiveType::None);
return true;
}
return false;
} }
bool KArchiveInfo::operator==(const KArchiveInfo &info) const { bool KArchiveInfo::operator==(const KArchiveInfo &info) const {
return pathname == info.pathname; return (pathname == info.pathname);
} }
KArchiveInfo& KArchiveInfo::operator=(const KArchiveInfo &info) { KArchiveInfo& KArchiveInfo::operator=(const KArchiveInfo &info) {
@ -397,7 +394,9 @@ bool KArchiveManagerPrivate::copyData(struct archive* aread, QByteArray &buffer)
return false; return false;
} }
buffer.append(readbuffer, readsize); // QByteArray::append() will attempt to copy the null terminator but this is raw data not
// string so instruct it to copy one less bit and will do the right thing
buffer.append(readbuffer, readsize - 1);
readsize = archive_read_data(aread, readbuffer, sizeof(readbuffer)); readsize = archive_read_data(aread, readbuffer, sizeof(readbuffer));
} }