From nobody Thu Mar 10 12:16:06 2022 X-Original-To: dev-commits-ports-main@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 320821A0589B; Thu, 10 Mar 2022 12:16:08 +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 4KDp1z11KSz51gy; Thu, 10 Mar 2022 12:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646914567; 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=grzv9NVtivfAGdWvn96S25AGshG3zwqlr+0AvN1BWu0=; b=gzr7WTFUECdjSm8yId31Q2VgbDE7HZJrU89UwMyKW2oBzT7eB2LEtAOqAf1x18wGLYkTk0 s7wrzyOhjgJ/59ty8zVofxVyEau5mmvxK52GSs7PWJPSwUVTpiFfIRPDiZdKQZfJzhPRHw H83mjD1ibW5fRGJ9qR+o0bfzrbbiAfStsG/cT7uFeNdFjGuuSl21siGFbouzdA4AMdFozy /tIuLEazAhviGn2qb5KrGIG7mAB92kDcQSi55qAz969yVhPgwn9SIs2obQY34lYDWLX/r4 mLJ6kgQAwEbnF2LSfyWCFtdxgUbhLgOGKNSg5AH/aeAhKDr0ObYYDU7KcJIlVQ== 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 9FD9B24E04; Thu, 10 Mar 2022 12:16:06 +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 22ACG6gI099031; Thu, 10 Mar 2022 12:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22ACG6cC099030; Thu, 10 Mar 2022 12:16:06 GMT (envelope-from git) Date: Thu, 10 Mar 2022 12:16:06 GMT Message-Id: <202203101216.22ACG6cC099030@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: c862f8710d55 - main - games/teeworlds: apply patch for CVE-2021-43518 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c862f8710d55eeda971db339a5ab422a16084b94 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646914567; 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=grzv9NVtivfAGdWvn96S25AGshG3zwqlr+0AvN1BWu0=; b=EszBK4iAZG93n8S7y1NLCL+CKrrRLS+nv/leQMOjJQ+fOYNm+goSmWv/AQvxsyLMGnUiS/ FdCgqsoiyA0xykgtjfWgc+kmXv1p4OQjJTk5Xam/SduJAJg9yNw4Cma3G06IHunV/kKVhL PTq+U+/ZY8caesgCI/J+fLBf40lPIqCL08KM4ud+h35PGM3/hqwyC2aKsA4sLbd53VaJtZ kbs5mdNloStoRZzvACH3ZtzDOYCS/DP3fk3Kaxp6LhJvzjCpyF3IyyGvjf8Q+ssbXNsEPh 7NpUqXupaRj7iv+j/Jn6lSsJX8j149qTF5hnOulBZsWRyc4x1S6KYEId+NkxtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646914567; a=rsa-sha256; cv=none; b=EUjZbce06qlcCagrZlzi75ku4bJQdWKn5zjDJKjMX/dsAf40aotk0pwotApH/UWZ6kp/T6 9YGWYtfLbmqvcbNT4Rbrv2+druq+XYxDpy+N0dHOeG3PQoURa6/6ORoXgq01ySHGG3D3z/ 9/vhAjZKs67ZsIPoJBcW4uSua2SCkKH7/hC8sK6tImMWE6B+Gm2w8E4Ky16ddkqjLjPk+/ dnf9xXuuCxjflsD90CAvoPozRP6btRJD9MXXtkEJ+/Xd/B0LTgSngwjhlqkFXDmZvjOecf vZhWJIhLnvPgUDx3jOUfH2uJ5Cm9WL0TaPD93iFZ23IlpoqcwboCD0uwuLfgXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=c862f8710d55eeda971db339a5ab422a16084b94 commit c862f8710d55eeda971db339a5ab422a16084b94 Author: Dmitry Marakasov AuthorDate: 2022-03-10 12:14:32 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-10 12:14:32 +0000 games/teeworlds: apply patch for CVE-2021-43518 Security: CVE-2021-43518 Security: 5aaf534c-a069-11ec-acdc-14dae9d5a9d2 --- games/teeworlds/Makefile | 2 +- games/teeworlds/files/patch-CVE-2021-43518 | 42 ++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/games/teeworlds/Makefile b/games/teeworlds/Makefile index 334ce2ee286e..822217270989 100644 --- a/games/teeworlds/Makefile +++ b/games/teeworlds/Makefile @@ -1,6 +1,6 @@ PORTNAME= teeworlds PORTVERSION= 0.7.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org diff --git a/games/teeworlds/files/patch-CVE-2021-43518 b/games/teeworlds/files/patch-CVE-2021-43518 new file mode 100644 index 000000000000..b7cd56cd9e69 --- /dev/null +++ b/games/teeworlds/files/patch-CVE-2021-43518 @@ -0,0 +1,42 @@ +commit 91e5492d4c210f82f1ca6b43a73417fef5463368 +Author: Robert Müller +Date: Sat Jan 15 17:36:39 2022 +0100 + + hotfix CVE-2021-43518 + +diff --git src/game/client/components/maplayers.cpp src/game/client/components/maplayers.cpp +index 24d09509..bbaaa821 100644 +--- src/game/client/components/maplayers.cpp ++++ src/game/client/components/maplayers.cpp +@@ -175,7 +175,7 @@ void CMapLayers::LoadEnvPoints(const CLayers *pLayers, array& lEnvPoi + p.m_Time = pEnvPoint_v1->m_Time; + p.m_Curvetype = pEnvPoint_v1->m_Curvetype; + +- for(int c = 0; c < pItem->m_Channels; c++) ++ for(int c = 0; c < minimum(pItem->m_Channels, 4); c++) + { + p.m_aValues[c] = pEnvPoint_v1->m_aValues[c]; + p.m_aInTangentdx[c] = 0; +diff --git src/game/editor/io.cpp src/game/editor/io.cpp +index 160bb1c6..2bedb06e 100644 +--- src/game/editor/io.cpp ++++ src/game/editor/io.cpp +@@ -479,7 +479,8 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag + for(int e = 0; e < Num; e++) + { + CMapItemEnvelope *pItem = (CMapItemEnvelope *)DataFile.GetItem(Start+e, 0, 0); +- CEnvelope *pEnv = new CEnvelope(pItem->m_Channels); ++ const int Channels = minimum(pItem->m_Channels, 4); ++ CEnvelope *pEnv = new CEnvelope(Channels); + pEnv->m_lPoints.set_size(pItem->m_NumPoints); + for(int n = 0; n < pItem->m_NumPoints; n++) + { +@@ -496,7 +497,7 @@ int CEditorMap::Load(class IStorage *pStorage, const char *pFileName, int Storag + pEnv->m_lPoints[n].m_Time = pEnvPoint_v1->m_Time; + pEnv->m_lPoints[n].m_Curvetype = pEnvPoint_v1->m_Curvetype; + +- for(int c = 0; c < pItem->m_Channels; c++) ++ for(int c = 0; c < Channels; c++) + { + pEnv->m_lPoints[n].m_aValues[c] = pEnvPoint_v1->m_aValues[c]; + }