Commit f238dabb authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Speculative fix for crash when high processor vectors are in use

Detail:
  s/Wimp04 - in SWIWimp_ReadPixTrans, check whether we've got a pixtable before trying to read from it
Admin:
  Tested on BB-xM with high processor vectors
  Although I was unable to reproduce the issue myself, judging by the address given in the bug report this should fix an abort when dragging certain files in the filer
  See here for bug report: http://www.riscosopen.org/forum/forums/2/topics/226?page=2#posts-13500


Version 5.17. Tagged as 'Wimp-5_17'
parent 68cae2fd
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.16"
Module_Version SETA 516
Module_MajorVersion SETS "5.17"
Module_Version SETA 517
Module_MinorVersion SETS ""
Module_Date SETS "09 Jul 2012"
Module_ApplicationDate SETS "09-Jul-12"
Module_Date SETS "14 Jul 2012"
Module_ApplicationDate SETS "14-Jul-12"
Module_ComponentName SETS "Wimp"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/Wimp"
Module_FullVersion SETS "5.16"
Module_HelpVersion SETS "5.16 (09 Jul 2012)"
Module_FullVersion SETS "5.17"
Module_HelpVersion SETS "5.17 (14 Jul 2012)"
END
/* (5.16)
/* (5.17)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 5.16
#define Module_MajorVersion_CMHG 5.17
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 09 Jul 2012
#define Module_Date_CMHG 14 Jul 2012
#define Module_MajorVersion "5.16"
#define Module_Version 516
#define Module_MajorVersion "5.17"
#define Module_Version 517
#define Module_MinorVersion ""
#define Module_Date "09 Jul 2012"
#define Module_Date "14 Jul 2012"
#define Module_ApplicationDate "09-Jul-12"
#define Module_ApplicationDate "14-Jul-12"
#define Module_ComponentName "Wimp"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/Wimp"
#define Module_FullVersion "5.16"
#define Module_HelpVersion "5.16 (09 Jul 2012)"
#define Module_LibraryVersionInfo "5:16"
#define Module_FullVersion "5.17"
#define Module_HelpVersion "5.17 (14 Jul 2012)"
#define Module_LibraryVersionInfo "5:17"
......@@ -3228,6 +3228,7 @@ SWIWimp_ReadPixTrans
;
CMP R7,#0
LDRNE R14,pixtable_at
CMPNE R14,#0
LDMNEIA R14,{R1-R4}
STMNEIA R7,{R1-R4} ; copy pixtrans out (NB word-aligned)
;
......
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