Merge branch 'maint-1.2'

Author: jan-cerny

src/OVAL/oval_sexp.c

@@ -847,6 +847,8 @@ static struct oval_sysent *oval_sexp_to_sysent(struct oval_syschar_model *model,
 	    oval_message_set_text(msg, txt);
 	    oval_sysitem_add_message(item, msg);
 
+	    free(key);
+
 	    return (NULL);
 	}
 

src/OVAL/probes/probe-api.c

@@ -267,7 +267,6 @@ bool probe_item_filtered(const SEXP_t *item, const SEXP_t *filters)
 			}
 
 			if (SEXP_list_length(elm_res) > 0) {
-				free(elm_name);
 				r0 = probe_ent_getattrval(felm, "entity_check");
 
 				if (r0 == NULL)
@@ -278,13 +277,13 @@ bool probe_item_filtered(const SEXP_t *item, const SEXP_t *filters)
 				SEXP_free(r0);
 
 				ores = probe_ent_result_bychk(elm_res, ochk);
-				SEXP_free(elm_res);
 			} else {
-				SEXP_free(elm_res);
 				ores = OVAL_RESULT_FALSE;
 			}
 			SEXP_list_add(ste_res, r0 = SEXP_number_newi_32(ores));
 			SEXP_free(r0);
+			SEXP_free(elm_res);
+			free(elm_name);
 		}
 
 		r0 = probe_ent_getattrval(ste, "operator");

src/OVAL/probes/unix/linux/selinuxsecuritycontext_probe.c

@@ -270,7 +270,7 @@ static int selinuxsecuritycontext_file_cb(const char *prefix, const char *p, con
 	file_context_size = getfilecon(path_with_prefix, &file_context);
 	free(path_with_prefix);
 	if (file_context_size == -1) {
-		dE("Can't get context for %s: %s", pbuf, strerror(errno));
+		dD("Can't get context for %s: %s", pbuf, strerror(errno));
 
 		item = probe_item_create(OVAL_LINUX_SELINUXSECURITYCONTEXT, NULL,
 						"filepath", OVAL_DATATYPE_STRING, pbuf,

src/SCE/sce_engine.c

@@ -348,7 +348,7 @@ static void _pipe_try_read_into_string(int fd, struct oscap_string *string, bool
 
 
 static void free_env_values(char **env_values, size_t index_of_first_env_value_not_compiled_in, size_t real_env_values_count) {
-	for (i = index_of_first_env_value_not_compiled_in; i < real_env_values_count; i++) {
+	for (size_t i = index_of_first_env_value_not_compiled_in; i < real_env_values_count; i++) {
 		free(env_values[i]);
 	}
 	free(env_values);
@@ -512,8 +512,6 @@ xccdf_test_result_type_t sce_engine_eval_rule(struct xccdf_policy *policy, const
 
 		if (fork_result == 0)
 		{
-			free_env_values(env_values, index_of_first_env_value_not_compiled_in, env_value_count);
-
 			// we won't read from the pipes, so close the reading fd
 			close(stdout_pipefd[0]);
 			close(stderr_pipefd[0]);
@@ -540,6 +538,8 @@ xccdf_test_result_type_t sce_engine_eval_rule(struct xccdf_policy *policy, const
 			// we are the child process
 			execve(tmp_href, argvp, env_values);
 
+			free_env_values(env_values, index_of_first_env_value_not_compiled_in, env_value_count);
+
 			// no need to check the return value of execve, if it returned at all we are in trouble
 			printf("Unexpected error when executing script '%s'. Error message follows.\n", href);
 			perror("execve");