immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed some memory issues 

* invalid pointer, uninitialized buffer
dev-ui
Piotr Dziwinski 2013-05-27 20:59:50 +02:00
parent 950a3474d5
commit 12313fecf5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sound/oalsound/buffer.cpp
View File

@ -17,6 +17,8 @@
#include "sound/oalsound/buffer.h" #include "sound/oalsound/buffer.h"
#include <cstring>
Buffer::Buffer() Buffer::Buffer()
{ {
m_loaded = false; m_loaded = false;
@ -41,6 +43,7 @@ bool Buffer::LoadFromFile(std::string filename, Sound sound)
GetLogger()->Debug("Loading audio file: %s\n", filename.c_str()); GetLogger()->Debug("Loading audio file: %s\n", filename.c_str());
SF_INFO fileInfo; SF_INFO fileInfo;
memset(&fileInfo, 0, sizeof(SF_INFO));
SNDFILE *file = sf_open(filename.c_str(), SFM_READ, &fileInfo); SNDFILE *file = sf_open(filename.c_str(), SFM_READ, &fileInfo);
GetLogger()->Trace(" channels %d\n", fileInfo.channels); GetLogger()->Trace(" channels %d\n", fileInfo.channels);

2
src/ui/studio.cpp
View File

@ -904,7 +904,7 @@ void CStudio::SetInfoText(std::string text, bool bClickable)
if ( list == 0 ) return; if ( list == 0 ) return;
list->Flush(); // just text list->Flush(); // just text
list->SetName(0, text.c_str()); list->SetItemName(0, text.c_str());
if ( text[0] == 0 ) bClickable = false; if ( text[0] == 0 ) bClickable = false;
list->SetSelectCap(bClickable); list->SetSelectCap(bClickable);