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

* string.c (rb_str_casemap): int is too small for string size.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-06-21 07:14:04 +00:00
parent c9e9236173
commit 9d291c82e5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Jun 21 16:12:21 2016 NARUSE, Yui <naruse@ruby-lang.org>
* string.c (rb_str_casemap): int is too small for string size.
Tue Jun 21 15:42:22 2016 Martin Duerst <duerst@it.aoyama.ac.jp> Tue Jun 21 15:42:22 2016 Martin Duerst <duerst@it.aoyama.ac.jp>
* test/ruby/test_in.rb: Skip test_read_buffer_error on cygwin, * test/ruby/test_in.rb: Skip test_read_buffer_error on cygwin,

4
string.c
View File

@ -5773,7 +5773,7 @@ rb_str_casemap(VALUE source, OnigCaseFoldType *flags, rb_encoding *enc)
int target_length = 0; int target_length = 0;
mapping_buffer pre_buffer, /* only next pointer used */ mapping_buffer pre_buffer, /* only next pointer used */
*current_buffer = &pre_buffer; *current_buffer = &pre_buffer;
int buffer_count = 0; size_t buffer_count = 0;
int buffer_length_or_invalid; int buffer_length_or_invalid;
if (RSTRING_LEN(source) == 0) return rb_str_dup(source); if (RSTRING_LEN(source) == 0) return rb_str_dup(source);
@ -5783,7 +5783,7 @@ rb_str_casemap(VALUE source, OnigCaseFoldType *flags, rb_encoding *enc)
while (source_current < source_end) { while (source_current < source_end) {
/* increase multiplier using buffer count to converge quickly */ /* increase multiplier using buffer count to converge quickly */
int capa = (int)(source_end-source_current)*++buffer_count + CASE_MAPPING_ADDITIONAL_LENGTH; size_t capa = (size_t)(source_end-source_current)*++buffer_count + CASE_MAPPING_ADDITIONAL_LENGTH;
/* fprintf(stderr, "Buffer allocation, capa is %d\n", capa); *//* for tuning */ /* fprintf(stderr, "Buffer allocation, capa is %d\n", capa); *//* for tuning */
current_buffer->next = (mapping_buffer*)ALLOC_N(char, sizeof(mapping_buffer)+capa); current_buffer->next = (mapping_buffer*)ALLOC_N(char, sizeof(mapping_buffer)+capa);
current_buffer = current_buffer->next; current_buffer = current_buffer->next;