Skip to content

Commit bd208ee

Browse files
MarekVanMarekVan
committed
fixed leaks
1 parent 2333d9c commit bd208ee

File tree

2 files changed

+8
-33
lines changed

2 files changed

+8
-33
lines changed

‎Winscard/CommonFnc.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ int CCommonFnc::File_SaveMatrixInt(string filePath, INT_DATA_BLOB* pBlob, int st
120120

121121
if (bSaveBinary) {
122122
// SAVE AS BINARY CHUNK
123-
size_t size = (endOffset - startOffset) * sizeof(int);
124-
char* buff = new char[size];
125-
memcpy(buff, pBlob->pData + startOffset, size);
126-
file.write(buff, size);
123+
file.write((char*)(pBlob->pData + startOffset), (endOffset - startOffset) * sizeof(int));
127124
}
128125
else {
129126
for (i = startOffset; i < endOffset; i++) {
@@ -431,6 +428,9 @@ int CCommonFnc::SCSAT_EnsureFileHeader(string filePath, SCSAT_MEASURE_INFO* pInf
431428
//if (part.CompareNoCase(SCSAT_MEASURE_SECTION) == 0) bNewFormat = TRUE;
432429
else bNewFormat = FALSE;
433430

431+
delete[] partchar;
432+
delete[] SCSAT_MEASURE_SECTION_char;
433+
434434
// WRITE IF NOT
435435
if (!bNewFormat) {
436436
string tmp;

‎Winscard/stdafx.h‎

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@ int compareNoCase(const char* str1, const char* str2) {
8080
strcpy(str2_2, str2);
8181
toupper(*str1_2);
8282
toupper(*str2_2);
83-
return strcmp(str1_2, str2_2);
83+
int result = strcmp(str1_2, str2_2);
84+
delete[] str1_2;
85+
delete[] str2_2;
86+
return result;
8487
}
8588

8689
typedef list<string> lcs;
@@ -371,61 +374,33 @@ typedef struct _SCSAT_MEASURE_INFO {
371374
//commLog.Replace("\r", ""); commLog.Replace("\n", ";");
372375

373376
//create INI style section
374-
//value.Format("[%s]\r\n", SCSAT_MEASURE_SECTION); *pResult = value;
375377
*pResult = string_format("[%s]\r\n", SCSAT_MEASURE_SECTION);
376-
//value.Format("%s=%lld\r\n", SCSAT_MEASURE_SAMPLEUNIQUEID, sampleUniqueID); *pResult += value;
377378
*pResult += string_format("%s=%lld\r\n", SCSAT_MEASURE_SAMPLEUNIQUEID, sampleUniqueID);
378-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_DATETIME, dateTime); *pResult += value;
379379
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_DATETIME, dateTime);
380-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_CARDATR, cardATR); *pResult += value;
381380
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_CARDATR, cardATR);
382-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_CARDNAME, cardName); *pResult += value;
383381
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_CARDNAME, cardName);
384-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_NOTE, note); *pResult += value;
385382
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_NOTE, note);
386-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_CFGSCRIPT, cfgScript); *pResult += value;
387383
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_CFGSCRIPT, cfgScript);
388-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_STARTAPDU, startAPDU); *pResult += value;
389384
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_STARTAPDU, startAPDU);
390-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_COMMLOG, commLog); *pResult += value;
391385
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_COMMLOG, commLog);
392-
//value.Format("%s=%d\r\n", SCSAT_MEASURE_SAMPLINGFREQUENCY, frequency); *pResult += value;
393386
*pResult += string_format("%s=%d\r\n", SCSAT_MEASURE_SAMPLINGFREQUENCY, frequency);
394-
//value.Format("%s=%d\r\n", SCSAT_MEASURE_BASEOFFSET, baseOffset); *pResult += value;
395387
*pResult += string_format("%s=%d\r\n", SCSAT_MEASURE_BASEOFFSET, baseOffset);
396-
//value.Format("%s=%d\r\n", SCSAT_MEASURE_BASESHIFT, baseShift); *pResult += value;
397388
*pResult += string_format("%s=%d\r\n", SCSAT_MEASURE_BASESHIFT, baseShift);
398-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_SYNDROMS, syndroms); *pResult += value;
399389
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_SYNDROMS, syndroms);
400-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_MICROSHIFTS, microShifts); *pResult += value;
401390
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_MICROSHIFTS, microShifts);
402-
//value.Format("%s=%d\r\n", SCSAT_MEASURE_NUMSAMPLES, numSamples); *pResult += value;
403391
*pResult += string_format("%s=%d\r\n", SCSAT_MEASURE_NUMSAMPLES, numSamples);
404-
//value.Format("[%s_1]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
405392
*pResult += string_format("[%s_1]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
406-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_APDUDATA, apduData); *pResult += value;
407393
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_APDUDATA, apduData);
408-
//value.Format("%s=%s\r\n", SCSAT_MEASURE_SAVEBINARY, bSaveBinary ? "1" : "0"); *pResult += value;
409394
*pResult += string_format("%s=%s\r\n", SCSAT_MEASURE_SAVEBINARY, bSaveBinary ? "1" : "0");
410-
//value.Format("[%s_2]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
411395
*pResult += string_format("[%s_2]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
412-
//value.Format("[%s_3]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
413396
*pResult += string_format("[%s_3]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
414-
//value.Format("[%s_4]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
415397
*pResult += string_format("[%s_4]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
416-
//value.Format("[%s_5]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
417398
*pResult += string_format("[%s_5]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
418-
//value.Format("[%s_6]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
419399
*pResult += string_format("[%s_6]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
420-
//value.Format("[%s_7]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
421400
*pResult += string_format("[%s_7]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
422-
//value.Format("[%s_8]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
423401
*pResult += string_format("[%s_8]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
424-
//value.Format("[%s_9]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
425402
*pResult += string_format("[%s_9]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
426-
//value.Format("[%s_9]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE); *pResult += value;
427403
*pResult += string_format("[%s_9]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_EXT, SCSAT_MEASURE_NOTE);
428-
//value.Format("[%s]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_SAMPLES, SCSAT_MEASURE_POWERTRACE); *pResult += value;
429404
*pResult += string_format("[%s]\r\n%s=\r\n", SCSAT_MEASURE_SECTION_SAMPLES, SCSAT_MEASURE_POWERTRACE);
430405
return 0;
431406
}

0 commit comments

Comments
 (0)