DatabaseHandler: Fix empty check

In `transaction_metervalues_insert ()`, we were accessing the first element of a list, then checking whether or not it was empty. This causes an exception since if this list *is* empty, there's no element to access. This commit shifts the code around so that the empty check occurs before accessing any elements of the list. Co-authored-by: Gianfranco Berardi <[email protected]> Signed-off-by: Christopher Davis <[email protected]>
EVerest · Feb 26, 2024 · d9536ad · d9536ad
1 parent 1725770
commit d9536ad
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/ocpp/v201/database_handler.cpp b/lib/ocpp/v201/database_handler.cpp
@@ -348,8 +348,12 @@ int32_t DatabaseHandler::get_local_authorization_list_number_of_entries() {
 }
 
 bool DatabaseHandler::transaction_metervalues_insert(const std::string& transaction_id, const MeterValue& meter_value) {
+    if (meter_value.sampledValue.empty()) {
+        return false;
+    }
+
     auto sampled_value_context = meter_value.sampledValue.at(0).context;
-    if (meter_value.sampledValue.empty() or !sampled_value_context.has_value()) {
+    if (!sampled_value_context.has_value()) {
         return false;
     }