summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-03-05 20:58:00 +0100
committerGitHub <noreply@github.com>2024-03-05 20:58:00 +0100
commite1269c976687794ba8d92d65d0b9c34cb8a040c5 (patch)
treeba2f7f9f543620e7ce0611a3258d0605274a281b
parent53eca9a3f9eae4947bb0df8bf8a28301cd2aa5c0 (diff)
parentc23f23d1012dbee120e730ae49f26bd90f774838 (diff)
downloadvyos-1x-e1269c976687794ba8d92d65d0b9c34cb8a040c5.tar.gz
vyos-1x-e1269c976687794ba8d92d65d0b9c34cb8a040c5.zip
Merge pull request #3094 from vyos/mergify/bp/sagitta/pr-3089
http-api: T6069: fix allocation outside of thread lock (backport #3089)
-rwxr-xr-xsrc/services/vyos-http-api-server3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 40d442e30..a7b14a1a3 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -459,7 +459,6 @@ def _configure_op(data: Union[ConfigureModel, ConfigureListModel,
request: Request, background_tasks: BackgroundTasks):
session = app.state.vyos_session
env = session.get_session_env()
- config = Config(session_env=env)
endpoint = request.url.path
@@ -474,6 +473,8 @@ def _configure_op(data: Union[ConfigureModel, ConfigureListModel,
# so the lock is really global
lock.acquire()
+ config = Config(session_env=env)
+
status = 200
msg = None
error_msg = None