Remove carriage returns when decoding strings

Fixes #1100.

Author: cichli

nrepl-client.el

@@ -500,8 +500,10 @@ object is a root list or dict."
           (progn (goto-char pos0)
                  (cons :stub stack))
         (goto-char end)
-        (cons nil (nrepl--push (buffer-substring-no-properties beg end)
-                               stack)))))
+        ;; normalise any platform-specific newlines
+        (let* ((original (buffer-substring-no-properties beg end))
+               (result (replace-regexp-in-string "\r" "" original)))
+          (cons nil (nrepl--push result stack))))))
    ;; integer
    ((looking-at "i\\(-?[0-9]+\\)e")
     (goto-char (match-end 0))

test/nrepl-bencode-tests.el

@@ -21,6 +21,12 @@ If object is incomplete, return a decoded path."
 (ert-deftest test-nrepl-bdecode-string ()
   (should (equal '("spam") (nrepl-bdecode-string "4:spam"))))
 
+(ert-deftest test-nrepl-bdecode-string-platform-specific-newlines ()
+  (should (equal '("spam\n") (nrepl-bdecode-string "5:spam
+")))
+  (should (equal '("spam\n") (nrepl-bdecode-string "6:spam
+"))))
+
 (ert-deftest test-nrepl-bdecode-integer ()
   (should (equal '(3) (nrepl-bdecode-string "i3e"))))