From 0d01d3d85db3a04df922d022320c85d5963e6f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?=
<bernhard.rosenkraenzer.ext@huawei.com>
Date: Fri, 3 Sep 2021 02:24:33 +0200
Subject: [PATCH] xtc-acts: Don't break the build if -Werror=array-bounds is
enabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is a workaround for a legitimate xtc-acts bug modern compilers complain
about when extra warnings for potential security problems are enabled.
While this is not the proper fix and this should be fixed properly at some
point (reading 16 bytes from a 12-character string is not a good idea...),
this is enough to keep the build working until someone has time to fix it
properly, and it doesn't make things worse (before, this just went
unnoticed because the warning wasn't enabled).
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
---
.../ohos-xts-acts/ohos-xts-acts_git.bb | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
index cbfd7328..40f828a1 100644
--- a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
+++ b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
@@ -20,6 +20,23 @@ inherit zmk
# jffs2 image size defaults to 1MB
ACTS_JFFS2_IMG_SIZE ?= "0x100000"
+# FIXME this should be fixed properly instead of adding this workaround.
+# When using modern compilers with -Warray-bounds, they find at least one
+# legitimate issue with the code in xts:
+# | ../git/kernel_lite/mem_posix/src/ActsMemApiTest.cpp:229:25: error: 'void* mempcpy(void*, const void*, size_t)' forming offset [13, 15] is out of the bounds [0, 13] of object 'srcStr' with type 'char [13]' [-Werror=array-bounds]
+# | 229 | pt = (char *)mempcpy(destStr, srcStr, 16);
+# | | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~
+# | ../git/kernel_lite/mem_posix/src/ActsMemApiTest.cpp:224:10: note: 'srcStr' declared here
+# | 224 | char srcStr[] = "this is str1";
+# | | ^~~~~~
+#
+# (Copying 16 characters from a string of 12)
+#
+# However, making the error non-fatal is no worse than not using
+# -Werror=array-bounds globally (previous situation), so it is an
+# ok workaround until this is fixed properly.
+TARGET_CFLAGS_remove = "-Werror=array-bounds"
+
do_install_append() {
# Prepare jffs2 image to be mounted on the target
# mkfs.jffs2 requires a directory to make an image out of
--
GitLab