Fix index out of bounds panic with preserve-ids

ScottyThePilot · Jun 9, 2022 · fa86e16 · fa86e16
1 parent d06b358
commit fa86e16
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hoi4_province_editor"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["ScottyThePilot <scotty.codes@gmail.com>"]
 edition = "2021"
 description = "Map editor application for Hearts of Iron IV"

diff --git a/src/app/map/bridge.rs b/src/app/map/bridge.rs
@@ -344,10 +344,10 @@ fn deconstruct_map_data_preserve_ids(bundle: &Bundle) -> Result<MapData, Error>
     if let Some(preserved_id) = province_data.preserved_id {
       let definition = province_data.to_definition(color)?;
       let index = (preserved_id - 1) as usize;
-      if index > count {
-        outlier_definitions.push(definition);
-      } else {
+      if index < sparse_definitions_table.len() {
         sparse_definitions_table[index] = Some(definition);
+      } else {
+        outlier_definitions.push(definition);
       };
     } else {
       outlier_definitions.push(province_data.to_definition_with_id(color, 0)?);