Fix UB/leaks in server

diff --git a/deps/dragonnet b/deps/dragonnet
index b2fd5e955c0f910fdd1abf89626cfe324efbfe90..8bcc4ba04baea8f4d1f86524e58bd81d4df67bf6 160000 (submodule)
--- a/deps/dragonnet
+++ b/deps/dragonnet
@@ -1 +1 @@
-Subproject commit b2fd5e955c0f910fdd1abf89626cfe324efbfe90
+Subproject commit 8bcc4ba04baea8f4d1f86524e58bd81d4df67bf6

diff --git a/deps/endian.h b/deps/endian.h
index 0f885cbba627efe9b8f763e1c2872e904fe0c0b1..6c7eccf05405eacbb76281550cd69895089f9773 160000 (submodule)
--- a/deps/endian.h
+++ b/deps/endian.h
@@ -1 +1 @@
-Subproject commit 0f885cbba627efe9b8f763e1c2872e904fe0c0b1
+Subproject commit 6c7eccf05405eacbb76281550cd69895089f9773

diff --git a/src/config.c b/src/config.c
index 8bdfa546a3a39ba6a8396008401dbfd740c9b5da..00c50b584931e233f58257180d7adfc2e4b96eda 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -82,4 +82,6 @@ void config_read(char *path, ConfigEntry *entries, size_t num_entries)
                if (! found)
                        fprintf(stderr, "Unknown setting %s in %s\n", key, path);
        }
+
+       fclose(f);
 }

diff --git a/src/server/biomes.c b/src/server/biomes.c
index 9d2cedbdb6bae485966ce3d53b2cb724c1d59663..44a17c39c761a0f399f9f875df0960be9dd40e79 100644 (file)
--- a/src/server/biomes.c
+++ b/src/server/biomes.c
@@ -279,7 +279,6 @@ BiomeDef biomes[BIOME_COUNT] = {
                .preprocess_block = &preprocess_block_ocean,
                .row_data_size = sizeof(OceanRowData),
                .preprocess_row = &preprocess_row_ocean,
-
        },
        {
                .probability = 1.0,

diff --git a/src/server/mapgen.c b/src/server/mapgen.c
index 98da18853bef81f47317d133ed455cda3dc30c12..767c19ec767b0703915fdd9537438cfce258b682 100644 (file)
--- a/src/server/mapgen.c
+++ b/src/server/mapgen.c
@@ -27,7 +27,7 @@ void mapgen_generate_block(MapBlock *block, List *changed_blocks)
        v3s32 block_node_pos = {block->pos.x * MAPBLOCK_SIZE, block->pos.y * MAPBLOCK_SIZE, block->pos.z * MAPBLOCK_SIZE};
 
        char *block_data[BIOME_COUNT] = {NULL};
-       bool preprocessed_block[BIOME_COUNT];
+       bool preprocessed_block[BIOME_COUNT] = {false};
 
        for (u8 x = 0; x < MAPBLOCK_SIZE; x++) {
                s32 pos_x = block_node_pos.x + x;