From nobody Mon Jan 09 22:36:28 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NrTM046DQz2r1J0; Mon, 9 Jan 2023 22:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NrTM03RxHz3G0J; Mon, 9 Jan 2023 22:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673303788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qheVy5fkPOYjllXCx6OiaDKQ0B/vA76UeO31OTeSsqc=; b=JLqKT79BfAT49LUrpQm/4PVGzf5iKslvsIA3paCxGlAQ2P6RMYTTH4mjC9TG5sShOwy4+u /tTSIUxF3CpmJDo0g0nT4wDXl5Vyl5nqlmyZpXrOHLO3RMsGMCygL6STHIGySOkkSrI2qU k/8ZziYHUlSC8RIeXviu1wvh8BxNcIW79u4vMX4oQCRwGZWPUbyo7Jj/nRqvY2gcyhV8NO DB7nV806m+1w443IqiHK3nXvpYJFw8C3H26e85YB7DkFGF37LkuY8JGLfKxVxj+up4ERVF xSMAR1oeg/CW/iqS1shwRzvs4gnq0vDTTcZqHvGjzmUThXJ4iyEzu2Fz+eMJ5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673303788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qheVy5fkPOYjllXCx6OiaDKQ0B/vA76UeO31OTeSsqc=; b=Dh/dVZZJ7lZVUq94Ldv4Z2vv2YbLE5Nc78Am5l+vNk5ExP55Qv4NsyUqHsvH8H0MxmhVAZ uJBIS5h0DRxefa8RbZvkO7mRNNFmmhAOE0WFBGzy/Lsc25pZxXD0skU7pTGusTtYPwrl6M XqiZzfEhWr8sAQsx1qom7F4Cfgbih1/s6uzyno5Prp9hdlxKdCoZz2DPNifixthpyM4WlY m3vhXRFxusjRExOTkUDzoT3UwIvMrkM1MkS1ZtTRhllU2XKR731eeKSQoL8rVazAul7fzD 0w9oW6gQATR5i9P0k3KC/b7kTnl1D28y9dGIDR8auN7HsuBPx7Ki2+zUxkI1lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673303788; a=rsa-sha256; cv=none; b=tUFwr4t3yn4d30aR3SHyzYkLFqxsFttWJVn7D6uVoF5a5wrbjUADkqNgONZ0oHy7yudKvo 88By6ClXJLTnAfxcHNQAbhoaL9Xhaj4wndvcNWm6shocAW7bLp04i/K7V+Kf4I+ODh5FPx NtHNE2vtclH7JXV5/XpunaVNMryc0EghzvQSixtkM3nFQOOvdZgEMAUqCPBEsmM0fSug3N LDr4YZurLq5pG4jhXc84zckh6/iijNU1VLLEQxvw/cRkhYj8q8vOCZPIDSMukst6msR2Rw MCet/QBkExzj0tcI6bp1qxJWI6AulLsWXOyDdF5+m0/26tQnEI89nbjUP5jftg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NrTM02K4Xzlc9; Mon, 9 Jan 2023 22:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 309MaSqP084014; Mon, 9 Jan 2023 22:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 309MaSdq084013; Mon, 9 Jan 2023 22:36:28 GMT (envelope-from git) Date: Mon, 9 Jan 2023 22:36:28 GMT Message-Id: <202301092236.309MaSdq084013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 3b7150730727 - main - devel/arcanist-lib: Handle NULL argument passed to strlen() List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b715073072794942506d27d72b2b23551c4fd30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=3b715073072794942506d27d72b2b23551c4fd30 commit 3b715073072794942506d27d72b2b23551c4fd30 Author: Joseph Mingrone AuthorDate: 2023-01-09 21:27:58 +0000 Commit: Joseph Mingrone CommitDate: 2023-01-09 22:35:17 +0000 devel/arcanist-lib: Handle NULL argument passed to strlen() Problem description: - ArcanistDiffWorkflow.php:getDiffOntoTargets() tries to determine the current branch name by calling ArcanistGitAPI.php:getBranchName() - getBranchName() returns NULL when working on a detached HEAD - getDiffOntoTargets() calls strlen() with the branch name, which now fails with a NULL argument. Approved by: grembo (maintainer) Sponsored by: The FreeBSD Foundation --- devel/arcanist-lib/Makefile | 2 +- .../files/patch-src_workflow_ArcanistDiffWorkflow.php | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile index 8fbe5718f993..88851111a747 100644 --- a/devel/arcanist-lib/Makefile +++ b/devel/arcanist-lib/Makefile @@ -1,6 +1,6 @@ PORTNAME?= arcanist PORTVERSION?= 20220518 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= devel PKGNAMESUFFIX= ${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX} diff --git a/devel/arcanist-lib/files/patch-src_workflow_ArcanistDiffWorkflow.php b/devel/arcanist-lib/files/patch-src_workflow_ArcanistDiffWorkflow.php new file mode 100644 index 000000000000..f132ed21d524 --- /dev/null +++ b/devel/arcanist-lib/files/patch-src_workflow_ArcanistDiffWorkflow.php @@ -0,0 +1,11 @@ +--- src/workflow/ArcanistDiffWorkflow.php.orig 2023-01-09 21:24:25 UTC ++++ src/workflow/ArcanistDiffWorkflow.php +@@ -2361,7 +2361,7 @@ EOTEXT + + // If we track an upstream branch either directly or indirectly, use that. + $branch = $api->getBranchName(); +- if (strlen($branch)) { ++ if (strlen($branch ?? '')) { + $upstream_path = $api->getPathToUpstream($branch); + $remote_branch = $upstream_path->getRemoteBranchName(); + if ($remote_branch !== null) {