Changeset 5899

Timestamp:

May 22, 2008, 3:42:26 AM (15 years ago)

Author:

charles

Message:

tr_base64_decode() now decodes both data with, and without, newlines. thanks to dm1024 for helping track this down.

File:

• trunk/libtransmission/utils.c (modified) (1 diff)

trunk/libtransmission/utils.c

@@ -1079 +1079 @@
     bmem = BIO_push( b64, bmem );
     retlen = BIO_read( bmem, ret, length );
+    if( !retlen )
+    {
+        /* try again, but with the BIO_FLAGS_BASE64_NO_NL flag */
+        BIO_free_all( bmem );
+        b64 = BIO_new( BIO_f_base64( ) );
+        BIO_set_flags( b64, BIO_FLAGS_BASE64_NO_NL );
+        bmem = BIO_new_mem_buf( (unsigned char*)input, length );
+        bmem = BIO_push( b64, bmem );
+        retlen = BIO_read( bmem, ret, length );
+    }
+
     if( setme_len )
         *setme_len = retlen;