GerhardHoffmann/MOBILISIS-Calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: init_tariff(): cleanup on error

Browse Source
This commit is contained in:
Siegfried Siegert 2023-05-09 13:05:02 +02:00
parent 31df676b57
commit 5c0bbf1502
Signed by: SiegfriedSiegert
GPG Key ID: 68371E015E8F0B03
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/src/calculate_price.cpp
View File

@ -35,6 +35,8 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
qCritical() << " ... zone = " << zone; qCritical() << " ... zone = " << zone;
if (zone <= 0) { if (zone <= 0) {
delete *tariff;
*tariff = nullptr;
return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR); return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
} }
@ -59,9 +61,13 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
QString json = fname.readAll(); QString json = fname.readAll();
if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) { if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
delete *tariff;
*tariff = nullptr;
return calcState.set(CalcState::State::ERROR_PARSING_TARIFF); return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
} }
} else { } else {
delete *tariff;
*tariff = nullptr;
return calcState.set(CalcState::State::ERROR_LOADING_TARIFF); return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
} }
@ -71,7 +77,9 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
} }
void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) { void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
delete tariff; if (tariff != nullptr) {
delete tariff;
}
} }
CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket( CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(