mod stats: Fix unhandled corner-case

Do not crash on NULL pointer input.
OpenSIPS · Nov 22, 2017 · aa8e489 · aa8e489
1 parent 7f74df9
commit aa8e489
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/mem/f_malloc.c b/mem/f_malloc.c
@@ -142,14 +142,23 @@ inline static unsigned long big_hash_idx(unsigned long s)
 #endif
 
 #ifdef SHM_EXTRA_STATS
+#include "module_info.h"
 void set_stat_index (void *ptr, unsigned long idx) {
 	struct fm_frag *f;
+
+	if (!ptr)
+		return;
+
 	f = (struct fm_frag *)((char*)ptr - sizeof(struct fm_frag));
 	f->statistic_index = idx;
 }
 
 unsigned long get_stat_index(void *ptr) {
 	struct fm_frag *f;
+
+	if (!ptr)
+		return GROUP_IDX_INVALID;
+
 	f = (struct fm_frag *)((char*)ptr - sizeof(struct fm_frag));
 	return f->statistic_index;
 }

diff --git a/mem/hp_malloc.c b/mem/hp_malloc.c
@@ -178,14 +178,23 @@ unsigned long frag_size(void* p){
 }
 
 #ifdef SHM_EXTRA_STATS
+#include "module_info.h"
 void set_stat_index (void *ptr, unsigned long idx) {
 	struct hp_frag *f;
+
+	if (!ptr)
+		return;
+
 	f = (struct hp_frag *)((char*)ptr - sizeof(struct hp_frag));
 	f->statistic_index = idx;
 }
 
 unsigned long get_stat_index(void *ptr) {
 	struct hp_frag *f;
+
+	if (!ptr)
+		return GROUP_IDX_INVALID;
+
 	f = (struct hp_frag *)((char*)ptr - sizeof(struct hp_frag));
 	return f->statistic_index;
 }

diff --git a/mem/module_info.c b/mem/module_info.c
@@ -97,11 +97,11 @@ int init_new_stat(stat_var* stat) {
 #undef MALLOC_UNSAFE
 }
 
-inline void update_module_stats(long mem_used, long real_used, int frags, int group_idx) {
+inline void update_module_stats(long mem_used, long real_used, int frags, unsigned long group_idx) {
 
 	unsigned long local_max, global_max;
 
-	if (mem_skip_stats)
+	if (mem_skip_stats || group_idx == GROUP_IDX_INVALID)
 		return;
 
 #ifdef SHM_SHOW_DEFAULT_GROUP

diff --git a/mem/module_info.h b/mem/module_info.h
@@ -33,6 +33,8 @@
 #define STAT_PREFIX "shmem_"
 #define STAT_PREFIX_LEN 12
 
+#define GROUP_IDX_INVALID ((unsigned long)-1)
+
 extern struct multi_str* mod_names;
 extern unsigned int mem_free_idx;
 extern void* main_handle;
@@ -54,7 +56,7 @@ struct multi_str{
 
 int set_mem_idx(char* mod_name, int  mem_free_idx);
 
-void update_module_stats(long mem_used, long real_used, int frags, int group_idx);
+void update_module_stats(long mem_used, long real_used, int frags, unsigned long group_idx);
 
 int alloc_group_stat(void);
 

diff --git a/mem/q_malloc.c b/mem/q_malloc.c
@@ -175,12 +175,16 @@ unsigned long frag_size(void* p){
 }
 
 #ifdef SHM_EXTRA_STATS
+#include "module_info.h"
 void set_stat_index (void *ptr, unsigned long idx) {
+	if (!ptr)
+		return;
+
 	FRAG(ptr)->statistic_index = idx;
 }
 
 unsigned long get_stat_index(void *ptr) {
-	return FRAG(ptr)->statistic_index;
+	return !ptr ? GROUP_IDX_INVALID : FRAG(ptr)->statistic_index;
 }
 #endif