1 files changed, 8 insertions, 12 deletions

diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 6fce032f9d..3eee53eba3 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -1675,7 +1675,7 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 
     t_str = type_no_str(n);
     if (!t_str) {
-	sprintf(buf, "%d", (int) n);
+	erts_snprintf(buf, sizeof(buf), "%d", (int) n);
 	t_str = buf;
     }
 
@@ -2182,9 +2182,9 @@ erts_memory(int *print_to_p, void *print_to_arg, void *proc, Eterm earg)
     if (want.code) {
 	size.code = module_table_sz();
 	size.code += export_table_sz();
-	size.code += export_list_size() * sizeof(Export);
+	size.code += export_entries_sz();
 	size.code += erts_fun_table_sz();
-	size.code += allocated_modules*sizeof(Range);
+	size.code += erts_ranges_sz();
 	size.code += erts_total_code_size;
     }
 
@@ -2300,11 +2300,7 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
     values[i].name = "static";
     values[i].ui[0] = 
 	erts_max_ports*sizeof(Port)		/* Port table */
-	+ erts_timer_wheel_memory_size()	/* Timer wheel */
-#ifdef SYS_TMP_BUF_SIZE
-	+ SYS_TMP_BUF_SIZE		/* tmp_buf in sys on vxworks & ose */
-#endif
-	;
+	+ erts_timer_wheel_memory_size();	/* Timer wheel */
     i++;
 
     erts_atom_get_text_space_sizes(&reserved_atom_space, &atom_space);
@@ -2332,7 +2328,7 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 
     values[i].arity = 2;
     values[i].name = "export_list";
-    values[i].ui[0] = export_list_size() * sizeof(Export);
+    values[i].ui[0] = export_entries_sz();
     i++;
 
     values[i].arity = 2;
@@ -2347,7 +2343,7 @@ erts_allocated_areas(int *print_to_p, void *print_to_arg, void *proc)
 
     values[i].arity = 2;
     values[i].name = "module_refs";
-    values[i].ui[0] = allocated_modules*sizeof(Range);
+    values[i].ui[0] = erts_ranges_sz();
     i++;
 
     values[i].arity = 2;
@@ -3576,12 +3572,12 @@ check_memory_fence(void *ptr, Uint *size, ErtsAlcType_t n, int func)
 
 	ftype = type_no_str(found_type);
 	if (!ftype) {
-	    sprintf(fbuf, "%d", (int) found_type);
+	    erts_snprintf(fbuf, sizeof(fbuf), "%d", (int) found_type);
 	    ftype = fbuf;
 	}
 	otype = type_no_str(n);
 	if (!otype) {
-	    sprintf(obuf, "%d", (int) n);
+	    erts_snprintf(obuf, sizeof(obuf), "%d", (int) n);
 	    otype = obuf;
 	}