subversion/backport-CVE-2020-17525.patch

27 lines
1.2 KiB
Diff
Raw Normal View History

2021-02-22 17:28:32 +08:00
From: Stefan Sperling <stsp@apache.org>
Date: Fri, 29 Jan 2021 13:17:15 +0000
Subject: Fix a potential NULL dereference in the config file parser.
* subversion/libsvn_repos/config_file.c
(get_repos_config): svn_repos_find_root_path() may return NULL.
Check the return value accordingly.
---
subversion/libsvn_repos/config_file.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/subversion/libsvn_repos/config_file.c b/subversion/libsvn_repos/config_file.c
index 9187277..2414db9 100644
--- a/subversion/libsvn_repos/config_file.c
+++ b/subversion/libsvn_repos/config_file.c
@@ -237,6 +237,10 @@ get_repos_config(svn_stream_t **stream,
{
/* Search for a repository in the full path. */
repos_root_dirent = svn_repos_find_root_path(dirent, scratch_pool);
+ if (repos_root_dirent == NULL)
+ return svn_error_trace(handle_missing_file(stream, checksum, access,
+ url, must_exist,
+ svn_node_none));
/* Attempt to open a repository at repos_root_dirent. */
SVN_ERR(svn_repos_open3(&access->repos, repos_root_dirent, NULL,