Clean up remote avatar temporary files if we fail before saving them into avatars...

[quix0rs-gnu-social.git] / lib / oauthstore.php

diff --git a/lib/oauthstore.php b/lib/oauthstore.php
index 537667678bbf155d27ecb51e6639d9fc85cf741a..1c8e7250092bdb56e644e10fd6f4184eeb3a8f63 100644 (file)
--- a/lib/oauthstore.php
+++ b/lib/oauthstore.php
@@ -328,13 +328,18 @@ class StatusNetOAuthDataStore extends OAuthDataStore
     function add_avatar($profile, $url)
     {
         $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar');
-        copy($url, $temp_filename);
-        $imagefile = new ImageFile($profile->id, $temp_filename);
-        $filename = Avatar::filename($profile->id,
-                                     image_type_to_extension($imagefile->type),
-                                     null,
-                                     common_timestamp());
-        rename($temp_filename, Avatar::path($filename));
+        try {
+            copy($url, $temp_filename);
+            $imagefile = new ImageFile($profile->id, $temp_filename);
+            $filename = Avatar::filename($profile->id,
+                                         image_type_to_extension($imagefile->type),
+                                         null,
+                                         common_timestamp());
+            rename($temp_filename, Avatar::path($filename));
+        } catch (Exception $e) {
+            unlink($temp_filename);
+            throw $e;
+        }
         return $profile->setOriginal($filename);
     }