[SVN-4049] SEGV on patch that deletes and skips

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.7.x
• Fix Version/s: 1.7.2
• Component/s: libsvn_client
• Assignee: Unassigned
• Reporter: Philip Martin
• Created: 03/Nov/11 20:36
• Updated: 27/Oct/18 16:29
• Resolved: 22/Nov/11 11:36

Description

svnadmin create repo
svn import -mm repo/format file://`pwd`/repo/A/f
svn co file://`pwd`/repo wc1
svn co file://`pwd`/repo wc2
svn ps x x wc1/A/f
svn rm wc2/A/f
svn diff $PWD/wc1 > x.x
svn diff $PWD/wc2 >> x.x
svn revert -R wc2
svn patch --strip 0 x.x wc2

(gdb) bt
#0  __strlen_sse2 () at ../sysdeps/x86_64/multiarch/../strlen.S:31
#1  0x00007ffff6ff612d in svn_dirent_dirname (dirent=0x0, pool=0x6abcf8)
    at ../src/subversion/libsvn_subr/dirent_uri.c:1182
#2  0x00007ffff7bbd866 in delete_empty_dirs (targets_info=0x67cba0, 
    ctx=0x652bc0, dry_run=0, scratch_pool=0x652278)
    at ../src/subversion/libsvn_client/patch.c:2726
#3  0x00007ffff7bbe37b in apply_patches (baton=0x7fffffffe400, 
    result_pool=0x652278, scratch_pool=0x652278)
    at ../src/subversion/libsvn_client/patch.c:2938
#4  0x00007ffff78ce325 in svn_wc__call_with_write_lock (
    func=0x7ffff7bbde6f <apply_patches>, baton=0x7fffffffe400, 
    wc_ctx=0x652c78, local_abspath=0x67bf90 "/home/pm/sw/subversion/obj/wc2", 
    lock_anchor=0, result_pool=0x652278, scratch_pool=0x652278)
    at ../src/subversion/libsvn_wc/lock.c:1627
#5  0x00007ffff7bbe7ac in svn_client_patch (
    patch_abspath=0x67bea0 "/home/pm/sw/subversion/obj/x.x", 
    wc_dir_abspath=0x67bf90 "/home/pm/sw/subversion/obj/wc2", dry_run=0, 
    strip_count=0, reverse=0, ignore_whitespace=0, remove_tempfiles=1, 
    patch_func=0, patch_baton=0x0, ctx=0x652bc0, scratch_pool=0x652278)
    at ../src/subversion/libsvn_client/patch.c:3008
#6  0x000000000041b6e9 in svn_cl__patch (os=0x6524c8, baton=0x7fffffffe680, 
    pool=0x652278) at ../src/subversion/svn/patch-cmd.c:87
#7  0x0000000000416ec6 in main (argc=6, argv=0x7fffffffea28)
    at ../src/subversion/svn/main.c:2618
(gdb) up
#1  0x00007ffff6ff612d in svn_dirent_dirname (dirent=0x0, pool=0x6abcf8)
    at ../src/subversion/libsvn_subr/dirent_uri.c:1182
1182      apr_size_t len = strlen(dirent);
(gdb) up
#2  0x00007ffff7bbd866 in delete_empty_dirs (targets_info=0x67cba0, 
    ctx=0x652bc0, dry_run=0, scratch_pool=0x652278)
    at ../src/subversion/libsvn_client/patch.c:2726
2726          parent = svn_dirent_dirname(target_info->local_abspath, iterpool);
(gdb) p target_info
$1 = (patch_target_info_t *) 0x67cbc8
(gdb) p target_info[0]
$2 = {local_abspath = 0x0, deleted = 0}