diff options
Diffstat (limited to 'contrib/sepgsql/label.c')
| -rw-r--r-- | contrib/sepgsql/label.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c index d2505f7f343..d8a1d129d29 100644 --- a/contrib/sepgsql/label.c +++ b/contrib/sepgsql/label.c @@ -465,14 +465,11 @@ sepgsql_get_label(Oid classId, Oid objectId, int32 subId) { label = pstrdup(unlabeled); } - PG_CATCH(); + PG_FINALLY(); { freecon(unlabeled); - PG_RE_THROW(); } PG_END_TRY(); - - freecon(unlabeled); } return label; } @@ -600,13 +597,11 @@ sepgsql_mcstrans_in(PG_FUNCTION_ARGS) { result = pstrdup(raw_label); } - PG_CATCH(); + PG_FINALLY(); { freecon(raw_label); - PG_RE_THROW(); } PG_END_TRY(); - freecon(raw_label); PG_RETURN_TEXT_P(cstring_to_text(result)); } @@ -640,13 +635,11 @@ sepgsql_mcstrans_out(PG_FUNCTION_ARGS) { result = pstrdup(qual_label); } - PG_CATCH(); + PG_FINALLY(); { freecon(qual_label); - PG_RE_THROW(); } PG_END_TRY(); - freecon(qual_label); PG_RETURN_TEXT_P(cstring_to_text(result)); } @@ -851,13 +844,11 @@ exec_object_restorecon(struct selabel_handle *sehnd, Oid catalogId) SetSecurityLabel(&object, SEPGSQL_LABEL_TAG, context); } - PG_CATCH(); + PG_FINALLY(); { freecon(context); - PG_RE_THROW(); } PG_END_TRY(); - freecon(context); } else if (errno == ENOENT) ereport(WARNING, @@ -937,14 +928,11 @@ sepgsql_restorecon(PG_FUNCTION_ARGS) exec_object_restorecon(sehnd, AttributeRelationId); exec_object_restorecon(sehnd, ProcedureRelationId); } - PG_CATCH(); + PG_FINALLY(); { selabel_close(sehnd); - PG_RE_THROW(); } PG_END_TRY(); - selabel_close(sehnd); - PG_RETURN_BOOL(true); } |