I seem to have attached the wrong file. Let me try again.

On Fri, Jan 3, 2020 at 10:13 AM Nikos Mavrogiannopoulos <[email protected]> wrote:
>
> Hi,
>  This patch updates the CI to the latest fedora image. It also includes
> some minor changes to tools, to pass the new clang analyser. I will
> remove the f29 image once this is applied. A test run passes:
> https://gitlab.com/nmav/nettle/pipelines/106785682
>
> regards,
> Nikos
>
From 859d819ddbdbb7cef176ec2c1ed40049b942a55a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri, 3 Jan 2020 09:57:38 +0100
Subject: [PATCH 2/2] sexp-conv: ensure non-null input to strcmp() and strtol()

Signed-off-by: Nikos Mavrogiannopoulos <[email protected]>
---
 tools/sexp-conv.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/sexp-conv.c b/tools/sexp-conv.c
index 557b8bd7..e7357052 100644
--- a/tools/sexp-conv.c
+++ b/tools/sexp-conv.c
@@ -217,6 +217,7 @@ static int
 match_argument(const char *given, const char *name)
 {
   /* FIXME: Allow abbreviations */
+  assert(given != NULL && name != NULL);
   return !strcmp(given, name);
 }
 
@@ -279,7 +280,10 @@ parse_options(struct conv_options *o,
 	case 'w':
 	  {
 	    char *end;
-	    int width = strtol(optarg, &end , 0);
+	    int width;
+	    assert(optarg != NULL);
+
+	    width = strtol(optarg, &end , 0);
 	    if (!*optarg || *end || width < 0)
 	      die("sexp-conv: Invalid width `%s'.\n", optarg);
 
-- 
2.24.1

From b3690f02166b07bb9e4be6f3af13e21163f62e40 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <[email protected]>
Date: Fri, 3 Jan 2020 09:48:59 +0100
Subject: [PATCH 1/2] .gitlab-ci.yml: use fedora31 image

Signed-off-by: Nikos Mavrogiannopoulos <[email protected]>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c857eacc..85acdf14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   BUILD_IMAGES_PROJECT: gnutls/build-images
   DEBIAN_CROSS_BUILD: buildenv-debian-cross
-  FEDORA_BUILD: buildenv-f29
+  FEDORA_BUILD: buildenv-fedora31
   DEBIAN_X86_CROSS_BUILD: buildenv-debian-x86-cross
   GET_SOURCES_ATTEMPTS: "3"
 
-- 
2.24.1

_______________________________________________
nettle-bugs mailing list
[email protected]
http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs

Reply via email to