ruby-changes:48634
From: rhe <ko1@a...>
Date: Mon, 13 Nov 2017 02:11:06 +0900 (JST)
Subject: [ruby-changes:48634] rhe:r60749 (trunk): string.c: fix up r60748
rhe 2017-11-13 02:10:29 +0900 (Mon, 13 Nov 2017) New Revision: 60749 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60749 Log: string.c: fix up r60748 An #ifdef was missing in r60748 and build broke on systems without crypt_r(). https://rubyci.org/logs/rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20171112T162503Z.fail.html.gz Modified files: trunk/string.c Index: string.c =================================================================== --- string.c (revision 60748) +++ string.c (revision 60749) @@ -8889,7 +8889,9 @@ rb_str_crypt(VALUE str, VALUE salt) https://github.com/ruby/ruby/blob/trunk/string.c#L8889 rb_sys_fail("crypt"); } result = rb_str_new_cstr(res); +#ifdef HAVE_CRYPT_R ALLOCV_END(databuf); +#endif FL_SET_RAW(result, OBJ_TAINTED_RAW(str) | OBJ_TAINTED_RAW(salt)); return result; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/