diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-03 17:29:36 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-03 17:29:36 +0000 |
commit | 704fbef5b620291e98e30010f75acac75874e7e5 (patch) | |
tree | aaffa6bf0e0839cc89a4be2662ce5e7027510dde | |
parent | 3d2d405046f6f954235424500d828795b9a027b9 (diff) |
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | array.c | 2 | ||||
-rw-r--r-- | ext/syck/emitter.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Thu May 4 02:24:16 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/syck/emitter.c (syck_scan_scalar): avoid accessing + uninitialized array element. a patch from Pat Eyler + <rubypate at gmail.com>. [ruby-core:07809] + + * array.c (rb_ary_fill): initialize local variables first. a + patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] + Wed May 3 02:12:07 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/socket/socket.c (make_hostent_internal): accept ai_family @@ -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; } |