Fix a bug in xml encoding and decoding

Author: iychoi

irods/message/xml.go

@@ -10,12 +10,13 @@ import (
 
 var (
 	// escapes from xml.Encode
-	escQuot = []byte(""") // shorter than """, \"
-	escApos = []byte("'") // shorter than "'", \'
-	escTab  = []byte("	")
-	escNL   = []byte("
")
-	escCR   = []byte("
")
-	escFFFD = []byte("\uFFFD") // Unicode replacement character
+	escQuot     = []byte(""") // shorter than """, \"
+	escApos     = []byte("'") // shorter than "'", \'
+	escTab      = []byte("	")
+	escNL       = []byte("
")
+	escCR       = []byte("
")
+	escBacktick = []byte("`")
+	escFFFD     = []byte("\uFFFD") // Unicode replacement character
 
 	// escapes for irods
 	irodsEscQuot = []byte(""")
@@ -122,6 +123,10 @@ func correctXMLRequest(in []byte, newXML bool) ([]byte, error) {
 				out.WriteByte('\'')
 			}
 			buf = buf[len(escApos):]
+		// turn ` into '
+		case buf[0] == '`' && !newXML:
+			out.Write(irodsEscApos)
+			buf = buf[1:]
 		// irods does not decode encoded tabs
 		case bytes.HasPrefix(buf, escTab):
 			out.WriteByte('\t')
@@ -134,10 +139,6 @@ func correctXMLRequest(in []byte, newXML bool) ([]byte, error) {
 		case bytes.HasPrefix(buf, escNL):
 			out.WriteByte('\n')
 			buf = buf[len(escNL):]
-		// turn ` into '
-		case buf[0] == '`' && !newXML:
-			out.Write(irodsEscApos)
-			buf = buf[1:]
 		// pass utf8 characters
 		default:
 			r, size := utf8.DecodeRune(buf)
@@ -203,12 +204,19 @@ func correctXMLResponse(in []byte, newXML bool) ([]byte, error) {
 
 	for len(buf) > 0 {
 		switch {
-		// turn " into `
+		// turn " into "
 		case bytes.HasPrefix(buf, irodsEscQuot) && !newXML:
-			out.WriteByte('`')
+			out.Write(escQuot)
 			buf = buf[len(irodsEscQuot):]
-		// turn ' into '
-		case buf[0] == '\'' && !newXML:
+		// turn ' into ' or `
+		case bytes.HasPrefix(buf, irodsEscApos):
+			if newXML {
+				out.Write(escApos)
+			} else {
+				out.Write(escBacktick)
+			}
+			buf = buf[len(irodsEscApos):]
+		case buf[0] == '\'':
 			out.Write(escApos)
 			buf = buf[1:]
 		// check utf8 characters for validity