From nobody Thu Feb 29 20:24:10 2024 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 4Tm2kL5xpXz5CrMD; Thu, 29 Feb 2024 20:24:10 +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 4Tm2kL2vbNz4h0L; Thu, 29 Feb 2024 20:24:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709238250; 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=90rQb7MF08ky8uAy/kwNnA1PK6trCa1F4kTPYCV0gSc=; b=coR8lAK1vyOvTXxwycOBd8C4icHtL5We+YydTRFjTwn/puVp77pEBnkHGIlBx6sjbYadIv RLeyUWrc1mfn4ZkFjGbRFmhX4luV2DH0v3RsWEfsyRNc+9x79m155Tdrx2pf+9YX6QOWpv CULCt86h7MkD6tFXxbBouZQ8c9ovxoIljlsvEAqRbUiVEIdRf4gxl63D7lm5TaaqCwTeUb VStT7/xkoz+9dpW1kRgHFj+SqoqrvhP0Qv9YdVArkysT9G7yTztDviuNErjUgYdr5Gi4bO 39zKRBJJceuLur7nmTbMkA4SVw0JkHUbVY1dZ/MUs2TW2yymi5A1mLy+4H9/dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709238250; a=rsa-sha256; cv=none; b=WtC68qwl+6vuwdYFN8c065JkAT/5HMhQ836kFPsFC+68NpnA+SPBivYddA9oMO6a20Uk50 007rGyKruLkHHg178RH7EhhTHr0+xC6VJ808T+iVHYbDeLtQLFBQM1NFTuhGtMoYvXYJoH vtblTkuEi4TVbcxBlpSO8p4A61+mDbZfn/fV2G13uxLBBJ565r19Et01u0MCio0gmFdWeo +r8KqxT5R9SuXcOYUeq8QIcemUhTwSj5ZIqB2n/41uYmIwOZ5GojG//Zar58sQuUviCtO5 JhIhzLBcOyrYI6A4nXR+S0XZXuLnNsDoKWn5c6KPUQQrLQruJN/L8LZI+gk7lQ== 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=1709238250; 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=90rQb7MF08ky8uAy/kwNnA1PK6trCa1F4kTPYCV0gSc=; b=MvBJKNY6Da+CgJo2m59dWQACRywxpxpOo77jNaSdF0hAlBbX2FlORJ3hHedH0y2TXuzibk G50R2XRg8zThMp7E1/MZJuCnnK0+qCYKWcu2/QRnde/STVz+bqK1TsbUnxT1Kwd1St3QaQ zm0+EOaCX3J277B7ckZpfU49Anumdzz5BslPKMjbtJbYSpyYkhLs5iaJ3XisbjkXKB/d7V 0ZQTlkrLBWcvyVeMOq4+l4VHiWRibjruHj/jw+JXHDp3wCtqwZSlGTIuBDQQqgg3OQKX/K i99HZd5yH7i/Ys5/5yRFnv3m1QEXBp5Zmu/C6G/aB582PHGjDbRDaYyrKLnndg== 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 4Tm2kL2Wc4zx1N; Thu, 29 Feb 2024 20:24:10 +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 41TKOA9W030800; Thu, 29 Feb 2024 20:24:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41TKOAQD030797; Thu, 29 Feb 2024 20:24:10 GMT (envelope-from git) Date: Thu, 29 Feb 2024 20:24:10 GMT Message-Id: <202402292024.41TKOAQD030797@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 0eb74bac9c1d - main - audio/zynaddsubfx: Fix buffer overflows 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: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0eb74bac9c1d8f485bc316ee51a23c6c87171322 Auto-Submitted: auto-generated The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=0eb74bac9c1d8f485bc316ee51a23c6c87171322 commit 0eb74bac9c1d8f485bc316ee51a23c6c87171322 Author: Tijl Coosemans AuthorDate: 2024-02-25 11:16:43 +0000 Commit: Tijl Coosemans CommitDate: 2024-02-29 20:21:35 +0000 audio/zynaddsubfx: Fix buffer overflows - Leave room for termination NUL in sscanf buffer. - Use float instead of float_t. On FreeBSD/i386 they are not the same. Discovered during an exp-run for bug 276478. --- audio/zynaddsubfx/Makefile | 2 +- audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp | 11 +++++++++++ audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp | 11 +++++++++++ audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp | 11 +++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile index dae9ef544d75..4a1cd9c69b58 100644 --- a/audio/zynaddsubfx/Makefile +++ b/audio/zynaddsubfx/Makefile @@ -1,6 +1,6 @@ PORTNAME= zynaddsubfx DISTVERSION= 3.0.6 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 2 CATEGORIES= audio diff --git a/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp b/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp new file mode 100644 index 000000000000..96e760e7cdd7 --- /dev/null +++ b/audio/zynaddsubfx/files/patch-rtosc_src_cpp_savefile.cpp @@ -0,0 +1,11 @@ +--- rtosc/src/cpp/savefile.cpp.orig 2021-12-31 15:58:28 UTC ++++ rtosc/src/cpp/savefile.cpp +@@ -534,7 +534,7 @@ int load_from_file(const char* file_content, + n = 0; + + sscanf(file_content, +- "%% %128s v%u.%u.%u%n ", appbuf, &vma, &vmi, &vre, &n); ++ "%% %127s v%u.%u.%u%n ", appbuf, &vma, &vmi, &vre, &n); + if(n <= 0 || strcmp(appbuf, appname) || vma > 255 || vmi > 255 || vre > 255) + return -bytes_read-1; + diff --git a/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp b/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp new file mode 100644 index 000000000000..f6b968afd117 --- /dev/null +++ b/audio/zynaddsubfx/files/patch-src_Effects_Distorsion.cpp @@ -0,0 +1,11 @@ +--- src/Effects/Distorsion.cpp.orig 2022-01-22 01:46:21 UTC ++++ src/Effects/Distorsion.cpp +@@ -75,7 +75,7 @@ rtosc::Ports Distorsion::ports = { + + for(int i=0; i<128; ++i) + buffer[i] = 2*(i/128.0)-1; +- memcpy(orig, buffer, sizeof(float_t)*128); ++ memcpy(orig, buffer, sizeof(buffer)); + + waveShapeSmps(sizeof(buffer)/sizeof(buffer[0]), buffer, + dd.Ptype + 1, dd.Pdrive, dd.Poffset, dd.Pfuncpar); diff --git a/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp b/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp new file mode 100644 index 000000000000..1b207bbcfdf8 --- /dev/null +++ b/audio/zynaddsubfx/files/patch-src_Synth_ADnote.cpp @@ -0,0 +1,11 @@ +--- src/Synth/ADnote.cpp.orig 2022-01-22 01:46:21 UTC ++++ src/Synth/ADnote.cpp +@@ -1264,7 +1264,7 @@ inline void ADnote::ComputeVoiceOscillator_SincInterpo + inline void ADnote::ComputeVoiceOscillator_SincInterpolation(int nvoice) + { + // windowed sinc kernel factor Fs*0.3, rejection 80dB +- const float_t kernel[] = { ++ const float kernel[] = { + 0.0010596256917418426f, + 0.004273442181254887f, + 0.0035466063043375785f,