这是indexloc提供的服务，不要输入任何密码
Skip to content

Fixed https://github.com/cpan-authors/YAML-Syck/issues/51 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2025
Merged

Fixed https://github.com/cpan-authors/YAML-Syck/issues/51 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ t/bug/doesnt-stringify.t
t/bug/rt-41141.t
t/bug/rt-49404-double_free.t
t/bug/rt-54167.t
t/escape-special-chars.t
t/json-basic.t
t/json-circular-ref.t
t/json-crlf.t
Expand Down
61 changes: 29 additions & 32 deletions emitter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* $Date: 2006-05-09 12:03:50 +0800 (二, 09 5 2006) $
*
* Copyright (C) 2003 why the lucky stiff
*
*
* All Base64 code from Ruby's pack.c.
* Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto
* Ruby is Copyright (C) 1993-2003 Yukihiro Matsumoto
*/
#include <stdio.h>
#include <string.h>
Expand All @@ -16,7 +16,7 @@

#define DEFAULT_ANCHOR_FORMAT "id%03d"

const unsigned char hex_table[] =
const unsigned char hex_table[] =
"0123456789ABCDEF";
static unsigned char b64_table[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
Expand Down Expand Up @@ -137,7 +137,7 @@ syck_new_emitter()
e->output_handler = NULL;
e->lvl_idx = 0;
e->lvl_capa = ALLOC_CT;
e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa );
e->levels = S_ALLOC_N( SyckLevel, e->lvl_capa );
syck_emitter_reset_levels( e );
e->bonus = NULL;
return e;
Expand Down Expand Up @@ -203,7 +203,7 @@ syck_emitter_pop_level( SyckEmitter *e )
free( e->levels[e->lvl_idx].domain );
}

void
void
syck_emitter_add_level( SyckEmitter *e, int len, enum syck_level_status status )
{
ASSERT( e != NULL );
Expand Down Expand Up @@ -295,7 +295,7 @@ syck_emitter_write( SyckEmitter *e, const char *str, long len )
{
syck_emitter_clear( e );
}

/*
* Flush if at end of buffer
*/
Expand Down Expand Up @@ -366,7 +366,7 @@ syck_emit( SyckEmitter *e, st_data_t n )
int indent = 0;
SyckLevel *parent;
SyckLevel *lvl = syck_emitter_current_level( e );

/*
* Determine headers.
*/
Expand Down Expand Up @@ -498,7 +498,7 @@ void syck_emit_tag( SyckEmitter *e, const char *tag, const char *ignore )
lvl->anctag = 1;
}

/*
/*
* Emit a newline and an appropriately spaced indent.
*/
void syck_emit_indent( SyckEmitter *e )
Expand Down Expand Up @@ -582,7 +582,7 @@ syck_scan_scalar( int req_width, char *cursor, long len )
} else if ( len > 1 && cursor[len-2] == '\n' ) {
flags |= SCAN_MANYNL_E;
}
if (
if (
( len > 0 && ( cursor[0] == ' ' || cursor[0] == '\t' ) ) ||
( len > 1 && ( cursor[len-1] == ' ' || cursor[len-1] == '\t' ) )
) {
Expand All @@ -609,7 +609,7 @@ syck_scan_scalar( int req_width, char *cursor, long len )
flags |= SCAN_NEWLINE;
if ( len - i >= 3 && strncmp( &cursor[i+1], "---", 3 ) == 0 )
flags |= SCAN_DOCSEP;
if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' )
if ( cursor[i+1] == ' ' || cursor[i+1] == '\t' )
flags |= SCAN_INDENTED;
if ( req_width > 0 && i - start > req_width )
flags |= SCAN_WIDE;
Expand All @@ -633,12 +633,12 @@ syck_scan_scalar( int req_width, char *cursor, long len )
}
/* remember, if plain collections get implemented, to add nb-plain-flow-char */
else if ( ( cursor[i] == ' ' && cursor[i+1] == '#' ) ||
( cursor[i] == ':' &&
( cursor[i] == ':' &&
( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) ) )
{
flags |= SCAN_INDIC_C;
}
else if ( cursor[i] == ',' &&
else if ( cursor[i] == ',' &&
( cursor[i+1] == ' ' || cursor[i+1] == '\n' || i == len - 1 ) )
{
flags |= SCAN_FLOWMAP;
Expand All @@ -661,12 +661,12 @@ void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style,
SyckLevel *lvl = syck_emitter_current_level( e );
int scan = 0;
char *implicit;

if ( str == NULL ) str = "";

/* No empty nulls as map keys */
if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) &&
parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 )
if ( len == 0 && ( parent->status == syck_lvl_map || parent->status == syck_lvl_imap ) &&
parent->ncount % 2 == 1 && syck_tagcmp( tag, "tag:yaml.org,2002:null" ) == 0 )
{
str = "~";
len = 1;
Expand All @@ -678,7 +678,7 @@ void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style,
/* quote strings which default to implicits */
if (
(
(strncmp( implicit, "bool", 4 ) == 0) ||
(strncmp( implicit, "bool", 4 ) == 0) ||
(strncmp( implicit, "null", 4 ) == 0)
)
&&
Expand All @@ -690,8 +690,8 @@ void syck_emit_scalar( SyckEmitter *e, char *tag, enum scalar_style force_style,
} else {
/* complex key -- disabled by Audrey Tang -/
if ( parent->status == syck_lvl_map && parent->ncount % 2 == 1 &&
( !( tag == NULL ||
( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) )
( !( tag == NULL ||
( implicit != NULL && syck_tagcmp( tag, implicit ) == 0 && e->explicit_typing == 0 ) ) ) )
{
syck_emitter_write( e, "? ", 2 );
parent->status = syck_lvl_mapx;
Expand Down Expand Up @@ -955,7 +955,17 @@ void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )

/* Escape sequences allowed within double quotes. */
case '"': syck_emitter_write( e, "\\\"", 2 ); break;
case '\\': syck_emitter_write( e, "\\\\", 2 ); break;
case '\\':
/* Check if next char is a special char that needs escaping */
if (mark + 1 < str + len &&
(mark[1] == 't' || mark[1] == 'r' || mark[1] == 'n' ||
mark[1] == '0' || mark[1] == 'a' || mark[1] == 'b' ||
mark[1] == 'f' || mark[1] == 'v' || mark[1] == 'e')) {
syck_emitter_write( e, "\\\\", 2 );
} else {
syck_emitter_write( e, "\\\\", 2 );
}
break;
case '\0': syck_emitter_write( e, "\\0", 2 ); break;
case '\a': syck_emitter_write( e, "\\a", 2 ); break;
case '\b': syck_emitter_write( e, "\\b", 2 ); break;
Expand All @@ -966,18 +976,6 @@ void syck_emit_2quoted( SyckEmitter *e, int width, char *str, long len )
case 0x1b: syck_emitter_write( e, "\\e", 2 ); break;
case '\n': syck_emitter_write( e, "\\n", 2 ); break;

/* XXX - Disabled by Audrey Tang for YAML.pm compat
case '\n':
end = mark + 1;
syck_emitter_write( e, "\\n", 2 );
do_indent = e->indent;
start = mark + 1;
if ( start < str + len && ( *start == ' ' || *start == '\n' ) ) {
do_indent = 0;
}
break;
*/

case ' ':
if ( width > 0 && *start != ' ' && mark - end > width ) {
do_indent = 1;
Expand Down Expand Up @@ -1356,4 +1354,3 @@ syck_emitter_mark_node( SyckEmitter *e, st_data_t n, int flags )
}
return oid;
}

54 changes: 54 additions & 0 deletions t/escape-special-chars.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
use strict;
use warnings;
use Test::More tests => 8;
use YAML::Syck;

# Test string with various special characters
my $test_str = "with \t tabs and carriage \r returns";

# Test dumping and loading
my $yaml = Dump($test_str);
my $loaded = Load($yaml);

# Verify the string roundtrips correctly
is($loaded, $test_str, "String with special chars roundtrips correctly");

# Test literal backslashes
my $backslash_str = "with \\t tabs and carriage \\r returns";
$yaml = Dump($backslash_str);
$loaded = Load($yaml);
is($loaded, $backslash_str, "String with literal backslashes roundtrips correctly");

# Test mixed special chars and literal backslashes
my $mixed_str = "with \t tabs and \\r literal returns";
$yaml = Dump($mixed_str);
$loaded = Load($yaml);
is($loaded, $mixed_str, "String with mixed special chars and literal backslashes roundtrips correctly");

# Test in a hash
my $hash = {
special => "with \t tabs and carriage \r returns",
literal => "with \\t tabs and carriage \\r returns",
mixed => "with \t tabs and \\r literal returns"
};

$yaml = Dump($hash);
$loaded = Load($yaml);

is($loaded->{special}, $hash->{special}, "Special chars in hash value roundtrip correctly");
is($loaded->{literal}, $hash->{literal}, "Literal backslashes in hash value roundtrip correctly");
is($loaded->{mixed}, $hash->{mixed}, "Mixed chars in hash value roundtrip correctly");

# Test in an array
my $array = [
"with \t tabs and carriage \r returns",
"with \\t tabs and carriage \\r returns",
"with \t tabs and \\r literal returns"
];

$yaml = Dump($array);
$loaded = Load($yaml);

is($loaded->[0], $array->[0], "Special chars in array element roundtrip correctly");
is($loaded->[1], $array->[1], "Literal backslashes in array element roundtrip correctly");

Loading