|
 |
121925 |
Index: ChangeLog
|
|
|
121925 |
===================================================================
|
|
|
121925 |
--- ChangeLog (revision 46805)
|
|
|
121925 |
+++ ChangeLog (revision 46806)
|
|
|
121925 |
@@ -837,6 +837,11 @@
|
|
|
121925 |
* array.c (rb_ary_permutation): `p` is the array of size `r`, as
|
|
|
121925 |
commented at permute0(). since `n >= r` here, buffer overflow
|
|
|
121925 |
never happened, just reduce unnecessary allocation though.
|
|
|
121925 |
+
|
|
|
121925 |
+Sun Jul 13 22:52:43 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
|
|
121925 |
+
|
|
|
121925 |
+ * pack.c (encodes): fix buffer overrun by tail_lf. Thanks to
|
|
|
121925 |
+ Mamoru Tasaka and Tomas Hoger. [ruby-core:63604] [Bug #10019]
|
|
|
121925 |
|
|
|
121925 |
Mon Jul 7 13:05:04 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
|
|
121925 |
|
|
|
121925 |
Index: pack.c
|
|
|
121925 |
===================================================================
|
|
|
121925 |
--- pack.c (revision 46805)
|
|
|
121925 |
+++ pack.c (revision 46806)
|
|
|
121925 |
@@ -1088,7 +1088,8 @@
|
|
|
121925 |
static void
|
|
|
121925 |
encodes(VALUE str, const char *s, long len, int type, int tail_lf)
|
|
|
121925 |
{
|
|
|
121925 |
- char buff[4096];
|
|
|
121925 |
+ enum {buff_size = 4096, encoded_unit = 4};
|
|
|
121925 |
+ char buff[buff_size + 1]; /* +1 for tail_lf */
|
|
|
121925 |
long i = 0;
|
|
|
121925 |
const char *trans = type == 'u' ? uu_table : b64_table;
|
|
|
121925 |
char padding;
|
|
|
121925 |
@@ -1101,7 +1102,7 @@
|
|
|
121925 |
padding = '=';
|
|
|
121925 |
}
|
|
|
121925 |
while (len >= 3) {
|
|
|
121925 |
- while (len >= 3 && sizeof(buff)-i >= 4) {
|
|
|
121925 |
+ while (len >= 3 && buff_size-i >= encoded_unit) {
|
|
|
121925 |
buff[i++] = trans[077 & (*s >> 2)];
|
|
|
121925 |
buff[i++] = trans[077 & (((*s << 4) & 060) | ((s[1] >> 4) & 017))];
|
|
|
121925 |
buff[i++] = trans[077 & (((s[1] << 2) & 074) | ((s[2] >> 6) & 03))];
|
|
|
121925 |
@@ -1109,7 +1110,7 @@
|
|
|
121925 |
s += 3;
|
|
|
121925 |
len -= 3;
|
|
|
121925 |
}
|
|
|
121925 |
- if (sizeof(buff)-i < 4) {
|
|
|
121925 |
+ if (buff_size-i < encoded_unit) {
|
|
|
121925 |
rb_str_buf_cat(str, buff, i);
|
|
|
121925 |
i = 0;
|
|
|
121925 |
}
|
|
|
121925 |
@@ -1129,6 +1130,7 @@
|
|
|
121925 |
}
|
|
|
121925 |
if (tail_lf) buff[i++] = '\n';
|
|
|
121925 |
rb_str_buf_cat(str, buff, i);
|
|
|
121925 |
+ if ((size_t)i > sizeof(buff)) rb_bug("encodes() buffer overrun");
|
|
|
121925 |
}
|
|
|
121925 |
|
|
|
121925 |
static const char hex_table[] = "0123456789ABCDEF";
|
|
|
121925 |
Index: test/ruby/test_pack.rb
|
|
|
121925 |
===================================================================
|
|
|
121925 |
--- test/ruby/test_pack.rb (revision 46805)
|
|
|
121925 |
+++ test/ruby/test_pack.rb (revision 46806)
|
|
|
121925 |
@@ -537,6 +537,14 @@
|
|
|
121925 |
assert_equal(["\377"], "/w==\n".unpack("m"))
|
|
|
121925 |
assert_equal(["\377\377"], "//8=\n".unpack("m"))
|
|
|
121925 |
assert_equal(["\377\377\377"], "////\n".unpack("m"))
|
|
|
121925 |
+
|
|
|
121925 |
+ bug10019 = '[ruby-core:63604] [Bug #10019]'
|
|
|
121925 |
+ size = ((4096-4)/4*3+1)
|
|
|
121925 |
+ assert_separately(%W[- #{size} #{bug10019}], <<-'end;')
|
|
|
121925 |
+ size = ARGV.shift.to_i
|
|
|
121925 |
+ bug = ARGV.shift
|
|
|
121925 |
+ assert_equal(size, ["a"*size].pack("m#{size+2}").unpack("m")[0].size, bug)
|
|
|
121925 |
+ end;
|
|
|
121925 |
end
|
|
|
121925 |
|
|
|
121925 |
def test_pack_unpack_m0
|
|
|
121925 |
Index: .
|
|
|
121925 |
===================================================================
|
|
|
121925 |
--- . (revision 46805)
|
|
|
121925 |
+++ . (revision 46806)
|
|
|
121925 |
|
|
|
121925 |
Property changes on: .
|
|
|
121925 |
___________________________________________________________________
|
|
|
121925 |
Modified: svn:mergeinfo
|
|
|
121925 |
Merged /trunk:r46778
|