Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kutils: KDecompressor optimization

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-21 19:10:31 +02:00
parent 72faa00809
commit 6b5605a0a0
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
kutils/karchive/kdecompressor.cpp
View file

@ -105,15 +105,19 @@ bool KDecompressor::process(const QByteArray &data)
case KDecompressor::TypeDeflate:
case KDecompressor::TypeZlib:
case KDecompressor::TypeGZip: {
size_t speculativesize = (data.size() * 2);
if (Q_UNLIKELY(speculativesize >= INT_MAX)) {
d->m_errorstring = i18n("Input data size too big: %1", data.size());
return false;
}
d->m_result.resize(speculativesize);
struct libdeflate_decompressor* decomp = libdeflate_alloc_decompressor();
if (Q_UNLIKELY(!decomp)) {
d->m_errorstring = i18n("Could not allocate decompressor");
return false;
}
size_t speculativesize = (data.size() * 2);
d->m_result.resize(speculativesize);
libdeflate_result decompresult = LIBDEFLATE_INSUFFICIENT_SPACE;
while (decompresult == LIBDEFLATE_INSUFFICIENT_SPACE) {
switch (d->m_type) {
@ -153,12 +157,11 @@ bool KDecompressor::process(const QByteArray &data)
if (decompresult == LIBDEFLATE_INSUFFICIENT_SPACE) {
speculativesize = (speculativesize + KDECOMPRESSOR_BUFFSIZE);
if (speculativesize >= INT_MAX) {
break;
}
d->m_result.resize(speculativesize);
}
if (speculativesize >= INT_MAX) {
break;
}
}
libdeflate_free_decompressor(decomp);
@ -174,6 +177,10 @@ bool KDecompressor::process(const QByteArray &data)
#if defined(HAVE_BZIP2)
case KDecompressor::TypeBZip2: {
uint speculativesize = (data.size() * 2);
if (Q_UNLIKELY(speculativesize >= INT_MAX)) {
d->m_errorstring = i18n("Input data size too big: %1", data.size());
return false;
}
d->m_result.resize(speculativesize);
int decompresult = BZ_OUTBUFF_FULL;
@ -186,12 +193,11 @@ bool KDecompressor::process(const QByteArray &data)
if (decompresult == BZ_OUTBUFF_FULL) {
speculativesize = (speculativesize + KDECOMPRESSOR_BUFFSIZE);
if (speculativesize >= INT_MAX) {
break;
}
d->m_result.resize(speculativesize);
}
if (speculativesize >= INT_MAX) {
break;
}
}
if (Q_UNLIKELY(decompresult < BZ_OK || decompresult > BZ_STREAM_END)) {
@ -207,9 +213,12 @@ bool KDecompressor::process(const QByteArray &data)
#if defined(HAVE_LIBLZMA)
case KDecompressor::TypeXZ: {
size_t speculativesize = (data.size() * 2);
if (Q_UNLIKELY(speculativesize >= INT_MAX)) {
d->m_errorstring = i18n("Input data size too big: %1", data.size());
return false;
}
d->m_result.resize(speculativesize);
redolzmadecoding:
lzma_stream decomp = LZMA_STREAM_INIT;
decomp.next_in = (const uint8_t*)data.constData();
decomp.avail_in = data.size();
@ -230,14 +239,12 @@ bool KDecompressor::process(const QByteArray &data)
if (decompresult == LZMA_BUF_ERROR) {
speculativesize = (speculativesize + KDECOMPRESSOR_BUFFSIZE);
d->m_result.resize(speculativesize);
if (speculativesize >= INT_MAX) {
break;
}
lzma_end(&decomp);
goto redolzmadecoding;
d->m_result.resize(speculativesize);
decomp.next_out = (uint8_t*)d->m_result.data();
decomp.avail_out = speculativesize;
} else if (decompresult != LZMA_OK) {
break;
}