[sr-dev] git:4.3:e9bbb8f6: core: ensure cfg_block structure is 8 byte aligned

Daniel-Constantin Mierla miconda at gmail.com
Tue Jul 5 12:06:17 CEST 2016


Module: kamailio
Branch: 4.3
Commit: e9bbb8f6d945221a388c5a8bbe5e37ffb873395b
URL: https://github.com/kamailio/kamailio/commit/e9bbb8f6d945221a388c5a8bbe5e37ffb873395b

Author: Spencer Thomason <spencer at whiteskycommunications.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-07-05T12:03:11+02:00

core: ensure cfg_block structure is 8 byte aligned

- prevents bus error on stricter cpu architectures like sparc
- reported by GH #655

(cherry picked from commit 0fd0715d015a2396b0ec66cb0bc83ec0b61c0d08)
(cherry picked from commit 795556061412439618c640ef19e8579486f0c58a)

---

Modified: cfg/cfg_struct.h

---

Diff:  https://github.com/kamailio/kamailio/commit/e9bbb8f6d945221a388c5a8bbe5e37ffb873395b.diff
Patch: https://github.com/kamailio/kamailio/commit/e9bbb8f6d945221a388c5a8bbe5e37ffb873395b.patch

---

diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h
index 452bb90..6436eed 100644
--- a/cfg/cfg_struct.h
+++ b/cfg/cfg_struct.h
@@ -129,6 +129,7 @@ typedef struct _cfg_block {
 	atomic_t	refcnt;		/*!< reference counter,
 					the block is automatically deleted
 					when it reaches 0 */
+	int		_pad;		/*!< force 8 byte alignment */
 	unsigned char	vars[1];	/*!< blob that contains the values */
 } cfg_block_t;
 




More information about the sr-dev mailing list