michaelh/zephyr
1
0
Fork 0
Code Releases Activity

shell: fix alignment issue

Browse source 
Casting a char* to a struct* requires checking alignment as this can fail
on platforms requiring strict alignment (ex. Xtensa)

Signed-off-by: Benjamin Cabé <benjamin@zephyrproject.org>
This commit is contained in:
Benjamin Cabé 2025-06-11 15:35:40 +02:00 • committed by Dan Kalowsky
commit 66f5d701bd
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/zephyr/shell/shell.h
View file

@ -17,6 +17,7 @@
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#include <zephyr/sys/iterable_sections.h> #include <zephyr/sys/iterable_sections.h>
#include <zephyr/sys/util.h> #include <zephyr/sys/util.h>
#include <zephyr/toolchain.h>
#if defined CONFIG_SHELL_GETOPT #if defined CONFIG_SHELL_GETOPT
#include <getopt.h> #include <getopt.h>
@ -273,7 +274,8 @@ static inline bool shell_help_is_structured(const char *help)
{ {
const struct shell_cmd_help *structured = (const struct shell_cmd_help *)help; const struct shell_cmd_help *structured = (const struct shell_cmd_help *)help;
return structured != NULL && structured->magic == SHELL_STRUCTURED_HELP_MAGIC; return structured != NULL && IS_PTR_ALIGNED(structured, struct shell_cmd_help) &&
structured->magic == SHELL_STRUCTURED_HELP_MAGIC;
} }
#if defined(CONFIG_SHELL_HELP) || defined(__DOXYGEN__) #if defined(CONFIG_SHELL_HELP) || defined(__DOXYGEN__)