Fix warnings

Author: evgenyz

src/CPE/cpe_session.c

@@ -114,7 +114,9 @@ struct oval_agent_session *cpe_session_lookup_oval_session(struct cpe_session *c
 			return NULL;
 		}
 
-		char *base_name = oscap_basename(prefixed_href);
+		char *prefixed_href_dup = oscap_strdup(prefixed_href);
+		char *base_name = oscap_basename(prefixed_href_dup);
+		free(prefixed_href_dup);
 		session = oval_agent_new_session(oval_model, base_name);
 		free(base_name);
 		if (session == NULL) {

src/OVAL/probes/independent/yamlfilecontent_probe.c

@@ -392,13 +392,15 @@ static int process_yaml_file(const char *prefix, const char *path, const char *f
 {
 	int ret = 0;
 
-	yaml_parser_t parser;
-	yaml_parser_initialize(&parser);
-
 	char *filepath = oscap_path_join(path, filename);
 	if (probe_path_is_blocked(filepath, ctx->blocked_paths)) {
-		goto cleanup;
+		free(filepath);
+		return 0;
 	}
+
+	yaml_parser_t parser;
+	yaml_parser_initialize(&parser);
+
 	char *filepath_with_prefix = oscap_path_join(prefix, filepath);
 
 	FILE *yaml_file = fopen(filepath_with_prefix, "r");

src/OVAL/probes/unix/xinetd_probe.c

@@ -746,7 +746,7 @@ xiconf_t *xiconf_parse(const char *path, unsigned int max_depth)
 
 				switch (inctype) {
 				case XICONF_INCTYPE_FILE:
-					strncpy (pathbuf, inclarg, sizeof(pathbuf));
+					strncpy (pathbuf, inclarg, sizeof(pathbuf)-1);
 
 					dD("includefile: %s", pathbuf);
 

src/OVAL/results/oval_cmp_evr_string.c

@@ -91,8 +91,8 @@ static inline int rpmevrcmp(const char *a, const char *b)
 	/* This mimics rpmevrcmp which is not exported by rpmlib version 4.
 	 * Code inspired by rpm.labelCompare() from rpm4/python/header-py.c
 	 */
-	const char *a_epoch, *a_version, *a_release;
-	const char *b_epoch, *b_version, *b_release;
+	const char *a_epoch = NULL, *a_version = NULL, *a_release = NULL;
+	const char *b_epoch = NULL, *b_version = NULL, *b_release = NULL;
 	char *a_copy, *b_copy;
 	int result;
 
@@ -399,8 +399,8 @@ static int dpkg_version_compare(struct dpkg_version *a, struct dpkg_version *b)
 oval_result_t oval_debian_evr_string_cmp(const char *state, const char *sys, oval_operation_t operation)
 {
 	struct dpkg_version a, b;
-	const char *a_epoch, *a_version, *a_release;
-	const char *b_epoch, *b_version, *b_release;
+	const char *a_epoch = NULL, *a_version = NULL, *a_release = NULL;
+	const char *b_epoch = NULL, *b_version = NULL, *b_release = NULL;
 	char *a_copy, *b_copy;
 	long aux;
 

swig/python3/CMakeLists.txt

@@ -5,7 +5,7 @@ include_directories(${PYTHON_INCLUDE_PATH})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CMAKE_SWIG_FLAGS "-module" "openscap_py" "-py3")
+set(CMAKE_SWIG_FLAGS "-module" "openscap_py")
 if (${CMAKE_VERSION} VERSION_LESS "3.8.0")
 	swig_add_module(openscap_py python ../openscap.i)
 else()