diff mbox series

[uci,5/6] uci: silence UBSAN error by using offsetof macro from compiler

Message ID 20201003074830.948-6-ynezz@true.cz
State Accepted
Delegated to: Petr Štetiar
Headers show
Series fixes and improvements | expand

Commit Message

Petr Štetiar Oct. 3, 2020, 7:48 a.m. UTC
Fixes following ubdefined-behavior as reported by clang version 10.0.0-4ubuntu1~18.04.2:

 delta.c:139:52: runtime error: member access within null pointer of type 'struct uci_element'
 SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior delta.c:139:52

Signed-off-by: Petr Štetiar <ynezz@true.cz>
 uci.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
diff mbox series


diff --git a/uci.h b/uci.h
index 43f2052a00e6..b385e2be964f 100644
--- a/uci.h
+++ b/uci.h
@@ -34,6 +34,7 @@  extern "C" {
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stddef.h>
 #define UCI_CONFDIR "/etc/config"
 #define UCI_SAVEDIR "/tmp/.uci"
@@ -509,11 +510,6 @@  struct uci_parse_option {
-/* linked list handling */
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
  * container_of - cast a member of a structure out to the containing structure
  * @ptr:    the pointer to the member.