From 77d1c309cd77ab673d74b6e2cdc5cbb342ef8b20 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Fri, 15 Apr 2016 07:40:57 +0200 Subject: [PATCH] od: fix infinite loop at EOF Fixes #866 --- src/od/od.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/od/od.rs b/src/od/od.rs index 8a8f15393..969ee55ea 100644 --- a/src/od/od.rs +++ b/src/od/od.rs @@ -71,6 +71,11 @@ fn odfunc(input_offset_base: &Radix, fname: &str) { let bytes = &mut [b'\x00'; 16]; loop { match f.read(bytes) { + Ok(0) => { + print_with_radix(input_offset_base, addr); + print!("\n"); + break; + } Ok(n) => { print_with_radix(input_offset_base, addr); for b in 0 .. n / mem::size_of::() {