Fixed a bug where UnixAddr::new_abstract forgot to count the null-byte.

Mathias Svensson · Mathias Svensson · commit 26e1b6d78563 · 2016-09-17T19:23:49.000+02:00
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
@@ -391,7 +391,7 @@ impl UnixAddr {
                 .. mem::zeroed()
             };
 
-            if path.len() > ret.sun_path.len() {
+            if path.len() + 1 > ret.sun_path.len() {
                 return Err(Error::Sys(Errno::ENAMETOOLONG));
             }
 
@@ -401,7 +401,7 @@ impl UnixAddr {
                                      ret.sun_path.as_mut_ptr().offset(1) as *mut u8,
                                      path.len());
 
-            Ok(UnixAddr(ret, path.len()))
+            Ok(UnixAddr(ret, path.len() + 1))
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ impl UnixAddr {`
`391`	`391`	`.. mem::zeroed()`
`392`	`392`	`};`
`393`	`393`
`394`		`- if path.len() > ret.sun_path.len() {`
	`394`	`+ if path.len() + 1 > ret.sun_path.len() {`
`395`	`395`	`return Err(Error::Sys(Errno::ENAMETOOLONG));`
`396`	`396`	`}`
`397`	`397`
`@@ -401,7 +401,7 @@ impl UnixAddr {`
`401`	`401`	`ret.sun_path.as_mut_ptr().offset(1) as *mut u8,`
`402`	`402`	`path.len());`
`403`	`403`
`404`		`- Ok(UnixAddr(ret, path.len()))`
	`404`	`+ Ok(UnixAddr(ret, path.len() + 1))`
`405`	`405`	`}`
`406`	`406`	`}`
`407`	`407`