From 562fc696d7364af645ba4e6dcb21b761b06d5e7b Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Thu, 7 Feb 2019 08:40:32 -0800 Subject: [PATCH] Fix pgm_read_ptr() Fix dereferencing in pgm_read_ptr() macro on 8266 and host. Fixes #5733 --- tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h b/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h index 26709cbf89..9b61bec221 100644 --- a/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h +++ b/tools/sdk/libc/xtensa-lx106-elf/include/sys/pgmspace.h @@ -73,11 +73,11 @@ static inline uint16_t pgm_read_word_inlined(const void* addr) { #ifdef __cplusplus #define pgm_read_dword(addr) (*reinterpret_cast(addr)) #define pgm_read_float(addr) (*reinterpret_cast(addr)) - #define pgm_read_ptr(addr) (*reinterpret_cast(addr)) + #define pgm_read_ptr(addr) (*reinterpret_cast(addr)) #else #define pgm_read_dword(addr) (*(const uint32_t*)(addr)) #define pgm_read_float(addr) (*(const float*)(addr)) - #define pgm_read_ptr(addr) (*(const void*)(addr)) + #define pgm_read_ptr(addr) (*(const void* const*)(addr)) #endif #define pgm_read_byte_near(addr) pgm_read_byte(addr)