Merge branch 'maint-1.2'

 Conflicts:
	src/OVAL/probes/unix/linux/iflisteners_probe.c

Author: jan-cerny

src/CVRF/cvrf_priv.c

@@ -515,14 +515,14 @@ struct cvrf_vulnerability *cvrf_vulnerability_clone(const struct cvrf_vulnerabil
 }
 
 int cvrf_vulnerability_filter_by_product(struct cvrf_vulnerability *vuln, const char *prod) {
-	struct oscap_stringlist *filtered_ids = oscap_stringlist_new();
 	int ret = 0;
 
 	struct cvrf_product_status_iterator *statuses = cvrf_vulnerability_get_product_statuses(vuln);
 	while (cvrf_product_status_iterator_has_more(statuses)) {
 		struct cvrf_product_status *stat = cvrf_product_status_iterator_next(statuses);
 
 		struct oscap_string_iterator *products = cvrf_product_status_get_ids(stat);
+		struct oscap_stringlist *filtered_ids = oscap_stringlist_new();
 		while (oscap_string_iterator_has_more(products)) {
 			const char *product_id = oscap_string_iterator_next(products);
 			if (oscap_str_startswith(product_id, prod))

src/OVAL/probes/independent/textfilecontent54_probe.c

@@ -180,6 +180,7 @@ static int process_file(const char *prefix, const char *path, const char *file,
 	struct pfdata *pfd = (struct pfdata *) arg;
 	int ret = 0, path_len, file_len, cur_inst = 0, fd = -1, substr_cnt,
 		buf_size = 0, buf_used = 0, ofs = 0, buf_inc = 4096;
+	char **substrs = NULL;
 	char *whole_path = NULL, *whole_path_with_prefix = NULL, *buf = NULL;
 	SEXP_t *next_inst = NULL;
 	struct stat st;
@@ -249,7 +250,6 @@ static int process_file(const char *prefix, const char *path, const char *file,
 	buf[buf_used++] = '\0';
 
 	do {
-		char **substrs;
 		int want_instance;
 
 		next_inst = SEXP_number_newi_32(cur_inst + 1);

src/OVAL/probes/independent/textfilecontent_probe.c

@@ -171,6 +171,9 @@ static SEXP_t *create_item(const char *path, const char *filename, char *pattern
                                  "text",     OVAL_DATATYPE_STRING, substrs[0],
                                  NULL);
 
+	SEXP_string_free(se_filepath);
+	SEXP_string_free(se_instance);
+
 	for (i = 1; i < substr_cnt; ++i) {
                 probe_item_ent_add (item, "subexpression", NULL, r0 = SEXP_string_new (substrs[i], strlen (substrs[i])));
                 SEXP_free (r0);
@@ -192,6 +195,8 @@ static int process_file(const char *prefix, const char *path, const char *filena
 	char *whole_path = NULL, *whole_path_with_prefix = NULL;
 	FILE *fp = NULL;
 	struct stat st;
+	char **substrs = NULL;
+	int substr_cnt = 0;
 
 // todo: move to probe_main()?
 	int erroffset = -1;
@@ -241,9 +246,6 @@ static int process_file(const char *prefix, const char *path, const char *filena
 	char line[4096];
 
 	while (fgets(line, sizeof(line), fp) != NULL) {
-		char **substrs;
-		int substr_cnt;
-
 		substr_cnt = get_substrings(line, re, 1, &substrs);
 		if (substr_cnt > 0) {
 			int k;

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

@@ -352,7 +352,7 @@ static int get_interface(const int ent_ifindex, struct interface_t *interface) {
 			}
 			else {
 				int buf_len;
-				if (fscanf(fd, "%s\n", buf) < 1)
+				if (fscanf(fd, "%254s\n", buf) < 1)
 					*buf = '\0';
 
 				buf_len = strlen(buf);