You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/08/29 10:41:16 UTC
svn commit: r1378478 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
Author: stefan2
Date: Wed Aug 29 08:41:16 2012
New Revision: 1378478
URL: http://svn.apache.org/viewvc?rev=1378478&view=rev
Log:
Follow-up to r1378358:
Fix the NULL-pointer access triggered by our JAVA bindings tests.
* subversion/libsvn_fs_fs/fs_fs.c
(get_changes): caches may not be available -> test for that
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=1378478&r1=1378477&r2=1378478&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Aug 29 08:41:16 2012
@@ -5898,10 +5898,13 @@ get_changes(apr_array_header_t **changes
/* try cache lookup first */
- SVN_ERR(svn_cache__get((void **) changes, &found, ffd->changes_cache,
- &rev, pool));
- if (found)
- return SVN_NO_ERROR;
+ if (ffd->changes_cache)
+ {
+ SVN_ERR(svn_cache__get((void **) changes, &found, ffd->changes_cache,
+ &rev, pool));
+ if (found)
+ return SVN_NO_ERROR;
+ }
/* read changes from revision file */
@@ -5919,7 +5922,8 @@ get_changes(apr_array_header_t **changes
/* cache for future reference */
- SVN_ERR(svn_cache__set(ffd->changes_cache, &rev, *changes, pool));
+ if (ffd->changes_cache)
+ SVN_ERR(svn_cache__set(ffd->changes_cache, &rev, *changes, pool));
return SVN_NO_ERROR;
}