\r does not round-trip the local socket, escape and restore on the ot…

…her side (ansible#43507)
raphaelm · Aug 1, 2018 · 9169daa · 9169daa
1 parent c4591f0
commit 9169daa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bin/ansible-connection b/bin/ansible-connection
@@ -214,6 +214,8 @@ def main():
                 raise Exception("EOF found before vars data was complete")
             vars_data += cur_line
             cur_line = stdin.readline()
+        # restore escaped loose \r characters
+        vars_data = vars_data.replace(br'\r', b'\r')
 
         if PY3:
             pc_data = cPickle.loads(init_data, encoding='bytes')

diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
@@ -936,6 +936,8 @@ def find_file_in_path(filename):
         stdin.write(b'\n#END_INIT#\n')
 
         src = cPickle.dumps(variables, protocol=0)
+        # remaining \r fail to round-trip the socket
+        src = src.replace(b'\r', br'\r')
         stdin.write(src)
         stdin.write(b'\n#END_VARS#\n')