Author: svn-role
Date: Thu Aug 15 04:00:41 2013
New Revision: 1514148
URL: http://svn.apache.org/r1514148
Log:
Merge r1513156 from trunk:
* r1513156
Fix crash when updating in libsvn_wc/update_editor.c, window_handler().
Justification:
Multiple crash reports:
http://svn.haxx.se/dev/archive-2013-06/0385.shtml
Votes:
+1: ivan, philip, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1513156
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1514148&r1=1514147&r2=1514148&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Thu Aug 15 04:00:41 2013
@@ -230,14 +230,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1513156
- Fix crash when updating in libsvn_wc/update_editor.c, window_handler().
- Justification:
- Multiple crash reports:
- http://svn.haxx.se/dev/archive-2013-06/0385.shtml
- Votes:
- +1: ivan, philip, rhuijben
-
* r1508438
Try harder to pass an existing path to sleep for timestamps
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c?rev=1514148&r1=1514147&r2=1514148&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_wc/update_editor.c Thu Aug 15
04:00:41 2013
@@ -1012,9 +1012,13 @@ window_handler(svn_txdelta_window_t *win
if (err)
{
- /* We failed to apply the delta; clean up the temporary file. */
- svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath, TRUE,
- hb->pool));
+ /* We failed to apply the delta; clean up the temporary file if it
+ already created by lazy_open_target(). */
+ if (hb->new_text_base_tmp_abspath)
+ {
+ svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath,
+ TRUE, hb->pool));
+ }
}
else
{
