openscap/SOURCES/openscap-1.3.7-PR-1874-unit-test-read-common-sizet.patch

From 07486e9033d8cc1fd03962994b3359cb611a9ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Fri, 22 Jul 2022 16:50:01 +0200
Subject: [PATCH 1/3] Add unit test for read_common_sizet function

The unit test will cover the missing set errno
to 0 which was the root cause of:
https://github.com/OpenSCAP/openscap/issues/1867

Therefore, this test can be used during verification of:
https://bugzilla.redhat.com/show_bug.cgi?id=2109485
---
 tests/API/probes/CMakeLists.txt   |  9 +++++
 tests/API/probes/test_memusage.c  | 67 +++++++++++++++++++++++++++++++
 tests/API/probes/test_memusage.sh |  9 +++++
 3 files changed, 85 insertions(+)
 create mode 100644 tests/API/probes/test_memusage.c
 create mode 100755 tests/API/probes/test_memusage.sh

diff --git a/tests/API/probes/CMakeLists.txt b/tests/API/probes/CMakeLists.txt
index ae3c7212a0..2ac4081ac2 100644
--- a/tests/API/probes/CMakeLists.txt
+++ b/tests/API/probes/CMakeLists.txt
@@ -38,3 +38,12 @@ target_include_directories(oval_fts_list PUBLIC
 )
 target_link_libraries(oval_fts_list openscap)
 add_oscap_test("fts.sh")
+
+add_oscap_test_executable(test_memusage
+	"test_memusage.c"
+	"${CMAKE_SOURCE_DIR}/src/common/bfind.c"
+)
+target_include_directories(test_memusage PUBLIC
+	"${CMAKE_SOURCE_DIR}/src/common"
+)
+add_oscap_test("test_memusage.sh")
diff --git a/tests/API/probes/test_memusage.c b/tests/API/probes/test_memusage.c
new file mode 100644
index 0000000000..5dced98f03
--- /dev/null
+++ b/tests/API/probes/test_memusage.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Authors:
+ *      "Jan Černý" <jcerny@redhat.com>
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+#include "memusage.h"
+#include "memusage.c"
+#define OS_LINUX
+
+static int test_basic()
+{
+	size_t size;
+	char *strval = strdup("17 MB");
+	read_common_sizet(&size, strval);
+	free(strval);
+	return (size == 17);
+}
+
+static int test_errno()
+{
+	size_t size;
+	char *strval = strdup("17 MB");
+
+	/* Test that setting errno outside of the read_common_sizet function
+	 * doesn't influence the function and doesn't make the function fail.
+	 */
+	errno = EINVAL;
+
+	int ret = read_common_sizet(&size, strval);
+	free(strval);
+	return (ret != -1);
+}
+
+int main(int argc, char *argv[])
+{
+	if (!test_basic()) {
+		fprintf(stderr, "test_basic has failed\n");
+		return 1;
+	}
+	if (!test_errno()) {
+		fprintf(stderr, "test_errno has failed\n");
+		return 1;
+	}
+	return 0;
+}
diff --git a/tests/API/probes/test_memusage.sh b/tests/API/probes/test_memusage.sh
new file mode 100755
index 0000000000..4c76bdc0ac
--- /dev/null
+++ b/tests/API/probes/test_memusage.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+. $builddir/tests/test_common.sh
+
+if [ -n "${CUSTOM_OSCAP+x}" ] ; then
+    exit 255
+fi
+
+./test_memusage

From 2cc649d5e9fbf337bbfca69c21313657a5b8a7cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Mon, 25 Jul 2022 09:00:36 +0200
Subject: [PATCH 2/3] Replace license by SPDX ID

---
 tests/API/probes/test_memusage.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/tests/API/probes/test_memusage.c b/tests/API/probes/test_memusage.c
index 5dced98f03..db2915f6d5 100644
--- a/tests/API/probes/test_memusage.c
+++ b/tests/API/probes/test_memusage.c
@@ -1,24 +1,4 @@
-/*
- * Copyright 2022 Red Hat Inc., Durham, North Carolina.
- * All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * Authors:
- *      "Jan Černý" <jcerny@redhat.com>
- */
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

From caadd89e61f5d70e251180055686a3b52c763c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
Date: Mon, 25 Jul 2022 09:00:45 +0200
Subject: [PATCH 3/3] Improve unit test for read_common_sizet

Check for multiple different situations.
---
 tests/API/probes/test_memusage.c | 34 ++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/tests/API/probes/test_memusage.c b/tests/API/probes/test_memusage.c
index db2915f6d5..b9db865d45 100644
--- a/tests/API/probes/test_memusage.c
+++ b/tests/API/probes/test_memusage.c
@@ -12,16 +12,34 @@
 static int test_basic()
 {
 	size_t size;
-	char *strval = strdup("17 MB");
-	read_common_sizet(&size, strval);
+	char *strval = strdup("17 kB\n");
+	int ret = read_common_sizet(&size, strval);
 	free(strval);
-	return (size == 17);
+	return (size == 17 && ret == 0);
+}
+
+static int test_no_unit()
+{
+	size_t size;
+	char *strval = strdup("42");
+	int ret = read_common_sizet(&size, strval);
+	free(strval);
+	return (ret == -1);
+}
+
+static int test_invalid_number()
+{
+	size_t size;
+	char *strval = strdup("www kB\n");
+	int ret = read_common_sizet(&size, strval);
+	free(strval);
+	return (size == 0 && ret == 0);
 }
 
 static int test_errno()
 {
 	size_t size;
-	char *strval = strdup("17 MB");
+	char *strval = strdup("17 kB\n");
 
 	/* Test that setting errno outside of the read_common_sizet function
 	 * doesn't influence the function and doesn't make the function fail.
@@ -39,6 +57,14 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "test_basic has failed\n");
 		return 1;
 	}
+	if (!test_no_unit()) {
+		fprintf(stderr, "test_no_unit has failed\n");
+		return 1;
+	}
+	if (!test_invalid_number()) {
+		fprintf(stderr, "test_invalid_number has failed\n");
+		return 1;
+	}
 	if (!test_errno()) {
 		fprintf(stderr, "test_errno has failed\n");
 		return 1;