? drupal-791780b.patch
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.121.2.11
diff -u -p -r1.121.2.11 file.inc
--- includes/file.inc	1 Mar 2010 09:51:16 -0000	1.121.2.11
+++ includes/file.inc	6 May 2010 17:55:05 -0000
@@ -424,6 +424,8 @@ function file_create_filename($basename,
       $name = $basename;
     }
 
+    $name = preg_replace('/[&\+\s', '-', $name);
+
     $counter = 0;
     do {
       $dest = $directory .'/'. $name .'_'. $counter++ . $ext;