From nobody Wed Feb 22 12:04:44 2023 X-Original-To: dev-commits-ports-branches@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 4PMFFm3nLSz3sw2B; Wed, 22 Feb 2023 12:04:44 +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 4PMFFm33R7z3HWk; Wed, 22 Feb 2023 12:04:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677067484; 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=q0xnXHv1lPeDWLQzJAsEtQoWQOmDdhRFCUCsZEC+eZo=; b=HOKQyCQeAQNXj+KK1PUYMOgttAx8fMLZ4SGIaPw6VMbICUqVNaLsB/iaaTb9MMkBZ6yCRE cJ8m5EM5cCKcqQD8tbgQqEmup8RXuml0TvZ8BL/959P3H9hvu7+3weXtyMmVudacq4bT3V 4IYv6vusZOwIcuPJX6UjAoePlP2exlAmzKhc7BK5EumTH6eyuoOZxFHpCeG+Df0EMxoRot ak1NHqh9K05X5pjEPzJHqZq2iR3mLOO31yEzK15gCzFo8yVeW/GqMc/Po1x67dJ9YwWVG/ Pu2PSOhEi+7j6EotnTbYAI2fiWnt3Bn4kqsonC5SFUZXZcbUqDZqGCCihcDMCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677067484; 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=q0xnXHv1lPeDWLQzJAsEtQoWQOmDdhRFCUCsZEC+eZo=; b=Waz3CHKJZq4E85N0osTGdr4bKlGXsKs9dJODOZ2UocX/EMVCx4w6hXyiRxIBLhACm+TTY1 gHIQfy/9VYccOEtZf03YyCBE58T5QXQxw2c7jIr6ZYE6oPSycYyHzbZmMHxo8XtCZSyR52 HZl7XNTCXETwFRNz4wLFTJyjzWAFrvBgO1aOvstBidzi76mMAuTPE9o3IFblrOmmLmPNO9 NJ/ILyv7KSiNcNoJilhhcBhtrn89lTjTDE+XgNM9OoRaynRd0sGdK0BpMQmaaD8WxJwHhq u1U7X+w1Qe7nosLSYUtAwcngSdwhIgxw5qwbEcjY8RSEBWb6PP42lurZHIDqlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677067484; a=rsa-sha256; cv=none; b=h67M/N8fOnkpgQp+4GxB2vmNyERF00M9+QKJ9ril8WoiUptLLwNpF0V+oQHmYYIxtT6Xm1 zjkHf8VIUNtWx9ly4DH7lDMc2lXad/9gBeabenFvTtnmOGBIHgXzl2oriaktcJ1449YFfz KDbPTFvqmZy+bR4/cjBR92dIZ//VeS4KKdXyXGS21VT9DHcGf1QFRr06f1GCKKEv0hBgb+ eUscDdqm1pXO9x+AeSCvEcWmiWS7AtTfnJT+/tZOWBpk0A7DWE3TjBGPbXHRnwK4SFd168 nKvkoEQy0GKrSbiDqiDjeq6jC40lf5HY4P8YyhR1aTn6UVUdFAcKwKeqOVDCjw== 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 4PMFFm1qvJz108x; Wed, 22 Feb 2023 12:04:44 +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 31MC4iFY013387; Wed, 22 Feb 2023 12:04:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31MC4isT013386; Wed, 22 Feb 2023 12:04:44 GMT (envelope-from git) Date: Wed, 22 Feb 2023 12:04:44 GMT Message-Id: <202302221204.31MC4isT013386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mathieu Arnold Subject: git: 0605420a9794 - 2023Q1 - sysutils/tmux: fix some NULL pointer List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mat X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 0605420a979476493a5ad3988f13014ff75adc3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=0605420a979476493a5ad3988f13014ff75adc3a commit 0605420a979476493a5ad3988f13014ff75adc3a Author: Daniel Engberg AuthorDate: 2023-02-22 11:58:25 +0000 Commit: Mathieu Arnold CommitDate: 2023-02-22 12:00:35 +0000 sysutils/tmux: fix some NULL pointer PR: 269390 (cherry picked from commit 0610124469717aef109a8b83c4d303f1facb149c) --- sysutils/tmux/Makefile | 1 + sysutils/tmux/files/patch-e86752820993a0 | 54 ++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index f8550ef4c2d2..ad6a518b40f4 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -1,5 +1,6 @@ PORTNAME= tmux PORTVERSION= 3.3a +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/sysutils/tmux/files/patch-e86752820993a0 b/sysutils/tmux/files/patch-e86752820993a0 new file mode 100644 index 000000000000..e487fb42fada --- /dev/null +++ b/sysutils/tmux/files/patch-e86752820993a0 @@ -0,0 +1,54 @@ +Index: control.c +=================================================================== +--- control.c.orig 2022-04-25 08:25:13 UTC ++++ control.c +@@ -775,6 +775,9 @@ control_start(struct client *c) + + cs->read_event = bufferevent_new(c->fd, control_read_callback, + control_write_callback, control_error_callback, c); ++ if (cs->read_event == NULL) ++ fatalx("out of memory"); ++ + bufferevent_enable(cs->read_event, EV_READ); + + if (c->flags & CLIENT_CONTROLCONTROL) +@@ -782,6 +785,8 @@ control_start(struct client *c) + else { + cs->write_event = bufferevent_new(c->out_fd, NULL, + control_write_callback, control_error_callback, c); ++ if (cs->write_event == NULL) ++ fatalx("out of memory"); + } + bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW, + 0); +--- file.c.orig 2022-04-25 08:25:13 UTC ++++ file.c +@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmu + + cf->event = bufferevent_new(cf->fd, NULL, file_write_callback, + file_write_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_WRITE); + goto reply; + +@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmux + + cf->event = bufferevent_new(cf->fd, file_read_callback, NULL, + file_read_error_callback, cf); ++ if (cf->event == NULL) ++ fatalx("out of memory"); + bufferevent_enable(cf->event, EV_READ); + return; + +--- window.c.orig 2022-04-25 08:25:14 UTC ++++ window.c +@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp) + + wp->event = bufferevent_new(wp->fd, window_pane_read_callback, + NULL, window_pane_error_callback, wp); ++ if (wp->event == NULL) ++ fatalx("out of memory"); + wp->ictx = input_init(wp, wp->event, &wp->palette); + + bufferevent_enable(wp->event, EV_READ|EV_WRITE);