Initialize mod_revision field in etcd_state_client

Fix common realloc memory leak mistakes found by cppcheck
2024-01-13 01:30:28 +03:00 · 2024-01-13 01:30:28 +03:00
2 changed files with 13 additions and 9 deletions
--- a/src/blockstore_impl.cpp
+++ b/src/blockstore_impl.cpp
@ -558,13 +558,14 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
            if (stable_count >= stable_alloc)
            {
                stable_alloc *= 2;
-                stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-                if (!stable)
+                obj_ver_id* nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+                if (!nst)
                {
                    op->retval = -ENOMEM;
                    FINISH_OP(op);
                    return;
                }
+                stable = nst;
            }
            stable[stable_count++] = {
                .oid = clean_it->first,
@ -642,8 +643,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                            if (stable_count >= stable_alloc)
                            {
                                stable_alloc += 32768;
-                                stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-                                if (!stable)
+                                obj_ver_id *nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+                                if (!nst)
                                {
                                    if (unstable)
                                        free(unstable);
@ -651,6 +652,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                                    FINISH_OP(op);
                                    return;
                                }
+                                stable = nst;
                            }
                            stable[stable_count++] = dirty_it->first;
                        }
@ -666,8 +668,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                    if (unstable_count >= unstable_alloc)
                    {
                        unstable_alloc += 32768;
-                        unstable = (obj_ver_id*)realloc(unstable, sizeof(obj_ver_id) * unstable_alloc);
-                        if (!unstable)
+                        obj_ver_id *nst = (obj_ver_id*)realloc(unstable, sizeof(obj_ver_id) * unstable_alloc);
+                        if (!nst)
                        {
                            if (stable)
                                free(stable);
@ -675,6 +677,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
                            FINISH_OP(op);
                            return;
                        }
+                        unstable = nst;
                    }
                    unstable[unstable_count++] = dirty_it->first;
                }
@ -694,8 +697,8 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
    if (stable_count+unstable_count > stable_alloc)
    {
        stable_alloc = stable_count+unstable_count;
-        stable = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
-        if (!stable)
+        obj_ver_id *nst = (obj_ver_id*)realloc(stable, sizeof(obj_ver_id) * stable_alloc);
+        if (!nst)
        {
            if (unstable)
                free(unstable);
@ -703,6 +706,7 @@ void blockstore_impl_t::process_list(blockstore_op_t *op)
            FINISH_OP(op);
            return;
        }
+        stable = nst;
    }
    // Copy unstable entries
    for (int i = 0; i < unstable_count; i++)
--- a/src/etcd_state_client.h
+++ b/src/etcd_state_client.h
@ -28,7 +28,7 @@ struct etcd_kv_t
 {
    std::string key;
    json11::Json value;
-    uint64_t mod_revision;
+    uint64_t mod_revision = 0;
 };

 struct pg_config_t
Author	SHA1	Message	Date
Vitaliy Filippov	d00d4dbac0	Initialize mod_revision field in etcd_state_client Test / test_interrupted_rebalance_ec (push) Successful in 2m28s Details Test / test_rm (push) Successful in 17s Details Test / test_move_reappear (push) Successful in 29s Details Test / test_snapshot_down (push) Successful in 26s Details Test / test_snapshot_down_ec (push) Successful in 26s Details Test / test_splitbrain (push) Successful in 16s Details Test / test_snapshot_chain (push) Successful in 2m0s Details Test / test_rebalance_verify_imm (push) Successful in 2m28s Details Test / test_rebalance_verify (push) Successful in 3m0s Details Test / test_rebalance_verify_ec (push) Successful in 3m14s Details Test / test_write_no_same (push) Successful in 13s Details Test / test_rebalance_verify_ec_imm (push) Successful in 3m7s Details Test / test_heal_pg_size_2 (push) Successful in 3m33s Details Test / test_heal_ec (push) Successful in 4m40s Details Test / test_heal_csum_32k_dj (push) Successful in 5m40s Details Test / test_heal_csum_32k (push) Successful in 6m8s Details Test / test_scrub (push) Successful in 1m4s Details Test / test_scrub_zero_osd_2 (push) Successful in 47s Details Test / test_heal_csum_4k_dmj (push) Successful in 6m33s Details Test / test_heal_csum_4k_dj (push) Successful in 6m28s Details Test / test_scrub_xor (push) Successful in 44s Details Test / test_scrub_pg_size_6_pg_minsize_4_osd_count_6_ec (push) Successful in 1m2s Details Test / test_scrub_ec (push) Successful in 42s Details Test / test_scrub_pg_size_3 (push) Successful in 1m38s Details Test / test_heal_csum_4k (push) Successful in 5m56s Details Test / test_interrupted_rebalance (push) Successful in 1m53s Details Test / test_snapshot_chain_ec (push) Failing after 3m17s Details Test / test_write (push) Failing after 3m15s Details Test / test_heal_csum_32k_dmj (push) Successful in 4m6s Details Test / test_write_xor (push) Failing after 3m11s Details	2024-01-13 01:30:28 +03:00
Vitaliy Filippov	5d9d6f32a0	Fix common realloc memory leak mistakes found by cppcheck	2024-01-13 01:30:28 +03:00