fix (ldap): improve EscapeValue(...)

ldap/client.go

@@ -830,10 +830,14 @@ func EscapeValue(input string) string {
 	// - trailing space
 	// - special characters '"', '+', ',', ';', '<', '>', '\\'
 	// - null
-	for i := 0; i < len(input); i++ {
+	inputLen := len(input)
+	for i := 0; i < inputLen; i++ {
 		escaped := false
 		if input[i] == '\\' {
 			i++
+			if i > inputLen-1 {
+				break
+			}
 			escaped = true
 		}
 		switch input[i] {
@@ -843,6 +847,9 @@ func EscapeValue(input string) string {
 				i++
 			}
 			continue
+		case '\000':
+			input = input[0:i] + `\00` + input[i+1:]
+			continue
 		}
 		if escaped {
 			input = input[0:i] + "\\" + input[i:]

ldap/conn_test.go

@@ -13,12 +13,16 @@ func Test_EscapeValue(t *testing.T) {
 		"test\\hello": "test\\\\hello",
 		"  test  ":    "\\  test \\ ",
 		"":            "",
+		`\`:           `\`,
+		"golang\000":  `golang\00`,
+		"go\000lang":  `go\00lang`,
+		"\000":        `\00`,
 	}
 
 	for test, answer := range testcases {
 		res := EscapeValue(test)
 		if res != answer {
-			t.Errorf("Failed to escape %s: %s != %s\n", test, res, answer)
+			t.Errorf("Failed to escape %q: %q != %q\n", test, res, answer)
 		}
 	}
 }