1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/date/date_core.c (date_strftime_alloc): followed the change

Browse Source 
of r32885.
	* doc/NEWS-1.9.3: followed the above change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2011-08-13 00:12:05 +00:00
parent b5f05971f5
commit 0acaab201a
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Aug 13 09:05:16 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_core.c (date_strftime_alloc): followed the change
of r32885.
* doc/NEWS-1.9.3: followed the above change.
Sat Aug 13 08:55:38 2011 Aaron Patterson <aaron@tenderlovemaking.com> Sat Aug 13 08:55:38 2011 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/scalar_scanner.rb: Only consider strings * ext/psych/lib/psych/scalar_scanner.rb: Only consider strings

6
doc/NEWS-1.9.3
View File

@ -145,10 +145,10 @@ with all sufficient information, see the ChangeLog file.
* A method strftime cannot produce huge output (same as Time's one). * A method strftime cannot produce huge output (same as Time's one).
* Even though Date/DateTime can handle far dates, the following gives * Even though Date/DateTime can handle far dates, the following causes
an empty string: an exception.
DateTime.new(1<<10000).strftime('%Y') #=> "" DateTime.new(1<<10000).strftime('%Y') # Errno::ERANGE
* Changed the format of inspect. * Changed the format of inspect.
* Changed the format of marshal (but, can load old dumps). * Changed the format of marshal (but, can load old dumps).

6
ext/date/date_core.c
View File

@ -6721,8 +6721,12 @@ date_strftime_alloc(char **buf, const char *format,
* if the buffer is 1024 times bigger than the length of the * if the buffer is 1024 times bigger than the length of the
* format string, it's not failing for lack of room. * format string, it's not failing for lack of room.
*/ */
if (len > 0 || size >= 1024 * flen) break; if (len > 0) break;
xfree(*buf); xfree(*buf);
if (size >= 1024 * flen) {
rb_sys_fail(format);
break;
}
} }
return len; return len;
} }