kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

pack.c: refix unpack base64

Browse source 
* pack.c (pack_unpack): increase buffer size to fix buffer overflow,
  and fix garbages just after unpacking without missing paddings.
  [Bug #8286]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-04-18 07:20:25 +00:00
parent ca7431965b
commit c3db44dc35
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Apr 18 16:20:21 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* pack.c (pack_unpack): increase buffer size to fix buffer overflow,
and fix garbages just after unpacking without missing paddings.
[Bug #8286]
Thu Apr 18 13:35:54 2013 NARUSE, Yui <naruse@ruby-lang.org>
* pack.c (pack_unpack): output characters even if the input doesn't

3
pack.c
View file

@ -1941,7 +1941,7 @@ pack_unpack(VALUE str, VALUE fmt)
case 'm':
{
VALUE buf = infected_str_new(0, (send - s + 2)*3/4, str); /* +2 is for skipping paddings */
VALUE buf = infected_str_new(0, (send - s + 3)*3/4, str); /* +3 is for skipping paddings */
char *ptr = RSTRING_PTR(buf);
int a = -1,b = -1,c = 0,d = 0;
static signed char b64_xtable[256];
@ -2004,6 +2004,7 @@ pack_unpack(VALUE str, VALUE fmt)
*ptr++ = castchar(a << 2 | b >> 4);
*ptr++ = castchar(b << 4 | c >> 2);
*ptr++ = castchar(c << 6 | d);
a = -1;
}
if (a != -1 && b != -1) {
if (c == -1)