Ticket #390: fix_base64.patch

libmpdemux/http.h

@@ -7 +7 @@
 #ifndef __HTTP_H
 #define __HTTP_H
 
+#define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
+
 typedef struct HTTP_field_type {
         char *field_name;
         struct HTTP_field_type *next;
@@ -48 +50 @@
 
 void            http_debug_hdr( HTTP_header_t *http_hdr );
 
-int             base64_encode(const void *enc, int encLen, char *out, int outMax);
+void            base64_encode(const void *enc, int encLen, char *out);
 #endif // __HTTP_H

libmpdemux/http.c

@@ -586 +586 @@
 int
 http_add_basic_authentication( HTTP_header_t *http_hdr, const char *username, const char *password ) {
         char *auth, *usr_pass, *b64_usr_pass;
-        int encoded_len, pass_len=0, out_len;
+        int encoded_len, source_len, pass_len=0, out_len;
         if( http_hdr==NULL || username==NULL ) return -1;
 
         if( password!=NULL ) {
@@ -600 +600 @@
         }
 
         sprintf( usr_pass, "%s:%s", username, (password==NULL)?"":password );
-
-        // Base 64 encode with at least 33% more data than the original size
-        encoded_len = strlen(usr_pass)*2;
-        b64_usr_pass = (char*)malloc(encoded_len);
+        source_len = strlen(usr_pass);
+        encoded_len = BASE64_LENGTH(source_len);
+        b64_usr_pass = (char*)malloc(encoded_len + 1);
         if( b64_usr_pass==NULL ) {
                 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
                 return -1;
         }
 
-        out_len = base64_encode( usr_pass, strlen(usr_pass), b64_usr_pass, encoded_len);
-        if( out_len<0 ) {
-                mp_msg(MSGT_NETWORK,MSGL_FATAL,"Base64 out overflow\n");
-                return -1;
-        }
+        base64_encode( usr_pass, source_len, b64_usr_pass);
 
-        b64_usr_pass[out_len]='\0';
-        
         auth = (char*)malloc(encoded_len+22);
         if( auth==NULL ) {
                 mp_msg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed\n");
@@ -657 +650 @@
         mp_msg(MSGT_NETWORK,MSGL_V,"--- HTTP DEBUG HEADER --- END ---\n");
 }
 
-int 
-base64_encode(const void *enc, int encLen, char *out, int outMax) {
-        static const char       b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
-        unsigned char           *encBuf;
-        int                     outLen;
-        unsigned int            bits;
-        unsigned int            shift;
-
-        encBuf = (unsigned char*)enc;
-        outLen = 0;
-        bits = 0;
-        shift = 0;
-
-        while( outLen<outMax ) {
-                if( encLen>0 ) {
-                        // Shift in byte
-                        bits <<= 8;
-                        bits |= *encBuf;
-                        shift += 8;
-                        // Next byte
-                        encBuf++;
-                        encLen--;
-                } else if( shift>0 ) {
-                        // Pad last bits to 6 bits - will end next loop
-                        bits <<= 6 - shift;
-                        shift = 6;
-                } else {
-                        // Terminate with Mime style '='
-                        *out = '=';
-                        outLen++;
-
-                        return outLen;
-                }
-
-                // Encode 6 bit segments
-                while( shift>=6 ) {
-                        shift -= 6;
-                        *out = b64[ (bits >> shift) & 0x3F ];
-                        out++;
-                        outLen++;
-                }
-        }
+void
+base64_encode (const void *enc, int encLen, char *out) {
 
-        // Output overflow
-        return -1;
+        /* Conversion table.  */
+        static const char tbl[64] = {
+                'A','B','C','D','E','F','G','H',
+                'I','J','K','L','M','N','O','P',
+                'Q','R','S','T','U','V','W','X',
+                'Y','Z','a','b','c','d','e','f',
+                'g','h','i','j','k','l','m','n',
+                'o','p','q','r','s','t','u','v',
+                'w','x','y','z','0','1','2','3',
+                '4','5','6','7','8','9','+','/'
+        };
+        int i;
+        unsigned char *p = (unsigned char *)out;
+        const char *s = (const char *)enc;
+
+        /* Transform the 3x8 bits to 4x6 bits, as required by base64.  */
+        for (i = 0; i < encLen; i += 3) {
+                *p++ = tbl[s[0] >> 2];
+                *p++ = tbl[((s[0] & 3) << 4) + (s[1] >> 4)];
+                *p++ = tbl[((s[1] & 0xf) << 2) + (s[2] >> 6)];
+                *p++ = tbl[s[2] & 0x3f];
+                s += 3;
+        }
+        /* Pad the result if necessary...  */
+        if (i == encLen + 1)
+                *(p - 1) = '=';
+        else if (i == encLen + 2)
+                *(p - 1) = *(p - 2) = '=';
+        /* ...and zero-terminate it.  */
+        *p = '\0';
 }
 
 static int http_streaming_start(stream_t *stream, int* file_format) {