Commit 64874cf7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix base64 encoding and add regression test

parent ac52d273
...@@ -217,7 +217,7 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url ) ...@@ -217,7 +217,7 @@ static inline int vlc_UrlIsNotEncoded( const char *psz_url )
***************************************************************************** *****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static inline char *vlc_b64_encode( char *src ) static inline char *vlc_b64_encode( const char *src )
{ {
static const char b64[] = static const char b64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
...@@ -232,38 +232,29 @@ static inline char *vlc_b64_encode( char *src ) ...@@ -232,38 +232,29 @@ static inline char *vlc_b64_encode( char *src )
while( len > 0 ) while( len > 0 )
{ {
/* pops (up to) 3 bytes of input */ /* pops (up to) 3 bytes of input, push 4 bytes */
uint32_t v = *src++ << 24; uint32_t v = *src++ << 24; // 1/3
*dst++ = b64[v >> 26]; // 1/4
v = v << 6;
if( len >= 2 ) if( len >= 2 )
{ v |= *src++ << 16; // 2/3
v |= *src++ << 16; *dst++ = b64[v >> 26]; // 2/4
if( len >= 3 ) v = v << 6;
v |= *src++ << 8;
}
/* pushes (up to) 4 bytes of output */ if( len >= 3 )
while( v ) v |= *src++ << 8; // 3/3
{ *dst++ = ( len >= 2 ) ? b64[v >> 26] : '='; // 3/4
*dst++ = b64[v >> 26]; v = v << 6;
v = v << 6;
}
switch( len ) *dst++ = ( len >= 3 ) ? b64[v >> 26] : '='; // 4/4
len--;
if( len > 0 )
{ {
case 1: len--;
*dst++ = '='; if( len > 0 )
*dst++ = '=';
len--; len--;
break;
case 2:
*dst++ = '=';
len -= 2;
break;
default:
len -= 3;
} }
} }
......
...@@ -25,21 +25,36 @@ ...@@ -25,21 +25,36 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
void test_decode (const char *in, const char *out) typedef char * (*conv_t) (const char *);
static void test (conv_t f, const char *in, const char *out)
{ {
char *res; char *res;
printf ("\"%s\" -> \"%s\" ?\n", in, out); printf ("\"%s\" -> \"%s\" ?\n", in, out);
res = decode_URI_duplicate (in); res = f (in);
if (res == NULL) if (res == NULL)
exit (1); exit (1);
if (strcmp (res, out)) if (strcmp (res, out))
{
printf (" ERROR: got \"%s\"\n", res);
exit (2); exit (2);
}
free (res); free (res);
} }
static inline void test_decode (const char *in, const char *out)
{
test (decode_URI_duplicate, in, out);
}
static inline void test_b64 (const char *in, const char *out)
{
test (vlc_b64_encode, in, out);
}
int main (void) int main (void)
{ {
(void)setvbuf (stdout, NULL, _IONBF, 0); (void)setvbuf (stdout, NULL, _IONBF, 0);
...@@ -64,5 +79,12 @@ int main (void) ...@@ -64,5 +79,12 @@ int main (void)
test_decode ("T%E9l%E9vision", "T?l?vision"); test_decode ("T%E9l%E9vision", "T?l?vision");
test_decode ("%C1%94%C3%a9l%c3%A9vision", "??élévision"); /* overlong */ test_decode ("%C1%94%C3%a9l%c3%A9vision", "??élévision"); /* overlong */
/* Base 64 tests */
test_b64 ("", "");
test_b64 ("d", "ZA==");
test_b64 ("ab", "YQG=");
test_b64 ("abc", "YQGI");
test_b64 ("abcd", "YQGIZA==");
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment