From 345788a97293e650d129e0c0385aafd0f32d5f37 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Mon, 14 Apr 2014 12:32:31 -0500
Subject: [PATCH] file: Don't crash when sending data to file backends
---
include/class.file.php | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/include/class.file.php b/include/class.file.php
index e5a3db128..84689f020 100644
--- a/include/class.file.php
+++ b/include/class.file.php
@@ -363,13 +363,18 @@ class AttachmentFile {
// otherwise.
$succeeded = false;
foreach ($bks as $bk) {
- if (isset($file['tmp_name'])) {
- if ($bk->upload($file['tmp_name'])) {
+ try {
+ if (isset($file['tmp_name'])) {
+ if ($bk->upload($file['tmp_name'])) {
+ $succeeded = true; break;
+ }
+ }
+ elseif ($bk->write($file['data']) && $bk->flush()) {
$succeeded = true; break;
}
}
- elseif ($bk->write($file['data']) && $bk->flush()) {
- $succeeded = true; break;
+ catch (Exception $e) {
+ // Try next backend
}
// Fallthrough to default backend if different?
}
@@ -418,11 +423,17 @@ class AttachmentFile {
// TODO: Make this resumable so that if the file cannot be migrated
// in the max_execution_time, the migration can be continued
// the next time the cron runs
- while ($block = $source->read($target->getBlockSize())) {
- hash_update($before, $block);
- $target->write($block);
+ try {
+ while ($block = $source->read($target->getBlockSize())) {
+ hash_update($before, $block);
+ $target->write($block);
+ }
+ $target->flush();
+ }
+ catch (Exception $e) {
+ // Migration failed
+ return false;
}
- $target->flush();
// Ask the backend to generate its own hash if at all possible
if (!($target_hash = $target->getHashDigest($common_algo))) {
--
GitLab