summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/syck/yaml2byte.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d6f9c71575..9f10d9e680 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):
+ removed wrong extra assignments. a patch from Marcus Rueckert
+ <darix AT opensu.se> at [ruby-core:29759].
+
Sat Apr 24 00:41:52 2010 Yusuke Endoh <mame@tsg.ne.jp>
* process.c (rb_f_fork): remove after_exec() which sometimes caused
diff --git a/ext/syck/yaml2byte.c b/ext/syck/yaml2byte.c
index 390deb6c0d..e5cc4e0779 100644
--- a/ext/syck/yaml2byte.c
+++ b/ext/syck/yaml2byte.c
@@ -63,7 +63,7 @@ void bytestring_append(bytestring_t *str, char code,
grow = (length - str->remaining) + CHUNKSIZE;
str->remaining += grow;
str->length += grow;
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
assert(str->buffer);
}
curr = str->buffer + (str->length - str->remaining);
@@ -100,7 +100,7 @@ void bytestring_extend(bytestring_t *str, bytestring_t *ext)
grow = (length - str->remaining) + CHUNKSIZE;
str->remaining += grow;
str->length += grow;
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
}
curr = str->buffer + (str->length - str->remaining);
from = ext->buffer;