OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Merge pull request #417 from dpogue/coverity

Browse Source 
Coverity Fixes
This commit is contained in:
Adam Johnson
2014-05-11 23:19:44 -04:00
parent 5e9378ad5e a3d90948b7
commit eefa389be1
6 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.cpp
View File

@ -559,7 +559,7 @@ void pyGUIControlMultiLineEdit::DeleteLinesFromTop( int lines )
} }
} }
uint32_t pyGUIControlMultiLineEdit::GetFontSize() uint32_t pyGUIControlMultiLineEdit::GetFontSize() const
{ {
if (fGCkey) if (fGCkey)
{ {

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlMultiLineEdit.h
View File

@ -111,7 +111,7 @@ public:
virtual void DeleteLinesFromTop( int lines ); virtual void DeleteLinesFromTop( int lines );
virtual uint32_t GetFontSize(); virtual uint32_t GetFontSize() const;
virtual void SetFontSize( uint32_t fontsize ); virtual void SetFontSize( uint32_t fontsize );
}; };

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.cpp
View File

@ -146,7 +146,7 @@ void pyGUIControlTextBox::SetForeColor( pyColor& color )
} }
PyObject* pyGUIControlTextBox::GetForeColor() PyObject* pyGUIControlTextBox::GetForeColor() const
{ {
if ( fGCkey ) if ( fGCkey )
{ {

2
Sources/Plasma/FeatureLib/pfPython/pyGUIControlTextBox.h
View File

@ -88,7 +88,7 @@ public:
virtual void SetJustify( uint8_t justify ); virtual void SetJustify( uint8_t justify );
virtual uint8_t GetJustify(); virtual uint8_t GetJustify();
virtual PyObject* GetForeColor(); // returns pyColor virtual PyObject* GetForeColor() const; // returns pyColor
}; };
#endif // _pyGUIControlTextBox_h_ #endif // _pyGUIControlTextBox_h_

9
Sources/Plasma/NucleusLib/pnEncryption/plChecksum.cpp
View File

@ -119,6 +119,7 @@ plMD5Checksum::plMD5Checksum()
plMD5Checksum::plMD5Checksum(const plMD5Checksum& rhs) plMD5Checksum::plMD5Checksum(const plMD5Checksum& rhs)
{ {
memset(&fContext, 0, sizeof(fContext));
memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum)); memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum));
fValid = rhs.fValid; fValid = rhs.fValid;
} }
@ -135,6 +136,7 @@ plMD5Checksum::plMD5Checksum( hsStream* stream )
void plMD5Checksum::Clear() void plMD5Checksum::Clear()
{ {
memset(&fContext, 0, sizeof(fContext));
memset(fChecksum, 0, sizeof(fChecksum)); memset(fChecksum, 0, sizeof(fChecksum));
fValid = false; fValid = false;
} }
@ -182,6 +184,7 @@ void plMD5Checksum::Finish()
{ {
MD5_Final(fChecksum, &fContext); MD5_Final(fChecksum, &fContext);
fValid = true; fValid = true;
memset(&fContext, 0, sizeof(fContext));
} }
const char* plMD5Checksum::GetAsHexString() const const char* plMD5Checksum::GetAsHexString() const
@ -245,6 +248,7 @@ plSHAChecksum::plSHAChecksum()
plSHAChecksum::plSHAChecksum(const plSHAChecksum& rhs) plSHAChecksum::plSHAChecksum(const plSHAChecksum& rhs)
{ {
memset(&fContext, 0, sizeof(fContext));
memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum)); memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum));
fValid = rhs.fValid; fValid = rhs.fValid;
} }
@ -261,6 +265,7 @@ plSHAChecksum::plSHAChecksum(hsStream* stream)
void plSHAChecksum::Clear() void plSHAChecksum::Clear()
{ {
memset(&fContext, 0, sizeof(fContext));
memset(fChecksum, 0, sizeof(fChecksum)); memset(fChecksum, 0, sizeof(fChecksum));
fValid = false; fValid = false;
} }
@ -310,6 +315,7 @@ void plSHAChecksum::Finish()
{ {
SHA_Final(fChecksum, &fContext); SHA_Final(fChecksum, &fContext);
fValid = true; fValid = true;
memset(&fContext, 0, sizeof(fContext));
} }
const char* plSHAChecksum::GetAsHexString() const const char* plSHAChecksum::GetAsHexString() const
@ -371,6 +377,7 @@ plSHA1Checksum::plSHA1Checksum()
plSHA1Checksum::plSHA1Checksum(const plSHA1Checksum& rhs) plSHA1Checksum::plSHA1Checksum(const plSHA1Checksum& rhs)
{ {
memset(&fContext, 0, sizeof(fContext));
memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum)); memcpy(fChecksum, rhs.fChecksum, sizeof(fChecksum));
fValid = rhs.fValid; fValid = rhs.fValid;
} }
@ -389,6 +396,7 @@ void plSHA1Checksum::Clear()
{ {
memset(fChecksum, 0, sizeof(fChecksum)); memset(fChecksum, 0, sizeof(fChecksum));
fValid = false; fValid = false;
memset(&fContext, 0, sizeof(fContext));
} }
void plSHA1Checksum::CalcFromFile(const plFileName& fileName) void plSHA1Checksum::CalcFromFile(const plFileName& fileName)
@ -436,6 +444,7 @@ void plSHA1Checksum::Finish()
{ {
SHA1_Final(fChecksum, &fContext); SHA1_Final(fChecksum, &fContext);
fValid = true; fValid = true;
memset(&fContext, 0, sizeof(fContext));
} }
const char* plSHA1Checksum::GetAsHexString() const const char* plSHA1Checksum::GetAsHexString() const