raise error on too many channels

foxglove · Jan 7, 2025 · 74965a7 · 74965a7
1 parent d4818ca
commit 74965a7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -140,6 +140,10 @@ pub enum McapError {
     ChunkBufferTooLarge(u64),
     #[error("length exceeds usize max: `{0}`")]
     TooLong(u64),
+    #[error("cannot write more than 65335 channels to one MCAP")]
+    TooManyChannels,
+    #[error("cannot write more than 65334 schemas to one MCAP")]
+    TooManySchemas,
 }
 
 pub type McapResult<T> = Result<T, McapError>;

diff --git a/rust/src/write.rs b/rust/src/write.rs
@@ -280,14 +280,20 @@ impl<W: Write + Seek> Writer<W> {
         }) {
             return Ok(id);
         }
+        while self.schemas.contains_right(&self.next_schema_id) {
+            if self.next_schema_id == u16::MAX {
+                return Err(McapError::TooManySchemas);
+            }
+            self.next_schema_id += 1;
+        }
         let id = self.next_schema_id;
+        self.next_schema_id += 1;
         self.write_schema(Schema {
             id,
             name: name.into(),
             encoding: encoding.into(),
             data: Cow::Owned(data.into()),
         })?;
-        self.next_schema_id += 1;
         Ok(id)
     }
 
@@ -347,12 +353,19 @@ impl<W: Write + Seek> Writer<W> {
         }) {
             return Ok(id);
         }
-        let id = self.next_channel_id;
-        self.next_channel_id += 1;
         if schema_id != 0 && self.schemas.get_by_right(&schema_id).is_none() {
             return Err(McapError::UnknownSchema(topic.into(), schema_id));
         }
 
+        while self.channels.contains_right(&self.next_channel_id) {
+            if self.next_channel_id == u16::MAX {
+                return Err(McapError::TooManyChannels);
+            }
+            self.next_channel_id += 1;
+        }
+        let id = self.next_channel_id;
+        self.next_channel_id += 1;
+
         self.write_channel(records::Channel {
             id,
             schema_id,