hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed memory allocation mistake, now checks return value of fread in DTSC::File::seek_time

Browse source
This commit is contained in:
wouter spruit 2014-10-15 18:28:05 +02:00
parent 1610a6b2f3
commit ebdb2f32d5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/dtsc.cpp
View file

@ -574,7 +574,7 @@ DTSC::File::operator bool() const {
/// Open a filename for DTSC reading/writing. /// Open a filename for DTSC reading/writing.
/// If create is true and file does not exist, attempt to create. /// If create is true and file does not exist, attempt to create.
DTSC::File::File(std::string filename, bool create) { DTSC::File::File(std::string filename, bool create) {
buffer = malloc(4); buffer = malloc(8);
if (create) { if (create) {
F = fopen(filename.c_str(), "w+b"); F = fopen(filename.c_str(), "w+b");
if (!F) { if (!F) {
@ -985,7 +985,10 @@ bool DTSC::File::seek_time(unsigned int ms, int trackNo, bool forceSeek) {
seek_bpos(tmpPos.bytePos); seek_bpos(tmpPos.bytePos);
//read the header //read the header
char header[20]; char header[20];
fread((void *)header, 20, 1, F); if (fread((void *)header, 20, 1, F) != 1){
DEBUG_MSG(DLVL_WARN, "Could not read header from file. Much sadface.");
return false;
}
//check if packetID matches, if not, skip size + 8 bytes. //check if packetID matches, if not, skip size + 8 bytes.
int packSize = ntohl(((int *)header)[1]); int packSize = ntohl(((int *)header)[1]);
int packID = ntohl(((int *)header)[2]); int packID = ntohl(((int *)header)[2]);
@ -1020,7 +1023,7 @@ bool DTSC::File::seek_time(unsigned int ms) {
currentPositions.clear(); currentPositions.clear();
if (selectedTracks.size()) { if (selectedTracks.size()) {
for (std::set<int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) { for (std::set<int>::iterator it = selectedTracks.begin(); it != selectedTracks.end(); it++) {
seek_time(ms, (*it)); seek_time(ms, (*it), true);
} }
} }
return true; return true;