Fix double-decoding in XMLRPC putAttachment

dokuwiki · Oct 30, 2011 · 80d6fbc · splitbrain · Mar 23, 2012 · 80d6fbc
1 parent 3629bc8
commit 80d6fbc
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/exe/xmlrpc.php b/lib/exe/xmlrpc.php
@@ -7,7 +7,7 @@
 /**
  * Increased whenever the API is changed
  */
-define('DOKU_XMLRPC_API_VERSION',5);
+define('DOKU_XMLRPC_API_VERSION', 6);
 
 require_once(DOKU_INC.'inc/init.php');
 session_write_close();  //close session
@@ -584,8 +584,12 @@ function putAttachment($id, $file, $params) {
 
         // save temporary file
         @unlink($ftmp);
-        $buff = base64_decode($file);
-        io_saveFile($ftmp, $buff);
+        if (preg_match('/^[A-Za-z0-9\+\/]*={0,2}$/', $file) === 1) {
+            // DEPRECATED: Double-decode file if it still looks like base64
+            // after first decoding (which is done by the library)
+            $file = base64_decode($file);
+        }
+        io_saveFile($ftmp, $file);
 
         $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename');
         if (is_array($res)) {