naruse	2012-11-09 13:06:45 +0900 (Fri, 09 Nov 2012)

  New Revision: 37572

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37572

  Log:
    * string.c (rb_str_crypt): crypt(3) may return NULL.
      Latest glibc (2.16?) crypt(3) actually returns NULL. [Bug #7312]

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37571)
+++ ChangeLog	(revision 37572)
@@ -1,3 +1,8 @@
+Fri Nov  9 12:58:13 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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@i...>
 
 	* include/ruby/ruby.h (alloca), eval_intern.h (alloca), gc.c
Index: string.c
===================================================================
--- string.c	(revision 37571)
+++ string.c	(revision 37572)
@@ -6909,6 +6909,7 @@
     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 @@
 	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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/