ruby-changes:22984
From: nobu <ko1@a...>
Date: Thu, 15 Mar 2012 15:03:14 +0900 (JST)
Subject: [ruby-changes:22984] nobu:r35033 (trunk): * file.c (ruby_enc_find_basename): allow NULL as alllen.
nobu 2012-03-15 15:03:02 +0900 (Thu, 15 Mar 2012) New Revision: 35033 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35033 Log: * file.c (ruby_enc_find_basename): allow NULL as alllen. [ruby-dev:45363][Bug #6146] Modified files: trunk/ChangeLog trunk/file.c Index: ChangeLog =================================================================== --- ChangeLog (revision 35032) +++ ChangeLog (revision 35033) @@ -1,3 +1,8 @@ +Thu Mar 15 15:02:58 2012 Nobuyoshi Nakada <nobu@r...> + + * file.c (ruby_enc_find_basename): allow NULL as alllen. + [ruby-dev:45363][Bug #6146] + Thu Mar 15 14:49:31 2012 Nobuyoshi Nakada <nobu@r...> * string.c (rb_str_conv_enc_opts): default to original encoding. Index: file.c =================================================================== --- file.c (revision 35032) +++ file.c (revision 35033) @@ -3563,7 +3563,7 @@ #endif long f = 0, n = -1; - end = name + *alllen; + end = name + (alllen ? (size_t)*alllen : strlen(name)); name = skipprefix(name, end, enc); #if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC root = name; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/