merge revision(s) 61567: [Backport #14693]

fix uninitialized variable Likewise this can easily be noticed if you read the warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@64418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Aug 17, 2018 · a42b518 · a42b518
1 parent fa07823
commit a42b518
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/eval_error.c b/eval_error.c
@@ -240,7 +240,7 @@ void
 rb_ec_error_print(rb_execution_context_t * volatile ec, volatile VALUE errinfo)
 {
     volatile int raised_flag = ec->raised_flag;
-    volatile VALUE errat;
+    volatile VALUE errat = Qundef;
     volatile VALUE emesg = Qundef;
 
     if (NIL_P(errinfo))

diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-08-12"
-#define RUBY_PATCHLEVEL 68
+#define RUBY_RELEASE_DATE "2018-08-18"
+#define RUBY_PATCHLEVEL 69
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 18
 
 #include "ruby/version.h"