From nobody Mon Oct 09 07:43:47 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 4S3rd14HJKz4wtZS; Mon, 9 Oct 2023 07:43:49 +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 4S3rd12SrQz3KXR; Mon, 9 Oct 2023 07:43:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696837429; 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=hXnEvK+wvUzlUp6oWfGlL+UE6xiVqBd8wxDQn3x8Oio=; b=usbDoFUP3ziKF9nGIyyaQXIuqRo38mnsqD9QFQ3+wlGiEvqF3SqErSdQifJn3cgIa95Icy 2jullHRJt2RgL8rR4AC+r/g+jCH4Pfv05YS4XYHyfXZUt71M7zNt2XB1SJ6JF1yqe3xQSb 8AhcAnTuAyils5RDMOMi3CpMfqyI9W9EMZpYtWPoqTn9UIS9kA9UGNMqNk17sqmFxaMNbt YY+u/EUKI40fmGzKInGgzEzTAC+/8PwkQtB3qv8TojKesMdOgtm+XEuOp8XNF7gIDUiTkF pztReUhteEY2hiWIepz/cNlyJru1WyVN/fm8P8awljbtrSZG2qog3coIFkFLfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696837429; a=rsa-sha256; cv=none; b=eCqiRgLSUREazbjcSQH9XkVhPi5h7pXnOhfj7FJ69lOBTIb18Qxmq9LDiEtYyQ6yWcOH/l Qg8jdjKjrv6x0DXbUxjHuYHjQLhi6qb1jv1erMAzu4JuTE2Khx62N3P501LZtQcPx0XjTJ y7P6AwdmVNiQyld83vEVxW9Nrf2moMxMjfpGtCciQy5Beod9wm2u+uhKuXun/uLKczjDgk OITMGGewHSlTEtvxqYEaNBuhyhgMNM91mJlq+Bwcl7C4GPwKvWENolFu6WmOleMiEAZ7jJ i4nScu5vhHBW5OkuLcuKiLyzlQClmdD5Us3I544Sgv6R1Dzexzyy8VIY5CMIGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696837429; 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=hXnEvK+wvUzlUp6oWfGlL+UE6xiVqBd8wxDQn3x8Oio=; b=eXqfPkhDUBJPJmt0RBGMRO2maYXwzz4amZJ2NhLMHMUZ1XXLpCaxfLjXAxgocQF63KGiWQ BUlcwcwDQx4WMyKr4KLv7iPj3ifV4Am/ia0+U6LVMgvjrrpkHXN3CIcV7pYoxoICXHL6MU V+GhJujJV+CvEAnGE9Ty1vLVbZNUwpjrPSJDFZxFl6QoTZ1Zhnnk0eP9yA5U0DRC5yf7zk q9EAqafVaNSHpzxW184ebux/1DYJ1UhGmbvustsg8SlkQ/+czGU09tKCZyMsN+W3qEdzkU 8qV+l2WyNU4lID56Vqz4lf1fMet/J4uv9s4VyFPnlNzOQDzuC4B/zw1jO1m4uw== 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 4S3rcz5trJznHw; Mon, 9 Oct 2023 07:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3997hlOs023882; Mon, 9 Oct 2023 07:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3997hlBp023879; Mon, 9 Oct 2023 07:43:47 GMT (envelope-from git) Date: Mon, 9 Oct 2023 07:43:47 GMT Message-Id: <202310090743.3997hlBp023879@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 68016c256e8d - 2023Q4 - net/pload: fix crash at startup 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: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 68016c256e8dcea59e8948722541047e89689de3 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=68016c256e8dcea59e8948722541047e89689de3 commit 68016c256e8dcea59e8948722541047e89689de3 Author: J.R. Oldroyd AuthorDate: 2023-10-08 17:59:09 +0000 Commit: Robert Clausecker CommitDate: 2023-10-09 07:43:12 +0000 net/pload: fix crash at startup Looks like there was no NULL pointer at the end of the orig_argv[] when it was copied or restored. PR: 274354 Reported by: Rupert Stitzinger MFH: 2023Q4 (cherry picked from commit ffaf1c4515dd11fc28fd00c97ae5c8ff78aca4e1) --- net/pload/Makefile | 4 ++-- net/pload/files/patch-pload.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/pload/Makefile b/net/pload/Makefile index 6aab9b94341c..a66efd39f478 100644 --- a/net/pload/Makefile +++ b/net/pload/Makefile @@ -1,6 +1,6 @@ PORTNAME= pload -PORTVERSION= 0.9.5 -PORTREVISION= 5 +DISTVERSION= 0.9.5 +PORTREVISION= 6 CATEGORIES= net sysutils MASTER_SITES= http://opal.com/src/pload/ LOCAL/pav diff --git a/net/pload/files/patch-pload.c b/net/pload/files/patch-pload.c index 9c6c17263337..6a03d7295163 100644 --- a/net/pload/files/patch-pload.c +++ b/net/pload/files/patch-pload.c @@ -1,6 +1,6 @@ --- pload.c.orig 2000-02-01 07:11:24 UTC +++ pload.c -@@ -285,6 +285,13 @@ static XtResource pload_resources[] = { +@@ -285,6 +285,14 @@ static XtResource pload_resources[] = { /************* Main () ******************/ int main (int argc, char *argv[]) { @@ -10,11 +10,12 @@ + /* save original argv pointers */ + for(i = 0; argv[i]; i++) + orig_argv[i] = argv[i]; ++ orig_argv[i] = NULL; /* add trailing NULL pointer */ + Progname = argv[0]; toplevel = XtAppInitialize ( -@@ -301,6 +308,11 @@ int main (int argc, char *argv[]) +@@ -301,6 +309,12 @@ int main (int argc, char *argv[]) and exit */ if (argc != 1) Usage(); @@ -22,11 +23,12 @@ + argv so that ps(1) shows the command line */ + for(i = 0; orig_argv[i]; i++) + argv[i] = orig_argv[i]; ++ argv[i] = orig_argv[i]; /* copy trailing NULL pointer */ + XtGetApplicationResources( toplevel, /* widget */ (XtPointer) &resources, /* where to put */ -@@ -596,27 +608,26 @@ void CheckForWMExit( Widget w, +@@ -596,27 +610,26 @@ void CheckForWMExit( Widget w, void do_total(char *b, double total) { if (total < 1024.0) @@ -62,7 +64,7 @@ return; } -@@ -643,6 +654,9 @@ void make_label(char *fmt, unsigned long total, double +@@ -643,6 +656,9 @@ void make_label(char *fmt, unsigned long total, double break; case 'M': do_rate(buff, max);