From bf3d32e34e793cdd68dcde7682558f9f25cc946d Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Mon, 26 Mar 2018 10:36:04 -0700 Subject: [PATCH 1/2] Remove accidental sprintf injection in error reporting Summary: STDERR output with `%`s in it could cause: ``` ERROR 2: fprintf(): Too few arguments at [/usr/local/arcanist/src/workflow/ArcanistFeatureWorkflow.php:170] ``` Test Plan: Untested. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D19261 --- src/workflow/ArcanistFeatureWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workflow/ArcanistFeatureWorkflow.php b/src/workflow/ArcanistFeatureWorkflow.php index 99a28200..a1cbe108 100644 --- a/src/workflow/ArcanistFeatureWorkflow.php +++ b/src/workflow/ArcanistFeatureWorkflow.php @@ -167,7 +167,7 @@ EOTEXT } echo $stdout; - fprintf(STDERR, $stderr); + fprintf(STDERR, '%s', $stderr); return $err; } From b8c9c385a7f525d5f8c90620b805637de2de8e11 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 26 Mar 2018 14:08:42 -0700 Subject: [PATCH 2/2] Survive extra "obsolete:" log output from the Mercurial evolve extension Summary: See PHI502; see . Test Plan: I spent all of three minutes trying to install the `evolve` extension without success and gave up, but this probably does the right thing based on the example output in the Bugzilla issue. Differential Revision: https://secure.phabricator.com/D19262 --- src/repository/parser/ArcanistMercurialParser.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/repository/parser/ArcanistMercurialParser.php b/src/repository/parser/ArcanistMercurialParser.php index 8317cc7c..4eb10e2f 100644 --- a/src/repository/parser/ArcanistMercurialParser.php +++ b/src/repository/parser/ArcanistMercurialParser.php @@ -174,6 +174,10 @@ final class ArcanistMercurialParser extends Phobject { case 'bookmark': $commit['bookmark'] = $value; break; + case 'obsolete': + // This is an extra field added by the "evolve" extension even + // if HGPLAIN=1 is set. See PHI502. + break; default: throw new Exception( pht("Unknown Mercurial log field '%s'!", $name));