Attachment 897992 Details for Bug 1098446 – libsepol valgrind happy

[patch] libsepol valgrind happy

libsepol_valgrind.patch (text/plain), 3.18 KB, created by Lukas Bezdicka on 2014-05-21 13:53:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Bezdicka

Created: 2014-05-21 13:53:40 UTC

Size: 3.18 KB

patch

obsolete

>diff --git a/src/expand.c b/src/expand.c
>index f0555bb..92aa02c 100644
>--- a/src/expand.c
>+++ b/src/expand.c
>@@ -72,11 +72,10 @@ static int linear_probe_create(struct linear_probe *probe, uint32_t length)
> 
> static void linear_probe_destroy(struct linear_probe *probe)
> {
>-	if (probe->length == 0)
>-		return;
>-
>-	free(probe->table);
>-	free(probe->ends);
>+	if (probe->table)
>+		free(probe->table);
>+	if (probe->table)
>+		free(probe->ends);
> 	memset(probe, 0, sizeof(*probe));
> }
> 
>@@ -1447,7 +1446,7 @@ static int copy_role_trans(expand_state_t * state, role_trans_rule_t * rules)
> 
> static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *rules)
> {
>-	unsigned int i, j;
>+	unsigned int i, j, ret;
> 	filename_trans_t *new_trans, *cur_trans, *end;
> 	filename_trans_rule_t *cur_rule;
> 	ebitmap_t stypes, ttypes;
>@@ -1460,7 +1459,8 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 	 */
> 	if (linear_probe_create(&probe, 4096)) { /* Assume 4096 is enough for most cases */
> 		ERR(state->handle, "Out of memory!");
>-		return -1;
>+                ret = -1;
>+		goto cleanup;
> 	}
> 
> 	cur_rule = rules;
>@@ -1473,13 +1473,15 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 		if (expand_convert_type_set(state->out, state->typemap,
> 					    &cur_rule->stypes, &stypes, 1)) {
> 			ERR(state->handle, "Out of memory!");
>-			return -1;
>+			ret = -1;
>+                        goto cleanup;
> 		}
> 
> 		if (expand_convert_type_set(state->out, state->typemap,
> 					    &cur_rule->ttypes, &ttypes, 1)) {
> 			ERR(state->handle, "Out of memory!");
>-			return -1;
>+			ret = -1;
>+			goto cleanup;
> 		}
> 
> 		mapped_otype = state->typemap[cur_rule->otype - 1];
>@@ -1488,7 +1490,8 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 			linear_probe_destroy(&probe);
> 			if (linear_probe_create(&probe, ebitmap_length(&stypes))) {
> 				ERR(state->handle, "Out of memory!");
>-				return -1;
>+				ret = -1;
>+				goto cleanup;
> 			}
> 		}
> 
>@@ -1515,7 +1518,8 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 						    state->out->p_type_val_to_name[cur_trans->otype - 1],
> 						    state->out->p_type_val_to_name[mapped_otype - 1]);
> 
>-						return -1;
>+						ret = -1;
>+						goto cleanup;
> 					}
> 					cur_trans = cur_trans->next;
> 				}
>@@ -1526,14 +1530,16 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 				new_trans = malloc(sizeof(*new_trans));
> 				if (!new_trans) {
> 					ERR(state->handle, "Out of memory!");
>-					return -1;
>+					ret = -1;
>+					goto cleanup;
> 				}
> 				memset(new_trans, 0, sizeof(*new_trans));
> 
> 				new_trans->name = strdup(cur_rule->name);
> 				if (!new_trans->name) {
> 					ERR(state->handle, "Out of memory!");
>-					return -1;
>+					ret = -1;
>+					goto cleanup;
> 				}
> 				new_trans->stype = i + 1;
> 				new_trans->ttype = j + 1;
>@@ -1554,7 +1560,10 @@ static int expand_filename_trans(expand_state_t *state, filename_trans_rule_t *r
> 
> 		cur_rule = cur_rule->next;
> 	}
>-	return 0;
>+	ret = 0;
>+cleanup:
>+        linear_probe_destroy(&probe);
>+	return ret;
> }
> 
> static int exp_rangetr_helper(uint32_t stype, uint32_t ttype, uint32_t tclass,

Actions: View | Diff

Attachments on bug 1098446: 897992 | 898647 | 921017