diff --git a/ChangeLog b/ChangeLog index ae501b093f..5f48063187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu May 4 02:24:16 2006 Yukihiro Matsumoto + + * ext/syck/emitter.c (syck_scan_scalar): avoid accessing + uninitialized array element. a patch from Pat Eyler + . [ruby-core:07809] + + * array.c (rb_ary_fill): initialize local variables first. a + patch from Pat Eyler . [ruby-core:07810] + Wed May 3 02:12:07 2006 Yukihiro Matsumoto * ext/socket/socket.c (make_hostent_internal): accept ai_family diff --git a/array.c b/array.c index 240760ef83..e886c2fa55 100644 --- a/array.c +++ b/array.c @@ -2223,7 +2223,7 @@ rb_ary_fill(argc, argv, ary) VALUE ary; { VALUE item, arg1, arg2; - long beg = 0, end, len; + long beg = 0, end = 0, len = 0; VALUE *p, *pend; int block_p = Qfalse; diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c index f8d7b548a9..9c8ab8d49b 100644 --- a/ext/syck/emitter.c +++ b/ext/syck/emitter.c @@ -559,7 +559,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 ) ) + ( len == 1 || cursor[1] == ' ' || cursor[1] == '\n' ) ) { flags |= SCAN_INDIC_S; }