Skip to content

Commit 3761287

Browse files
committed
To avoid potentially memory leak. And avoid use ZeroMemory of this pointer.
1 parent f77a2e2 commit 3761287

File tree

3 files changed

+25
-4
lines changed

3 files changed

+25
-4
lines changed

src/Layers/xrRenderDX10/3DFluid/dx103DFluidData.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,14 @@ void dx103DFluidData::ParseProfile(const xr_string& Profile)
160160

161161
u32 iEmittersNum = ini.r_u32("volume", "EmittersNum");
162162

163+
m_Emitters.clear();
163164
m_Emitters.resize(iEmittersNum);
164165

165166
for (u32 i = 0; i < iEmittersNum; ++i)
166167
{
167168
string32 EmitterSectionName;
168169
CEmitter& Emitter = m_Emitters[i];
169-
ZeroMemory(&Emitter, sizeof(Emitter));
170+
170171
xr_sprintf(EmitterSectionName, "emitter%02d", i);
171172

172173
Emitter.m_eType = (dx103DFluidEmitters::EmitterType)ini.r_token(EmitterSectionName, "Type", emitter_type_token);

src/xrCore/Animation/Bone.hpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,15 @@ enum EBoneCallbackType
564564

565565
IC void CBoneInstance::construct()
566566
{
567-
ZeroMemory(this, sizeof(*this));
568567
mTransform.identity();
569-
570568
mRenderTransform.identity();
569+
570+
Callback = NULL;
571+
Callback_Param = NULL;
571572
Callback_overwrite = FALSE;
573+
Callback_type = 0;
574+
575+
ZeroMemory(&param, sizeof(param));
572576
}
573577

574578
#endif

src/xrEngine/tntQAVI.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,25 @@
55

66
CAviPlayerCustom::CAviPlayerCustom()
77
{
8-
ZeroMemory(this, sizeof(*this));
8+
alpha = NULL;
9+
10+
m_pMovieIndex = NULL;
11+
m_pMovieData = NULL;
12+
m_aviIC = NULL;
13+
m_pDecompressedBuf = NULL;
14+
15+
ZeroMemory(&m_biOutFormat, sizeof(BITMAPINFOHEADER));
16+
ZeroMemory(&m_biInFormat, sizeof(BITMAPINFOHEADER));
17+
18+
m_fRate = 0.0f;
19+
m_fCurrentRate = 0.0f;
20+
21+
m_dwFrameTotal = 0;
922
m_dwFrameCurrent = 0xfffffffd; // страхуемся от 0xffffffff + 1 == 0
1023
m_dwFirstFrameOffset = 0;
24+
25+
m_dwWidth = 0;
26+
m_dwHeight = 0;
1127
}
1228

1329
CAviPlayerCustom::~CAviPlayerCustom()

0 commit comments

Comments
 (0)