Code: Select all
Index: filestr.cpp
===================================================================
--- filestr.cpp (revision 6396)
+++ filestr.cpp (working copy)
@@ -58,12 +58,14 @@
FEOL_NOTEPAD
};
+#define ReadBufSize 0x2000
+
OldGetFileString::OldGetFileString(FILE *SrcFile):
SrcFile(SrcFile),
ReadPos(0),
ReadSize(0),
- ReadBuf(new char[0x2000]),
- wReadBuf(new wchar_t[0x2000]),
+ ReadBuf(new char[ReadBufSize]),
+ wReadBuf(new wchar_t[ReadBufSize]),
m_nStrLength(DELTA),
Str(static_cast<char*>(xf_malloc(m_nStrLength))),
m_nwStrLength(DELTA),
@@ -178,7 +180,7 @@
{
if (ReadPos >= ReadSize)
{
- if (!(ReadSize = (int)fread(ReadBuf, 1, sizeof(ReadBuf), SrcFile)))
+ if (!(ReadSize = (int)fread(ReadBuf, 1, ReadBufSize, SrcFile)))
{
if (!CurLength)
ExitCode=0;
@@ -275,7 +277,7 @@
{
if (ReadPos >= ReadSize)
{
- if (!(ReadSize = (int)fread(wReadBuf, 1, sizeof(wReadBuf), SrcFile)))
+ if (!(ReadSize = (int)fread(wReadBuf, sizeof(*wReadBuf), ReadBufSize, SrcFile)))
{
if (!CurLength)
ExitCode=0;
@@ -569,8 +571,8 @@
LastLength(0),
LastString(nullptr),
LastResult(0),
- ReadBuf(new char[0x2000]),
- wReadBuf(new wchar_t[0x2000]),
+ ReadBuf(new char[ReadBufSize]),
+ wReadBuf(new wchar_t[ReadBufSize]),
m_nStrLength(DELTA),
Str(static_cast<LPSTR>(xf_malloc(m_nStrLength))),
m_nwStrLength(DELTA),
@@ -704,7 +706,7 @@
{
if (ReadPos >= ReadSize)
{
- if (!(SrcFile.Read(ReadBuf, sizeof(ReadBuf), ReadSize) && ReadSize))
+ if (!(SrcFile.Read(ReadBuf, ReadBufSize, ReadSize) && ReadSize))
{
if (!CurLength)
{