[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Fix issue #4049 - SEGV on patch that deletes and skips

From: Daniel Näslund <dannas_at_dannas.name>
Date: Tue, 8 Nov 2011 21:23:23 +0100


It's been a year since my last commit and I've forgotten about the
internals of the patch code. Sending this patch for review so that I
don't mess something up.

Fix issue #4049 - SEGV on patch that deletes and skips.

When we do the sanity check of the supplied patch file we set
skipped=TRUE for the files that we're not going to process.

* subversion/libsvn_client/patch.c
  (patch_target_info_t): Add SKIPPED field.
  (delete_empty_dirs): Don't process targets that are marked skipped.

* subversion/tests/cmdline/patch_tests.py
  (patch_delete_and_skip): New.
  (test_list): Add new test.

I could have checked if local_abspath was NULL but I figured it might be
easy to forget to set local_abspath = NULL in one of the many places
were we set the skipped flag.

Daniel (dannas)

Received on 2011-11-08 21:23:58 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.