Skip to content

Fix nasa#499, shmat() in cfe_psp_memory.c uses NULL instead of zero. #500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myc-yang merged 1 commit into from
Oct 15, 2026
Merged

Fix nasa#499, shmat() in cfe_psp_memory.c uses NULL instead of zero. #500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions fsw/pc-linux/src/cfe_psp_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void CFE_PSP_InitCDS(void)
/*
** attach to the segment to get a pointer to it:
*/
CFE_PSP_ReservedMemoryMap.CDSMemory.BlockPtr = shmat(CDSShmId, (void *)0, 0);
CFE_PSP_ReservedMemoryMap.CDSMemory.BlockPtr = shmat(CDSShmId, NULL, 0);
if (CFE_PSP_ReservedMemoryMap.CDSMemory.BlockPtr == (void *)(-1))
{
perror("CFE_PSP - Cannot shmat to CDS Shared memory Segment");
Expand Down Expand Up @@ -356,7 +356,7 @@ void CFE_PSP_InitResetArea(void)
/*
** attach to the segment to get a pointer to it:
*/
block_addr = (cpuaddr)shmat(ResetAreaShmId, (void *)0, 0);
block_addr = (cpuaddr)shmat(ResetAreaShmId, NULL, 0);
if (block_addr == (cpuaddr)(-1))
{
perror("CFE_PSP - Cannot shmat to Reset Area Shared memory Segment");
Expand Down Expand Up @@ -469,7 +469,7 @@ void CFE_PSP_InitUserReservedArea(void)
/*
** attach to the segment to get a pointer to it:
*/
CFE_PSP_ReservedMemoryMap.UserReservedMemory.BlockPtr = shmat(UserShmId, (void *)0, 0);
CFE_PSP_ReservedMemoryMap.UserReservedMemory.BlockPtr = shmat(UserShmId, NULL, 0);
if (CFE_PSP_ReservedMemoryMap.UserReservedMemory.BlockPtr == (void *)(-1))
{
perror("CFE_PSP - Cannot shmat to User Reserved Area Shared memory Segment");
Expand Down
Loading