svn commit: r1071239 - in /subversion/trunk/subversion/mod_dav_svn: repos.c version.c

[ph...@apache.org]

Author: philip
Date: Wed Feb 16 13:33:26 2011
New Revision: 1071239

URL: http://svn.apache.org/viewvc?rev=1071239&view=rev
Log:
Fix mod_dav_svn SEGV if locks are passed when authn is not enabled.

* subversion/mod_dav_svn/version.c
  (dav_svn__push_locks): Check for NULL access.

* subversion/mod_dav_svn/repos.c
  (get_resource): Check for NULL access.

Modified:
    subversion/trunk/subversion/mod_dav_svn/repos.c
    subversion/trunk/subversion/mod_dav_svn/version.c

Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1071239&r1=1071238&r2=1071239&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Feb 16 13:33:26 2011
@@ -2185,7 +2185,7 @@ get_resource(request_rec *r,
       dav_locktoken_list *list = ltl;
 
       serr = svn_fs_get_access(&access_ctx, repos->fs);
-      if (serr)
+      if (serr || !access_ctx)
         {
           return dav_svn__sanitize_error(serr, "Lock token is in request, "
                                          "but no user name",

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1071239&r1=1071238&r2=1071239&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Feb 16 13:33:26 2011
@@ -1271,7 +1271,7 @@ dav_svn__push_locks(dav_resource *resour
   svn_error_t *serr;
 
   serr = svn_fs_get_access(&fsaccess, resource->info->repos->fs);
-  if (serr)
+  if (serr || !fsaccess)
     {
       /* If an authenticated user name was attached to the request,
          then dav_svn_get_resource() should have already noticed and