aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-25 08:34:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-25 08:34:32 +0000
commit0d0c147f23ef526437a7904c8ce22d60fa232c95 (patch)
tree303884809e828d58ca588e04f3ffd83011be7310
parentd9a1cc2f4edcd59bd544d48e2f446d43f5121401 (diff)
downloadruby-0d0c147f23ef526437a7904c8ce22d60fa232c95.tar.gz
* transcode.c (rb_econv_substr_append): fix for buffer overrun.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--win32/enc-setup.mak6
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3658660311..ea65fe27a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug 25 17:34:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * transcode.c (rb_econv_substr_append): fix for buffer overrun.
+
Mon Aug 25 14:22:21 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* parse.y (YYSTYPE): struct RVarmap has been no longer
diff --git a/win32/enc-setup.mak b/win32/enc-setup.mak
index bc4df0fdc4..44345a2f45 100644
--- a/win32/enc-setup.mak
+++ b/win32/enc-setup.mak
@@ -1,6 +1,10 @@
-BUILTIN_ENCOBJS: $(srcdir)/enc/Makefile.in
+encs: BUILTIN_ENCOBJS BUILTIN_TRANSOBJS
+BUILTIN_ENCOBJS BUILTIN_TRANSOBJS: $(srcdir)/enc/Makefile.in
!include $(srcdir)/enc/Makefile.in
BUILTIN_ENCOBJS:
@echo BUILTIN_ENCOBJS = $(BUILTIN_ENCS:.c=.obj) >> $(MAKEFILE)
+
+BUILTIN_TRANSOBJS:
+ @echo BUILTIN_TRANSOBJS = $(BUILTIN_TRANSES:.trans=.obj) >> $(MAKEFILE)