abort on csv parse error

Author: chyndman

ElixirWeb.iss

@@ -188,6 +188,12 @@ begin
   // Create an array of TElixirRelease records from elixir.csv and store them in a global variable
   GlobalElixirReleases := CSVToElixirReleases(GlobalElixirCSVFilePath);
   
+  // Check if above didn't work
+  if GetArrayLength(GlobalElixirReleases) = 0 then begin
+    MsgBox('Error: Parsing {#ELIXIR_CSV_URL} failed.  Setup cannot continue.', mbInformation, MB_OK);
+    Abort();
+  end;
+  
   // Use the global Elixir release array to populate the custom Elixir release list box
   ElixirReleasesToListBox(GlobalElixirReleases, GlobalPageSelRelease.CheckListBox);
   
@@ -206,6 +212,12 @@ begin
   
   // Create an TErlangData from erlang.csv record and store it in a global variable
   GlobalErlangData := CSVToErlangData(GlobalErlangCSVFilePath);
+  
+  // Check if above didn't work
+  if GlobalErlangData.OTPVersion = '' then begin
+    MsgBox('Error: Parsing {#ERLANG_CSV_URL} failed.  Setup cannot continue.', mbInformation, MB_OK);
+    Abort();
+  end;
 end;
 
 function InitializeSetup(): Boolean;

src/elixir_release.iss

@@ -56,50 +56,53 @@ begin
   LatestRelease := True;
   
   // Read the file at Filename and store the lines in Rows
-  LoadStringsFromFile(Filename, Rows); 
-  // Match length of return array to number of rows
-  SetArrayLength(Result, GetArrayLength(Rows) - 1);
+  if LoadStringsFromFile(Filename, Rows) then begin 
+    // Match length of return array to number of rows
+    SetArrayLength(Result, GetArrayLength(Rows) - 1);
 
-  for i := 1 to GetArrayLength(Rows) - 1 do begin
-    // Separate values at commas
-    RowValues := SplitString(Rows[i], ',');
+    for i := 1 to GetArrayLength(Rows) - 1 do begin
+      // Separate values at commas
+      RowValues := SplitString(Rows[i], ',');
 
-    with Result[i - 1] do begin
-      // Store first and second values as the Version and URL respectively
-      Version := RowValues[0];
-      URL := RowValues[1];
+      with Result[i - 1] do begin
+        // Store first and second values as the Version and URL respectively
+        Version := RowValues[0];
+        URL := RowValues[1];
 
-      if StrToInt(RowValues[3]) = {#COMPAT_MASK} then begin
-        // Release has a compatibility mask matching this installer
-        if RowValues[2] = 'prerelease' then begin
-          // Release is designated as a prerelease
-          if LatestPrerelease then begin
-            // This is the first prerelease found, so it's the latest prerelease
-            ReleaseType := rtLatestPrerelease;
-            LatestPrerelease := False;
+        if StrToInt(RowValues[3]) = {#COMPAT_MASK} then begin
+          // Release has a compatibility mask matching this installer
+          if RowValues[2] = 'prerelease' then begin
+            // Release is designated as a prerelease
+            if LatestPrerelease then begin
+              // This is the first prerelease found, so it's the latest prerelease
+              ReleaseType := rtLatestPrerelease;
+              LatestPrerelease := False;
+            end else begin
+              // This is not the latest prerelease
+              ReleaseType := rtPrerelease;
+            end;
           end else begin
-            // This is not the latest prerelease
-            ReleaseType := rtPrerelease;
+            if LatestRelease then begin
+              // This is the first release found, so it's the latest prerelease
+              ReleaseType := rtLatestRelease;
+              LatestRelease := False;
+            end else begin
+              // This is not the latest release
+              ReleaseType := rtRelease;
+            end;
           end;
         end else begin
-          if LatestRelease then begin
-            // This is the first release found, so it's the latest prerelease
-            ReleaseType := rtLatestRelease;
-            LatestRelease := False;
-          end else begin
-            // This is not the latest release
-            ReleaseType := rtRelease;
-          end;
+          // Release can't be installed by this installer
+          ReleaseType := rtIncompatible;
         end;
-      end else begin
-        // Release can't be installed by this installer
-        ReleaseType := rtIncompatible;
-      end;
 
-      // Assign this Elixir release a new reference object
-      if Ref = nil then
-        Ref := TObject.Create();
+        // Assign this Elixir release a new reference object
+        if Ref = nil then
+          Ref := TObject.Create();
+      end;
     end;
+  end else begin
+    SetArrayLength(Result, 0);
   end;
 end;
 

src/erlang_data.iss

@@ -34,18 +34,31 @@ var
   Rows: TArrayOfString;
   RowValues: TStrings;
 begin
-  LoadStringsFromFile(Filename, Rows);
-  RowValues := SplitString(Rows[1], ',');
+  if LoadStringsFromFile(Filename, Rows) then begin
+    RowValues := SplitString(Rows[1], ',');
 
-  with Result do begin
-    OTPVersion  := RowValues[0];
-    ERTSVersion := RowValues[1];
-    URL32       := RowValues[2];
-    URL64       := RowValues[3];
+    with Result do begin
+      OTPVersion  := RowValues[0];
+      ERTSVersion := RowValues[1];
+      URL32       := RowValues[2];
+      URL64       := RowValues[3];
 
-    Exe32       := GetURLFilePart(URL32);
-    Exe64       := GetURLFilePart(URL64);
-    Name32      := 'OTP ' + OTPVersion + ' (32-bit)';
-    Name64      := 'OTP ' + OTPVersion + ' (64-bit)';
+      Exe32       := GetURLFilePart(URL32);
+      Exe64       := GetURLFilePart(URL64);
+      Name32      := 'OTP ' + OTPVersion + ' (32-bit)';
+      Name64      := 'OTP ' + OTPVersion + ' (64-bit)';
+    end;
+  end else begin
+    with Result do begin
+      OTPVersion  := '';
+      ERTSVersion := '';
+      URL32       := '';
+      URL64       := '';
+
+      Exe32       := '';
+      Exe64       := '';
+      Name32      := '';
+      Name64      := '';
+    end;
   end;
 end;