diff --git a/xous-rs/src/arch/hosted.rs b/xous-rs/src/arch/hosted.rs index 7efe75c4c..add46d0d9 100644 --- a/xous-rs/src/arch/hosted.rs +++ b/xous-rs/src/arch/hosted.rs @@ -687,6 +687,8 @@ fn _xous_syscall_result(ret: &mut Result, thread_id: TID, server_connection: &Se eprintln!("Server shut down: {}", e); std::process::exit(0); } + data.shrink_to_fit(); + assert_eq!(data.len(), data.capacity()); let len = data.len(); let addr = data.as_mut_ptr(); memory_message.buf.addr = crate::MemoryAddress::new(addr as _).unwrap(); diff --git a/xous-rs/src/definitions.rs b/xous-rs/src/definitions.rs index 4b68e486e..8643e97e8 100644 --- a/xous-rs/src/definitions.rs +++ b/xous-rs/src/definitions.rs @@ -584,6 +584,16 @@ impl Drop for MessageEnvelope { .expect("couldn't return memory") } Message::Move(msg) => { + // Reconstitute the vec and drop it right away to ensure it's freed. + #[cfg(any(unix, windows))] + let _v = unsafe { + std::vec::Vec::from_raw_parts( + msg.buf.as_mut_ptr(), + msg.buf.len(), + msg.buf.len(), + ) + }; + #[cfg(not(any(unix, windows)))] crate::syscall::unmap_memory(msg.buf).expect("couldn't free memory message") } _ => (),