ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-20 17:22:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove dead assignment, divide by zero, memory leak in log.cpp

Browse Source
This commit is contained in:
Scott Fennell 2018-09-28 10:38:40 -05:00
parent 60e39e2838
commit 221ced44a0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trick_source/data_products/Log/log.cpp
View File

@ -390,9 +390,10 @@ int LogData::openCurrBinaryFile()
// Do sanity check on file
if (access(file, F_OK | R_OK) == -1) {
printf("ERROR: Search for parameter exhausted."
fprintf(stderr, "ERROR: Search for parameter exhausted."
" Or \"%s\" is not readable or doesn't exist. \n",
file);
delete [] file;
return(-1);
}
// Close previous binary file if not first file to open
@ -508,7 +509,10 @@ int LogData::getSizeRecord()
for (i = 0; i < nVars_; i++) {
sizeRec = sizeRec + vars[i]->getSize();
}
if(sizeRec <= 0) {
std::cerr << "ERROR: LogData::getSizeRecord() is zero or negative, may cause divide-by-zero. Exiting." << std::endl;
exit(-1);
}
return (sizeRec);
}
@ -570,7 +574,7 @@ char *LogData::getNextRecord()
if (currBinExtension_ < nBinFiles_) {
// Open up next bin file, and get first rec
openCurrBinaryFile();
ret = fread(currRecord_, sr, 1, fp_);
fread(currRecord_, sr, 1, fp_);
return (currRecord_);
} else {
// We are at end of log data (no more recs)