hasherezade/pe-bear
1
0
Fork 0
mirror of https://github.com/hasherezade/pe-bear.git synced 2026-10-12 02:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[REFACT] In string extractor: remove padding at the end of binary before starting the extraction

Browse Source
This commit is contained in:
hasherezade
2025-04-20 19:12:42 -08:00
parent 8a7c6bf415
commit c0bb868cd7
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pe-bear/base/threads/StringExtThread.cpp
+17 -7
View File
@@ -7,13 +7,25 @@ size_t StringExtThread::extractStrings(StringsCollection &mapToFill, const size_
int progress = 0;
emit loadingStrings(progress);
for (offset_t step = 0; true ; step++) {
const size_t contentSize = m_buf->getContentSize();
size_t maxSize = contentSize;
// remove null padding at the end
for (; maxSize > 0; maxSize--) {
QMutexLocker stopLock(&this->stopMutex);
if (this->stopRequested) break;
const char* ptr = (char*)m_buf->getContentAt((maxSize - 1), 1);
const char nextC = ptr ? (*ptr) : 0;
if (nextC != 0) break;
}
for (offset_t step = 0; step < maxSize; step++) {
{ //scope0
QMutexLocker stopLock(&this->stopMutex);
if (this->stopRequested) break;
const size_t maxSize = m_buf->getContentSize();
if (step >= maxSize) break;
bool isWide = false;
const char *ptr = (char*)m_buf->getContentAt(step, 1);
const char nextC = ptr ? (*ptr) : 0;
@@ -34,14 +46,12 @@ size_t StringExtThread::extractStrings(StringsCollection &mapToFill, const size_
step += util::getStringSize(str, isWide);
step--;
} //!scope0
const size_t maxSize = m_buf->getContentSize();
int proc = int(((float)step / (float)maxSize) * 100);
if ((proc - progress) > 1) {
progress = proc;
emit loadingStrings(progress);
}
}
return mapToFill.size();
}