You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/07/09 15:44:31 UTC
svn commit: r1359170 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: rhuijben
Date: Mon Jul 9 13:44:31 2012
New Revision: 1359170
URL: http://svn.apache.org/viewvc?rev=1359170&view=rev
Log:
* subversion/libsvn_fs_fs/fs_fs.c
(read_content): Following up on r1358375, don't make callers segfault when
we failed to read the file within the recovery limit, by at least returning
some error. This should fix the JavaHL tests on Windows.
Modified:
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1359170&r1=1359169&r2=1359170&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Mon Jul 9 13:44:31 2012
@@ -1657,6 +1657,11 @@ read_content(svn_stringbuf_t **content,
fname, i + 1 < RECOVERABLE_RETRY_COUNT,
pool));
+ if (!*content)
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+ _("Can't read '%s'"),
+ svn_dirent_local_style(fname, pool));
+
return SVN_NO_ERROR;
}