summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-02 15:02:49 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-02 15:02:49 +0000
commit8913015f04fdeab5676c411f8641dfc8d2fdb039 (patch)
tree79b7731378fcae7dc991cc9e8ef590dee2bb5090
parent63b79786250f32c0fac7a9f01eb52f8c4e6c5397 (diff)
* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
emitter's marker. if marker points to the end of buffer, this is buffer overrun. (ex: YAML.dump("." * 12288)) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/emitter.c1
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f6b42430e7..8f7787a43f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 3 00:01:31 2006 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
+ emitter's marker. if marker points to the end of buffer, this is
+ buffer overrun. (ex: YAML.dump("." * 12288))
+
Thu Feb 2 17:13:01 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#get_tk): added
diff --git a/ext/syck/emitter.c b/ext/syck/emitter.c
index 9fe699f9ed..f8d7b548a9 100644
--- a/ext/syck/emitter.c
+++ b/ext/syck/emitter.c
@@ -314,7 +314,6 @@ syck_emitter_write( SyckEmitter *e, char *str, long len )
*/
S_MEMCPY( e->marker, str, char, len );
e->marker += len;
- e->marker[0] = '\0';
}
/*