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

Fix null pointer dereference

Detail:
  c/actionwind - start_operation() wasn't checking if there's any info field text for the current operation, leading to a null pointer dereference when it attempts to look up the right message token via msgs_lookup()
Admin:
  Tested on Raspberry Pi with high processor vectors


Version 0.55. Tagged as 'FilerAct-0_55'
parent 743fa9c2
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.54"
Module_Version SETA 54
Module_MajorVersion SETS "0.55"
Module_Version SETA 55
Module_MinorVersion SETS ""
Module_Date SETS "23 Oct 2011"
Module_ApplicationDate SETS "23-Oct-11"
Module_Date SETS "24 Jun 2012"
Module_ApplicationDate SETS "24-Jun-12"
Module_ComponentName SETS "FilerAct"
Module_ComponentPath SETS "castle/RiscOS/Sources/Desktop/FilerAct"
Module_FullVersion SETS "0.54"
Module_HelpVersion SETS "0.54 (23 Oct 2011)"
Module_FullVersion SETS "0.55"
Module_HelpVersion SETS "0.55 (24 Jun 2012)"
END
/* (0.54)
/* (0.55)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.54
#define Module_MajorVersion_CMHG 0.55
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Oct 2011
#define Module_Date_CMHG 24 Jun 2012
#define Module_MajorVersion "0.54"
#define Module_Version 54
#define Module_MajorVersion "0.55"
#define Module_Version 55
#define Module_MinorVersion ""
#define Module_Date "23 Oct 2011"
#define Module_Date "24 Jun 2012"
#define Module_ApplicationDate "23-Oct-11"
#define Module_ApplicationDate "24-Jun-12"
#define Module_ComponentName "FilerAct"
#define Module_ComponentPath "castle/RiscOS/Sources/Desktop/FilerAct"
#define Module_FullVersion "0.54"
#define Module_HelpVersion "0.54 (23 Oct 2011)"
#define Module_LibraryVersionInfo "0:54"
#define Module_FullVersion "0.55"
#define Module_HelpVersion "0.55 (24 Jun 2012)"
#define Module_LibraryVersionInfo "0:55"
......@@ -719,8 +719,15 @@ static os_error *start_operation( action_environment *env, actions_possible oper
switch_dbox_on_off( env, 1, Display_Delay );
}
env->current_info = msgs_lookup( icon_strings[ operation ][ Top_Info_Field_Text ] );
env->current_info_token = icon_strings[operation][Top_Info_Field_Text];
if ( env->current_info_token )
{
env->current_info = msgs_lookup( env->current_info_token );
}
else
{
env->current_info = "";
}
env->action = Next_File;
......
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