.gitlab-ci.yml | 1 +
src/fcxml.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1c0e7885a6be258bb90ceaf1a64990e7cfa97e29
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Oct 30 19:04:40 2020 +0900
Evaluate mingw64_env to setup properly on CI
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bac8f33..ef49b10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,6 +124,7 @@ meson-mingw-w64-build:
- export BUILD_ID="fontconfig-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID"
- export PREFIX="$(pwd)/prefix-$BUILD_ID"
- export BUILDDIR="$(pwd)/build-$BUILD_ID"
+ - eval `rpm --eval %{mingw64_env}`
- meson --prefix="$PREFIX" "$BUILDDIR" --cross-file .gitlab-ci/linux-mingw-w64-64bit.txt
- ninja -C "$BUILDDIR"
- ninja -C "$BUILDDIR" test
commit 8815641571574b72e8c5fbd906938467888da090
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Oct 30 17:39:37 2020 +0900
Use memcpy instead of strcpy
To work around a warning with GCC10 on Win32
warning: '__builtin___strncpy_chk' specified bound depends on the length of the source argument [-Wstringop-overflow=]
diff --git a/src/fcxml.c b/src/fcxml.c
index 3b44368..3f22581 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -3613,7 +3613,7 @@ _FcConfigParse (FcConfig *config,
#elif HAVE_STRERROR
char *tmp = strerror (errno_);
size_t len = strlen (tmp);
- strncpy (ebuf, tmp, FC_MIN (BUFSIZ, len));
+ memcpy (ebuf, tmp, FC_MIN (BUFSIZ, len));
ebuf[FC_MIN (BUFSIZ, len)] = 0;
#else
ebuf[0] = 0;
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/fontconfig
