From b5fa56ed4cab245fd4c4c35911b70c30f690516a Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Tue, 11 Oct 2022 22:41:00 +0200
Subject: [PATCH] BUILD: Fix the -Werror=address in src/base/reg.c:25 and
src/base/reg.c:35 even if the address could be null...
---
src/base/reg.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/base/reg.c b/src/base/reg.c
index c2cb42d5..814cafaa 100644
--- a/src/base/reg.c
+++ b/src/base/reg.c
@@ -22,7 +22,9 @@ reg_global(struct module_reg **reg_ptr)
PRIVATE_FUNCTION void *
reg_internal_get(struct module_reg *reg, const char *name)
{
- for (int i = 0; (reg + i) && (reg + i)->name && (reg + i)->obj; ++i) {
+ if (reg == NULL)
+ return NULL;
+ for (int i = 0; (reg + i)->name && (reg + i)->obj; ++i) {
if (STR_MATCH((reg + i)->name, name))
return (reg + i)->obj;
}
@@ -32,7 +34,9 @@ reg_internal_get(struct module_reg *reg, const char *name)
PRIVATE_FUNCTION reg_func
reg_internal_func(struct module_reg *reg, const char *name)
{
- for (int i = 0; (reg + i) && (reg + i)->name && (reg + i)->func; ++i) {
+ if (reg == NULL)
+ return NULL;
+ for (int i = 0; (reg + i)->name && (reg + i)->func; ++i) {
if (STR_MATCH((reg + i)->name, name))
return (reg + i)->func;
}
--
GitLab