merge revision(s) 45271: [Backport ruby#9672]

unak · unak · commit f150dbba6b1a · 2014-03-31T06:38:23.000Z
* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
	  error reasons with old OpenSSL, and insert a colon iff formatted
	  message is not empty.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 31 15:38:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
+	  error reasons with old OpenSSL, and insert a colon iff formatted
+	  message is not empty.
+
 Mon Feb 24 12:42:01 2014  Zachary Scott  <e@zzak.io>
 
 	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
@@ -302,10 +302,11 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
 	else
 	    msg = ERR_reason_error_string(e);
 	if (NIL_P(str)) {
-	    str = rb_str_new_cstr(msg);
+	    if (msg) str = rb_str_new_cstr(msg);
 	}
 	else {
-	    rb_str_cat2(rb_str_cat2(str, ": "), msg);
+	    if (RSTRING_LEN(str)) rb_str_cat2(str, ": ");
+	    rb_str_cat2(str, msg ? msg : "(null)");
 	}
     }
     if (dOSSL == Qtrue){ /* show all errors on the stack */
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 545
+#define RUBY_PATCHLEVEL 546
 
-#define RUBY_RELEASE_DATE "2014-02-24"
+#define RUBY_RELEASE_DATE "2014-03-31"
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 31
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -302,10 +302,11 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)`
`302`	`302`	`else`
`303`	`303`	`msg = ERR_reason_error_string(e);`
`304`	`304`	`if (NIL_P(str)) {`
`305`		`- str = rb_str_new_cstr(msg);`
	`305`	`+ if (msg) str = rb_str_new_cstr(msg);`
`306`	`306`	`}`
`307`	`307`	`else {`
`308`		`- rb_str_cat2(rb_str_cat2(str, ": "), msg);`
	`308`	`+ if (RSTRING_LEN(str)) rb_str_cat2(str, ": ");`
	`309`	`+ rb_str_cat2(str, msg ? msg : "(null)");`
`309`	`310`	`}`
`310`	`311`	`}`
`311`	`312`	`if (dOSSL == Qtrue){ /* show all errors on the stack */`