diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri Nov 9 12:58:13 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_str_crypt): crypt(3) may return NULL. + Latest glibc (2.16?) crypt(3) actually returns NULL. [Bug #7312] + Fri Nov 9 12:07:06 2012 Akinori MUSHA <knu@iDaemons.org> * include/ruby/ruby.h (alloca), eval_intern.h (alloca), gc.c @@ -6909,6 +6909,7 @@ rb_str_crypt(VALUE str, VALUE salt) extern char *crypt(const char *, const char *); VALUE result; const char *s, *saltp; + char *res; #ifdef BROKEN_CRYPT char salt_8bit_clean[3]; #endif @@ -6928,7 +6929,11 @@ rb_str_crypt(VALUE str, VALUE salt) saltp = salt_8bit_clean; } #endif - result = rb_str_new2(crypt(s, saltp)); + res = crypt(s, saltp); + if (!res) { + rb_sys_fail("crypt"); + } + result = rb_str_new2(res); OBJ_INFECT(result, str); OBJ_INFECT(result, salt); return result; |