gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

app-benchmarks/httperf: fix memcpy UB

Browse Source 
I meant to include this in 5507c2df5d.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-10-12 07:54:44 +01:00
parent bc2d5843ad
commit 474d50f3b4
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app-benchmarks/httperf/files/httperf-0.9.1_p20201206-memcpy-overlap.patch Normal file
View File

@@ -0,0 +1,36 @@
https://github.com/httperf/httperf/pull/81
From c0e7d018ec0f5d10029e07e6eababb8dc86b4603 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <teemperor@gmail.com>
Date: Wed, 20 Apr 2022 13:30:05 +0200
Subject: [PATCH] Fix UB when memcpy'ing overlapping buffers
memcpy doesn't allow overlapping src/dst so instead using memmove here to fix
that the buffer gets corrupted.
---
src/gen/wsesspage.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gen/wsesspage.c b/src/gen/wsesspage.c
index 46b697d..267188a 100755
--- a/src/gen/wsesspage.c
+++ b/src/gen/wsesspage.c
@@ -369,7 +369,7 @@ call_recv_data (Event_Type et, Object *obj, Any_Type regarg, Any_Type callarg)
}
else
{
- memcpy (cpriv->buf, cpriv->buf + 1, 3);
+ memmove (cpriv->buf, cpriv->buf + 1, 3);
cpriv->buf_len = 3;
}
}
@@ -391,7 +391,7 @@ call_recv_data (Event_Type et, Object *obj, Any_Type regarg, Any_Type callarg)
}
else
{
- memcpy (cpriv->buf, cpriv->buf + 1, 4);
+ memmove (cpriv->buf, cpriv->buf + 1, 4);
cpriv->buf_len = 4;
}
}

1
app-benchmarks/httperf/httperf-0.9.1_p20201206.ebuild → app-benchmarks/httperf/httperf-0.9.1_p20201206-r1.ebuild
View File

@@ -24,6 +24,7 @@ RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-0.9.1_p20201206-c23.patch
"${FILESDIR}"/${PN}-0.9.1_p20201206-memcpy-overlap.patch
)
src_prepare() {