diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-29 15:53:53 -0300 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-29 15:53:53 -0300 |
| commit | fd39fc2d2891833949d7fa7fababad017416994e (patch) | |
| tree | 243d30feeca003f48ea77ac016466bf2799691a8 /extra | |
| parent | 6bd182e9f22e02f29e7f14e6dd8bf14eaeee084e (diff) | |
| parent | f67481558db6c0f746fdbed4d7d5e2c82b45980e (diff) | |
| download | mariadb-git-fd39fc2d2891833949d7fa7fababad017416994e.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/coding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/coding.cpp b/extra/yassl/taocrypt/src/coding.cpp index 7a9d50aaac9..7fc681e1a05 100644 --- a/extra/yassl/taocrypt/src/coding.cpp +++ b/extra/yassl/taocrypt/src/coding.cpp @@ -185,7 +185,7 @@ void Base64Decoder::Decode() { word32 bytes = coded_.size(); word32 plainSz = bytes - ((bytes + (pemLineSz - 1)) / pemLineSz); - plainSz = (plainSz * 3 + 3) / 4; + plainSz = ((plainSz * 3) / 4) + 3; decoded_.New(plainSz); word32 i = 0; |