From b29dfe436e7750798b92647d8c5dd7e89b77f527 Mon Sep 17 00:00:00 2001 From: vrana Date: Fri, 16 Nov 2012 18:17:18 -0800 Subject: [PATCH] Fix fatal in browse file if `lintCommit` is invalid Test Plan: Set `lintCommit` to 'x' and browsed a file. Reviewers: nh, epriestley Reviewed By: nh CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3976 --- .../controller/DiffusionBrowseFileController.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php index b01b3d02a8..274f268fbe 100644 --- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php +++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php @@ -137,8 +137,13 @@ final class DiffusionBrowseFileController extends DiffusionController { $lint_request = clone $drequest; $lint_request->setCommit($branch->getLintCommit()); - $lint_history = DiffusionHistoryQuery::newFromDiffusionRequest( - $lint_request)->setLimit(1)->loadHistory(); + try { + $lint_history = DiffusionHistoryQuery::newFromDiffusionRequest( + $lint_request)->setLimit(1)->loadHistory(); + } catch (Exception $ex) { + // This can happen if lintCommit is invalid. + $lint_history = null; + } $this->lintCommit = ''; if (!$file_history || !$lint_history ||