Fix marshaling of file name in Mono.Unix.UnixEndPoint.Create()

In some cases, the null terminator in the SocketAddress may not be the last
character. This changes the algorithm to ignore the null terminator and
anything after it instead of assuming that the last character is the null
terminator.

Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=35004

1 files changed, 8 insertions, 2 deletions

diff --git a/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs b/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
index d86dd7cf7dc..d7a7f0c6b86 100644
--- a/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
+++ b/mcs/class/Mono.Posix/Mono.Unix/UnixEndPoint.cs
@@ -82,12 +82,18 @@ namespace Mono.Unix
 				uep.filename = "";
 				return uep;
 			}
-			byte [] bytes = new byte [socketAddress.Size - 2 - 1];
+			int size = socketAddress.Size - 2;
+			byte [] bytes = new byte [size];
 			for (int i = 0; i < bytes.Length; i++) {
 				bytes [i] = socketAddress [i + 2];
+				// There may be junk after the null terminator, so ignore it all.
+				if (bytes [i] == 0) {
+					size = i;
+					break;
+				}
 			}
 
-			string name = Encoding.Default.GetString (bytes);
+			string name = Encoding.Default.GetString (bytes, 0, size);
 			return new UnixEndPoint (name);
 		}