svn commit: r1155015 - /subversion/trunk/subversion/libsvn_wc/upgrade.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Aug  8 17:07:22 2011
New Revision: 1155015

URL: http://svn.apache.org/viewvc?rev=1155015&view=rev
Log:
Resolve a segfault during 'svn upgrade'.

* subversion/libsvn_wc/upgrade.c
  (migrate_text_bases): Apply simple fix.

Found by: steveking

Modified:
    subversion/trunk/subversion/libsvn_wc/upgrade.c

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1155015&r1=1155014&r2=1155015&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Mon Aug  8 17:07:22 2011
@@ -1106,6 +1106,18 @@ migrate_text_bases(apr_hash_t **text_bas
             is_revert_base = FALSE;
           }
 
+        if (! versioned_file_name)
+          {
+             /* Some file that doesn't end with .svn-base or .svn-revert.
+                No idea why that would be in our administrative area, but
+                we shouldn't segfault on this case.
+
+                Note that we already copied this file in the pristine store,
+                but the next cleanup will take care of that.
+              */
+            continue;
+          }
+
         /* Create a new info struct for this versioned file, or fill in the
          * existing one if this is the second text-base we've found for it. */
         info = apr_hash_get(*text_bases_info, versioned_file_name,