Author: hwright Date: Mon Aug 8 18:35:13 2011 New Revision: 1155048 URL: http://svn.apache.org/viewvc?rev=1155048&view=rev Log: Merge r1155015 from trunk:
* r1155015 Resolve a segfault on upgrade when we find unexpected files in the administrative area. Justification: Segfaults are bad. Votes: +1: rhuijben, philip, julianfoad Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 8 18:35:13 2011 @@ -55,4 +55,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1155048&r1=1155047&r2=1155048&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Mon Aug 8 18:35:13 2011 @@ -195,11 +195,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1155015 - Resolve a segfault on upgrade when we find unexpected files in the - administrative area. - Justification: - Segfaults are bad. - Votes: - +1: rhuijben, philip, julianfoad Modified: subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c?rev=1155048&r1=1155047&r2=1155048&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c (original) +++ subversion/branches/1.7.x/subversion/libsvn_wc/upgrade.c Mon Aug 8 18:35:13 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,