Skip to content

Commit ae104ab

Browse files
committed
[BUGFIX] In QString::fromUtf16 : added missing cast
1 parent c0ac0f6 commit ae104ab

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

parser/AbstractByteBuffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ QString AbstractByteBuffer::getWStringValue(offset_t rawOffset, bufsize_t len)
168168
}
169169
WORD* ptr = (WORD*) this->getContentAt(rawOffset, size);
170170
if (ptr == NULL) return "";
171-
return QString::fromUtf16(ptr, static_cast<int>(len));
171+
return QString::fromUtf16(reinterpret_cast<const char16_t*>(ptr), static_cast<int>(len));
172172
}
173173

174174
QString AbstractByteBuffer::getWAsciiStringValue(offset_t rawOffset, bufsize_t len, bool acceptNonTerminated)
@@ -182,7 +182,7 @@ QString AbstractByteBuffer::getWAsciiStringValue(offset_t rawOffset, bufsize_t l
182182
if (!ptr) return "";
183183

184184
size_t asciiLen = pe_util::getAsciiLenW(ptr, len, acceptNonTerminated);
185-
return QString::fromUtf16(ptr, static_cast<int>(asciiLen));
185+
return QString::fromUtf16(reinterpret_cast<const char16_t*>(ptr), static_cast<int>(asciiLen));
186186
}
187187

188188
bool AbstractByteBuffer::isAreaEmpty(offset_t rawOffset, bufsize_t size)

parser/WrappedValue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ QVariant WrappedValue::getQVariant()
1818

1919
bufsize_t wSize = m_Size / bufsize_t(sizeof(WORD));
2020
WORD *strPtr = (WORD*) this->m_Owner->getContentAt(m_Offset, m_Size);
21-
return QString::fromUtf16(strPtr, static_cast<int>(wSize));
21+
return QString::fromUtf16(reinterpret_cast<const char16_t*>(strPtr), static_cast<int>(wSize));
2222
}
2323
return QVariant("...");
2424
}

parser/include/bearparser/pe/rsrc/ResourceVersionWrapper.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ class ResourceVersionWrapper : public ResourceContentWrapper
5959
return QString::fromUtf16(reinterpret_cast<const char16_t*>(content), size);
6060
}
6161

62-
63-
6462
friend class ResourceContentFactory;
6563
};
6664

0 commit comments

Comments
 (0)