Prevent access violation on GetVarValue

remobjects · Jun 17, 2024 · 994f61f · 994f61f
1 parent 0d58581
commit 994f61f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 19 deletions.
diff --git a/Source/PascalScript_Core_D27.dpk b/Source/PascalScript_Core_D27.dpk
@@ -9,21 +9,21 @@ package PascalScript_Core_D27;
 {$EXTENDEDSYNTAX ON}
 {$IMPORTEDDATA ON}
 {$IOCHECKS ON}
-{$LOCALSYMBOLS ON}
+{$LOCALSYMBOLS OFF}
 {$LONGSTRINGS ON}
 {$OPENSTRINGS ON}
-{$OPTIMIZATION OFF}
+{$OPTIMIZATION ON}
 {$OVERFLOWCHECKS OFF}
 {$RANGECHECKS OFF}
-{$REFERENCEINFO ON}
+{$REFERENCEINFO OFF}
 {$SAFEDIVIDE OFF}
 {$STACKFRAMES ON}
 {$TYPEDADDRESS OFF}
 {$VARSTRINGCHECKS ON}
 {$WRITEABLECONST OFF}
 {$MINENUMSIZE 1}
 {$IMAGEBASE $400000}
-{$DEFINE DEBUG}
+{$DEFINE RELEASE}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'RemObjects Pascal Script - Core Package'}
 {$IMPLICITBUILD OFF}

diff --git a/Source/PascalScript_Core_D27.dproj b/Source/PascalScript_Core_D27.dproj
@@ -5,7 +5,7 @@
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Release</Config>
         <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-        <ProjectVersion>19.0</ProjectVersion>
+        <ProjectVersion>19.2</ProjectVersion>
         <FrameworkType>VCL</FrameworkType>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <AppType>Package</AppType>
@@ -64,16 +64,10 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;$(DCC_Namespace)</DCC_Namespace>
-        <DCC_BplOutput>..\Dcu\D27\win32</DCC_BplOutput>
-        <DCC_UnitSearchPath>..\Dcu\D27\win32;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <DCC_DcpOutput>..\Dcu\D27\win32</DCC_DcpOutput>
         <DCC_DcuOutput>..\Dcu\D27\win32</DCC_DcuOutput>
         <DCC_UsePackage>vcl;PascalScript_Core_D27;$(DCC_UsePackage)</DCC_UsePackage>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
-        <DCC_BplOutput>..\Dcu\D27\win64</DCC_BplOutput>
-        <DCC_UnitSearchPath>..\Dcu\D27\win64;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
-        <DCC_DcpOutput>..\Dcu\D27\win64</DCC_DcpOutput>
         <DCC_DcuOutput>..\Dcu\D27\win64</DCC_DcuOutput>
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <DCC_UsePackage>vcl;$(DCC_UsePackage)</DCC_UsePackage>
@@ -189,7 +183,10 @@
                     <VersionInfoKeys Name="Comments"/>
                     <VersionInfoKeys Name="CompileDate">Friday, March 21, 2008 1:24 PM</VersionInfoKeys>
                 </VersionInfoKeys>
-                <Excluded_Packages/>
+                <Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
+                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
+                </Excluded_Packages>
             </Delphi.Personality>
             <Platforms>
                 <Platform value="Win32">True</Platform>

diff --git a/Source/uPSComponent.pas b/Source/uPSComponent.pas
@@ -1336,15 +1336,18 @@ function TPSScriptDebugger.GetVarValue(const Name: tbtstring): Pointer;
     s := '';
   end;
   pv := nil;
-  for i := 0 to Exec.CurrentProcVars.Count -1 do
+  if Exec.CurrentProcVars <> nil then
   begin
-    if Uppercase(Exec.CurrentProcVars[i]) =  s1 then
+    for i := 0 to Exec.CurrentProcVars.Count -1 do
     begin
-      pv := Exec.GetProcVar(i);
-      break;
+      if Uppercase(Exec.CurrentProcVars[i]) =  s1 then
+      begin
+        pv := Exec.GetProcVar(i);
+        break;
+      end;
     end;
   end;
-  if pv = nil then
+  if (pv = nil) and (Exec.CurrentProcParams <> nil) then
   begin
     for i := 0 to Exec.CurrentProcParams.Count -1 do
     begin
@@ -1355,11 +1358,11 @@ function TPSScriptDebugger.GetVarValue(const Name: tbtstring): Pointer;
       end;
     end;
   end;
-  if pv = nil then
+  if (pv = nil) and (Exec.GlobalVarNames <> nil) then
   begin
     for i := 0 to Exec.GlobalVarNames.Count -1 do
     begin
-      if Uppercase(Exec.GlobalVarNames[i]) =  s1 then
+      if Uppercase(Exec.GlobalVarNames[i]) = s1 then
       begin
         pv := Exec.GetGlobalVar(i);
         break;