From nobody Mon May 23 19:40:45 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 E97681B45728; Mon, 23 May 2022 19:40:45 +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 4L6SNs6DrQz3vNG; Mon, 23 May 2022 19:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653334845; 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=jtcgywMGJTHgqs2VHXmb2bm3IndAIx+JOOjW7kDd3J0=; b=DAQ4ZnWL5YLZ6QAxJzYN7EarZIQ2MCsb6veevKhqBebEnmRHF+TVU24Bcre39kWIp2XF6y HVTnXYfD7dM6lD0y8msEbWtK7QxehXnDu3nqcXuPbJbwfk8a0i0hA39Gh4mdbP1Lrjd+in z3hT3PPSCwgCW7A9jG/2ncdqNsny0uh/e69/yAXOQXB/GYbi061DrlwCpkW9SSL5KJTiQG 8QEcwBvhUmziAON4vtDvfJPXVbNJjj8pPQ7rOK+o2SX2GX3BuqtRg3pLf41wq/HodsRM48 Ay+9XAQsxoTfKp/+qsU6IuPAS5pjgcFIg7jxzJLm18xsC4btkc3ZFhs19rGbIQ== 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 B620E15DB8; Mon, 23 May 2022 19:40:45 +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 24NJejdU092742; Mon, 23 May 2022 19:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NJej3V092741; Mon, 23 May 2022 19:40:45 GMT (envelope-from git) Date: Mon, 23 May 2022 19:40:45 GMT Message-Id: <202205231940.24NJej3V092741@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 2d88b73b83e0 - main - devel/boost-libs: add critical upstream patch (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d88b73b83e0d1220373939528c3316b2ceb88fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653334845; 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=jtcgywMGJTHgqs2VHXmb2bm3IndAIx+JOOjW7kDd3J0=; b=UHXcQw3GybclBMYTKHFZeI/OOBiVK8MXtFmW6JP+M3yd2nEKOSpvfo+2SzpMNJ8N/lX0n6 tuDGbfBylVcZJlX6dfUGdpJwuLMd/1T69P+jAtvM7KAKvwqHukCPC1EHkukErTt0sGWGqF r/mDd9AAPF1kmBKBb+M2zcA2srNuLPsFcWcATEHgHWg75FosP15lOCdcXuFDX6FH2gbaW7 7X7ftox/sBXCfdCoCBa2LpQfMM4m5Ll0+Xz07Rx9gl/heezw5h8L2EB5lRB9f1p7YyZRsD TrwrsxYrbtzQeQS9Qxy1N3Gu5CGxFy2ezvhLPQitN5K+9d2TltLjOWSKT/Df1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653334845; a=rsa-sha256; cv=none; b=r9vsJpP6j93d6iaFi8L8PddlJUfgYYn1uUmTlelnkybaWhiUBUN11Hx+ehju+0dtZBVOrA 7D5K9cT5zoqYkjzx9RFX6vGuRgTN2oi5kVnKZKJ+PrcQglnv5uRmmj4GVCmovx2FHEmc6N YqvOSvr5Q97r/rxc/0lPoSg4G++Zi77pmhCY1gQv+yzCcglO4VYiJXlPCmMlBsiQcqg0Wt wLosAd47NeA6J99aonUND6pVtBkAD9Vy9cCx8vvdO2oILXTGV5UBC3S0Ov+Gpzm+LpzztL iet85vUT621u+ibKOzKeiJdLO6dz/HE02Vj1tttdLSAvMLdQXsRij5ufsB2oWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d88b73b83e0d1220373939528c3316b2ceb88fb commit 2d88b73b83e0d1220373939528c3316b2ceb88fb Author: Dima Panov AuthorDate: 2022-05-23 19:38:17 +0000 Commit: Dima Panov CommitDate: 2022-05-23 19:40:36 +0000 devel/boost-libs: add critical upstream patch (+) Boost.JSON array::erase can segfault, see https://github.com/boostorg/json/issues/692 --- devel/boost-libs/Makefile | 1 + .../files/patch-0001-json-array-erase-relocate | 49 ++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile index 3613bd48c87f..7fb071997e2f 100644 --- a/devel/boost-libs/Makefile +++ b/devel/boost-libs/Makefile @@ -1,6 +1,7 @@ # Created by: Alexander Churanov PORTNAME= boost-libs +PORTREVISION= 1 COMMENT= Free portable C++ libraries (without Boost.Python) diff --git a/devel/boost-libs/files/patch-0001-json-array-erase-relocate b/devel/boost-libs/files/patch-0001-json-array-erase-relocate new file mode 100644 index 000000000000..d322b64f4477 --- /dev/null +++ b/devel/boost-libs/files/patch-0001-json-array-erase-relocate @@ -0,0 +1,49 @@ +diff -ur boost/json/impl/array.ipp boost/json/impl/array.ipp +--- boost/json/impl/array.ipp 2022-04-06 17:02:43.000000000 -0400 ++++ boost/json/impl/array.ipp 2022-04-13 20:55:20.464359478 -0400 +@@ -491,8 +491,11 @@ + auto const p = &(*t_)[0] + + (pos - &(*t_)[0]); + destroy(p, p + 1); +- relocate(p, p + 1, 1); + --t_->size; ++ if(t_->size > 0) ++ relocate(p, p + 1, ++ t_->size - (p - ++ &(*t_)[0])); + return p; + } + +diff -ur libs/json/test/array.cpp libs/json/test/array.cpp +--- libs/json/test/array.cpp 2022-04-06 17:02:43.000000000 -0400 ++++ libs/json/test/array.cpp 2022-04-13 20:53:32.671782680 -0400 +@@ -1270,6 +1270,21 @@ + } + + void ++ testIssue692() ++ { ++ array a; ++ object obj; ++ obj["test1"] = "hello"; ++ a.push_back(obj); ++ a.push_back(obj); ++ a.push_back(obj); ++ a.push_back(obj); ++ a.push_back(obj); ++ while(a.size()) ++ a.erase(a.begin()); ++ } ++ ++ void + run() + { + testDestroy(); +@@ -1283,6 +1298,7 @@ + testExceptions(); + testEquality(); + testHash(); ++ testIssue692(); + } + }; +