Merge pull request #12 from nfg/master

Fixing RT #41141 -- handling carriage return after c-indicator.

emitter.c

@@ -571,7 +571,7 @@ syck_scan_scalar( int req_width, char *cursor, long len )
     }
     if ( ( cursor[0] == '-' || cursor[0] == ':' ||
            cursor[0] == '?' || cursor[0] == ',' ) &&
-           ( cursor[1] == ' ' || cursor[1] == '\n' || len == 1 ) )
+           ( cursor[1] == ' ' || cursor[1] == '\n' || cursor[1] == '\r' || len == 1 ) )
     {
             flags |= SCAN_INDIC_S;
     }

t/bug/rt-41141.t

@@ -0,0 +1,31 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use YAML::Syck;
+use Data::Dumper;
+
+# Carrier returns after c-indicators aren't being handled properly.
+
+my %tests = (
+    # From the original bug report. Seems to have been fixed already.
+    '42\\r' => "42\r",
+
+    # These all produced bad YAML.
+    '?\\r'  => "?\r",
+    '-\\r\\r'  => "-\r\r",
+    ',\\r\\r\\r'  => ",\r\r\r",
+);
+
+plan tests => scalar keys %tests;
+while (my ($test, $value) = each (%tests))
+{
+    my $yaml = YAML::Syck::Dump($value);
+    my $decoded = eval { YAML::Syck::Load($yaml); };
+    is($decoded, $value, "Produces valid YAML: $test");
+}
+
+note 'Done!';
+