Merged with the 1.29 branch.

1 files changed, 14 insertions, 4 deletions

diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c
index bf8aa760..537a3fb7 100644
--- a/src/nxt_conf_validation.c
+++ b/src/nxt_conf_validation.c
@@ -1284,25 +1284,35 @@ nxt_conf_validate(nxt_conf_validation_t *vldt)
 
     vldt->tstr_state = nxt_tstr_state_new(vldt->pool, 1);
     if (nxt_slow_path(vldt->tstr_state == NULL)) {
-        return NXT_ERROR;
+        ret = NXT_ERROR;
+        goto fail;
     }
 
     ret = nxt_conf_vldt_type(vldt, NULL, vldt->conf, NXT_CONF_VLDT_OBJECT);
     if (ret != NXT_OK) {
-        return ret;
+        goto fail;
     }
 
     ret = nxt_conf_vldt_object(vldt, vldt->conf, nxt_conf_vldt_root_members);
     if (ret != NXT_OK) {
-        return ret;
+        goto fail;
     }
 
     ret = nxt_tstr_state_done(vldt->tstr_state, error);
     if (ret != NXT_OK) {
-        return nxt_conf_vldt_error(vldt, "%s", error);
+        ret = nxt_conf_vldt_error(vldt, "%s", error);
+        goto fail;
     }
 
+    nxt_tstr_state_release(vldt->tstr_state);
+
     return NXT_OK;
+
+fail:
+
+    nxt_tstr_state_release(vldt->tstr_state);
+
+    return ret;
 }