GitLab has been upgraded to 13.3.6. If you encounter any issues mail code@riscosopen.org

Commit 5e0e65cc authored by Andy Vawer's avatar Andy Vawer Committed by ROOL

Fix stack imbalance in Wimp_SetCaretPosition if called with invalid icon handle & flags

Version 5.79. Tagged as 'Wimp-5_79'
parent 56afccc6
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate GBLS Module_ApplicationDate
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
Module_MajorVersion SETS "5.78" Module_MajorVersion SETS "5.79"
Module_Version SETA 578 Module_Version SETA 579
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "26 Aug 2020" Module_Date SETS "12 Sep 2020"
Module_ApplicationDate SETS "26-Aug-20" Module_ApplicationDate SETS "12-Sep-20"
Module_ComponentName SETS "Wimp" Module_ComponentName SETS "Wimp"
Module_FullVersion SETS "5.78" Module_FullVersion SETS "5.79"
Module_HelpVersion SETS "5.78 (26 Aug 2020)" Module_HelpVersion SETS "5.79 (12 Sep 2020)"
END END
/* (5.78) /* (5.79)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 5.78 #define Module_MajorVersion_CMHG 5.79
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 26 Aug 2020 #define Module_Date_CMHG 12 Sep 2020
#define Module_MajorVersion "5.78" #define Module_MajorVersion "5.79"
#define Module_Version 578 #define Module_Version 579
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "26 Aug 2020" #define Module_Date "12 Sep 2020"
#define Module_ApplicationDate "26-Aug-20" #define Module_ApplicationDate "12-Sep-20"
#define Module_ComponentName "Wimp" #define Module_ComponentName "Wimp"
#define Module_FullVersion "5.78" #define Module_FullVersion "5.79"
#define Module_HelpVersion "5.78 (26 Aug 2020)" #define Module_HelpVersion "5.79 (12 Sep 2020)"
#define Module_LibraryVersionInfo "5:78" #define Module_LibraryVersionInfo "5:79"
...@@ -375,8 +375,7 @@ wscp_workarea ...@@ -375,8 +375,7 @@ wscp_workarea
; is the icon handle valid? ; is the icon handle valid?
LDR R14,[handle,#w_nicons] LDR R14,[handle,#w_nicons]
CMP R1,R14 ; icon handle out of range? CMP R1,R14 ; icon handle out of range?
Pull "R0-R7,R11,R14",HS ; abort if so BHS exitsetcaret ; abort if so
BHS exitsetcaret
LDR R14,[handle,#w_taskhandle] LDR R14,[handle,#w_taskhandle]
Task R14,,"SetCaret" ; page in window owner task Task R14,,"SetCaret" ; page in window owner task
......
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