File 1411-erts-Fix-codechecker-warnings.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1411-erts-Fix-codechecker-warnings.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Currently displaying revision 31aed6575abf830123194bb955e96447 , Show latest

From 741b726f5366bd9ef2e90d5c9e75af5e5830081c Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Thu, 7 Oct 2021 00:00:25 +0200
Subject: [PATCH] erts: Fix codechecker warnings

---
 erts/emulator/beam/erl_bif_unique.h | 2 +-
 erts/emulator/beam/external.c       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/beam/erl_bif_unique.h b/erts/emulator/beam/erl_bif_unique.h
index 89d6e358fb..4c6335dc45 100644
--- a/erts/emulator/beam/erl_bif_unique.h
+++ b/erts/emulator/beam/erl_bif_unique.h
@@ -79,7 +79,7 @@ Eterm erts_debug_make_unique_integer(Process *c_p,
 				     Eterm etval1);
 
 
-ERTS_GLB_INLINE void erts_set_ref_numbers(Uint32 *ref, Uint32 thr_id, Uint64 value);
+ERTS_GLB_INLINE void erts_set_ref_numbers(Uint32 ref[ERTS_REF_NUMBERS], Uint32 thr_id, Uint64 value);
 ERTS_GLB_INLINE Uint32 erts_get_ref_numbers_thr_id(Uint32 *ref);
 ERTS_GLB_INLINE int erts_is_ref_numbers_magic(Uint32 *ref);
 ERTS_GLB_INLINE int erts_is_pid_ref_numbers(Uint32 *ref);
diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index f4c7f6dec4..72c7ead6ae 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -3039,7 +3039,7 @@ dec_pid(ErtsDistExternal *edep, ErtsHeapFactory* factory, const byte* ep,
 #define ENC_START_SORTING_MAP ((Eterm) 7)
 #define ENC_CONTINUE_SORTING_MAP ((Eterm) 8)
 #define ENC_PUSH_SORTED_MAP ((Eterm) 9)
-#define ENC_LAST_ARRAY_ELEMENT ((Eterm) 10)
+#define ENC_LAST_ARRAY_ELEMENT ((Eterm) 10) /* must be the largest one */
 
 static Eterm* alloc_map_array(Uint size)
 {
@@ -3466,6 +3466,7 @@ enc_term_int(TTBEncodeContext* ctx, ErtsAtomCacheMap *acmp, Eterm obj, byte* ep,
 		ep += 4;
 	    }
 	    if (i > 0) {
+                ASSERT(ENC_LAST_ARRAY_ELEMENT+i-1 >= ENC_LAST_ARRAY_ELEMENT);
 		WSTACK_PUSH2(s, ENC_LAST_ARRAY_ELEMENT+i-1, (UWord)ptr);
 	    }
 	    break;
-- 
2.31.1

Places

File 1411-erts-Fix-codechecker-warnings.patch of Package erlang (Revision 31aed6575abf830123194bb955e96447)

Places