Author: svn-role
Date: Sat Jan 30 04:00:08 2021
New Revision: 1886038
URL: http://svn.apache.org/viewvc?rev=1886038&view=rev
Log:
Merge r1886019 from trunk:
* r1886019
Fix a potential NULL dereference in the config file parser.
Justification:
Missing return value check. C is hard.
Votes:
+1: stsp, hartmannathan, jcorvel
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1886019
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1886038&r1=1886037&r2=1886038&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Sat Jan 30 04:00:08 2021
@@ -49,13 +49,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1886019
- Fix a potential NULL dereference in the config file parser.
- Justification:
- Missing return value check. C is hard.
- Votes:
- +1: stsp, hartmannathan, jcorvel
-
* r1885983
Fix issue #4869: 'svn info --xml' gives wrong 'source-right' of conflict
Justification:
Modified: subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c?rev=1886038&r1=1886037&r2=1886038&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c (original)
+++ subversion/branches/1.10.x/subversion/libsvn_repos/config_file.c Sat Jan 30
04:00:08 2021
@@ -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,
