Commit 94f4609c authored by Jeffrey Lee's avatar Jeffrey Lee Committed by ROOL
Browse files

Fix Service_ModeTranslation memory corruption

In HandleServiceModeTranslation, make sure WsPtr is initialised
correctly before trying to use it. Fixes system heap corruption when
responding to Service_ModeTranslation (most likely overwriting part of
ChocolateMABlocks, and causing a crash when loading future modules)

Fixes issue reported on forums:
https://www.riscosopen.org/forum/forums/11/topics/15973

Version 6.47. Tagged as 'Kernel-6_47'
parent a81fa868
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "6.46"
Module_Version SETA 646
Module_MajorVersion SETS "6.47"
Module_Version SETA 647
Module_MinorVersion SETS ""
Module_Date SETS "23 Nov 2020"
Module_ApplicationDate SETS "23-Nov-20"
Module_Date SETS "19 Dec 2020"
Module_ApplicationDate SETS "19-Dec-20"
Module_ComponentName SETS "Kernel"
Module_FullVersion SETS "6.46"
Module_HelpVersion SETS "6.46 (23 Nov 2020)"
Module_FullVersion SETS "6.47"
Module_HelpVersion SETS "6.47 (19 Dec 2020)"
END
/* (6.46)
/* (6.47)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 6.46
#define Module_MajorVersion_CMHG 6.47
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Nov 2020
#define Module_Date_CMHG 19 Dec 2020
#define Module_MajorVersion "6.46"
#define Module_Version 646
#define Module_MajorVersion "6.47"
#define Module_Version 647
#define Module_MinorVersion ""
#define Module_Date "23 Nov 2020"
#define Module_Date "19 Dec 2020"
#define Module_ApplicationDate "23-Nov-20"
#define Module_ApplicationDate "19-Dec-20"
#define Module_ComponentName "Kernel"
#define Module_FullVersion "6.46"
#define Module_HelpVersion "6.46 (23 Nov 2020)"
#define Module_LibraryVersionInfo "6:46"
#define Module_FullVersion "6.47"
#define Module_HelpVersion "6.47 (19 Dec 2020)"
#define Module_LibraryVersionInfo "6:47"
......@@ -805,6 +805,7 @@ HandleServiceModeTranslation ROUT
STRNE r8, [sp, #ModeSelector_FrameRate]
; Copy the mode selector block to TempModeSelector so we can safely
; return it.
VDWS WsPtr
ADD r2, WsPtr, #TempModeSelector
SUB r1, r10, sp
65
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment