From 11a318170ebb20b7aef6c681201636e0ba1beb45 Mon Sep 17 00:00:00 2001
From: Laurent Thomas <lts@open-cells.com>
Date: Thu, 18 Feb 2021 22:23:31 +0100
Subject: [PATCH] memory wrong free in global vars used for configuration
 storage

---
 common/config/config_load_configmodule.c   | 3 ++-
 common/config/config_load_configmodule.h   | 3 +++
 common/config/config_userapi.c             | 5 ++++-
 common/config/libconfig/config_libconfig.c | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/config/config_load_configmodule.c b/common/config/config_load_configmodule.c
index 61a3984347..9b76fbb2a9 100644
--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -331,9 +331,10 @@ void end_configmodule(void) {
     printf ("[CONFIG] free %u config value pointers\n",cfgptr->numptrs);
 
     for(int i=0; i<cfgptr->numptrs ; i++) {
-      if (cfgptr->ptrs[i] != NULL) {
+      if (cfgptr->ptrs[i] != NULL && cfgptr->ptrsAllocated[i] == true) {
         free(cfgptr->ptrs[i]);
         cfgptr->ptrs[i]=NULL;
+	cfgptr->ptrsAllocated[i] = false;
       }
     }
 
diff --git a/common/config/config_load_configmodule.h b/common/config/config_load_configmodule.h
index d0309c62c3..8baaa99bb8 100644
--- a/common/config/config_load_configmodule.h
+++ b/common/config/config_load_configmodule.h
@@ -36,6 +36,8 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <stdbool.h>
 #include "common/config/config_paramdesc.h"
 #include "common/utils/T/T.h"
 #define CONFIG_MAX_OOPT_PARAMS    10     // maximum number of parameters in the -O option (-O <cfgmode>:P1:P2...
@@ -74,6 +76,7 @@ typedef struct configmodule_interface {
   uint32_t numptrs;
   uint32_t rtflags;
   char     *ptrs[CONFIG_MAX_ALLOCATEDPTRS];
+  bool ptrsAllocated[CONFIG_MAX_ALLOCATEDPTRS];
 } configmodule_interface_t;
 
 #ifdef CONFIG_LOADCONFIG_MAIN
diff --git a/common/config/config_userapi.c b/common/config/config_userapi.c
index 33d6408828..af70cae71e 100644
--- a/common/config/config_userapi.c
+++ b/common/config/config_userapi.c
@@ -62,6 +62,7 @@ char *config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) {
 
       if ( (cfgoptions->paramflags & PARAMFLAG_NOFREE) == 0) {
         config_get_if()->ptrs[config_get_if()->numptrs] = (char *)ptr;
+	config_get_if()->ptrsAllocated[config_get_if()->numptrs] = true;
         config_get_if()->numptrs++;
       }
     } else {
@@ -82,7 +83,9 @@ char *config_check_valptr(paramdef_t *cfgoptions, char **ptr, int length) {
   }
 
   if (*ptr == NULL) {
-    *ptr = malloc(length>40?length:40); // LTS: dummy fix, waiting Francois full fix in 4G branch
+    *ptr = malloc(length>40?length:40);
+    // LTS: dummy fix, waiting Francois full fix in 4G branch
+    // the issue is we don't know at this point the size we will get
 
     if ( *ptr != NULL) {
       memset(*ptr,0,length);
diff --git a/common/config/libconfig/config_libconfig.c b/common/config/libconfig/config_libconfig.c
index 2e9fd614c5..eb08a70183 100644
--- a/common/config/libconfig/config_libconfig.c
+++ b/common/config/libconfig/config_libconfig.c
@@ -346,6 +346,7 @@ int config_libconfig_init(char *cfgP[], int numP) {
   libconfig_privdata.configfile = strdup((char *)cfgP[0]);
   config_get_if()->numptrs=0;
   memset(config_get_if()->ptrs,0,sizeof(void *) * CONFIG_MAX_ALLOCATEDPTRS);
+  memset(config_get_if()->ptrsAllocated, 0, sizeof(config_get_if()->ptrsAllocated));
 
   /* Read the file. If there is an error, report it and exit. */
   if(! config_read_file(&(libconfig_privdata.cfg), libconfig_privdata.configfile)) {