diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-18 07:20:25 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-18 07:20:25 +0000 |
| commit | c3db44dc35a0ea43a0a79c487b852b200aed73ae (patch) | |
| tree | 524100b8c9b0295e23078d912574ba241c20f80d /pack.c | |
| parent | ca7431965b41da76a9d63024b325edc2d127e97e (diff) | |
| download | ruby-c3db44dc35a0ea43a0a79c487b852b200aed73ae.tar.gz | |
pack.c: refix unpack base64
* 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
Diffstat (limited to 'pack.c')
| -rw-r--r-- | pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) |