summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 02:35:47 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 02:35:47 +0000
commit99e63fba29afb9f6dbf95396a12524ec8b8096ac (patch)
tree02b1a48f4958c00708cb4704110c93792df37c9b
parent7d79f355fcfb39c52f5b47f44c99c0e645d1878a (diff)
* vm_eval.c (ruby_eval_string_from_file_protect): initializer element is not computable at load time.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_eval.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 539bde686a..6d6ec4c89b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 4 11:28:57 2012 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * vm_eval.c (ruby_eval_string_from_file_protect): initializer
+ element is not computable at load time.
+
Tue Sep 4 07:48:35 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* test/openssl/test_asn1_rb:
diff --git a/vm_eval.c b/vm_eval.c
index ce5e340b3e..899389848b 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -1174,7 +1174,9 @@ eval_string_from_file_helper(void *data) {
VALUE
ruby_eval_string_from_file_protect(const char *str, const char *filename, int *state) {
- struct eval_string_from_file_arg arg = { str, filename };
+ struct eval_string_from_file_arg arg;
+ arg.str = str;
+ arg.filename = filename;
return rb_protect((VALUE (*)(VALUE))eval_string_from_file_helper, (VALUE)&arg, state);
}