aboutsummaryrefslogtreecommitdiffstats
path: root/lib/base64.c
diff options
context:
space:
mode:
authorulim <a.sporto+bee@gmail.com>2008-04-14 15:10:53 +0200
committerulim <a.sporto+bee@gmail.com>2008-04-14 15:10:53 +0200
commitb79308b943149d729b1daea8c56cff9fc02711a0 (patch)
treea5f80445ed63d864703941474dc6cf8998df3136 /lib/base64.c
parent6cac643f6933e431b90fcb937dec505f989e6a53 (diff)
parentaa311173a85020bcbbbf61135a5451e171d422f5 (diff)
merged in upstream r379 (somewhere after 1.2-3).
Just one trivial conflict in the jabber Makefile, went smoothly.
Diffstat (limited to 'lib/base64.c')
-rw-r--r--lib/base64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base64.c b/lib/base64.c
index 64e9692a..ea0db6b9 100644
--- a/lib/base64.c
+++ b/lib/base64.c
@@ -117,7 +117,7 @@ int base64_decode_real(const unsigned char *in, unsigned char *out, char *b64rev
{
int i, outlen = 0;
- for( i = 0; in[i]; i += 4 )
+ for( i = 0; in[i] && in[i+1] && in[i+2] && in[i+3]; i += 4 )
{
int sx;