add check that app partitions are aligned to 64k

Author: icewind1991

espflash/src/error.rs

@@ -280,6 +280,9 @@ pub enum PartitionTableError {
     #[error(transparent)]
     #[diagnostic(transparent)]
     InvalidSubType(#[from] InvalidSubTypeError),
+    #[error(transparent)]
+    #[diagnostic(transparent)]
+    UnalignedPartitionError(#[from] UnalignedPartitionError),
 }
 
 #[derive(Debug, Error, Diagnostic)]
@@ -430,6 +433,25 @@ impl InvalidSubTypeError {
     }
 }
 
+#[derive(Debug, Error, Diagnostic)]
+#[error("Unaligned partition")]
+#[diagnostic(code(espflash::partition_table::unaligned))]
+pub struct UnalignedPartitionError {
+    #[source_code]
+    source_code: String,
+    #[label("App partition is not aligned to 64k (0x10000)")]
+    span: SourceSpan,
+}
+
+impl UnalignedPartitionError {
+    pub fn new(source: &str, line: usize) -> Self {
+        UnalignedPartitionError {
+            source_code: source.into(),
+            span: line_to_span(&source, line),
+        }
+    }
+}
+
 #[derive(Debug, Error)]
 #[error("{0}")]
 pub struct ElfError(&'static str);

espflash/src/partition_table.rs

@@ -1,6 +1,6 @@
 use crate::error::{
     CSVError, DuplicatePartitionsError, InvalidSubTypeError, OverlappingPartitionsError,
-    PartitionTableError,
+    PartitionTableError, UnalignedPartitionError,
 };
 use md5::{Context, Digest};
 use regex::Regex;
@@ -9,6 +9,7 @@ use std::cmp::{max, min};
 use std::fmt::Write as _;
 use std::fmt::{Display, Formatter};
 use std::io::Write;
+use std::ops::Rem;
 
 const MAX_PARTITION_LENGTH: usize = 0xC00;
 const PARTITION_TABLE_SIZE: usize = 0x1000;
@@ -261,6 +262,9 @@ impl PartitionTable {
                     )
                     .into());
                 }
+                if partition.ty == Type::App && partition.offset.rem(0x10000) != 0 {
+                    return Err(UnalignedPartitionError::new(source, *line).into());
+                }
             }
         }