Author: stsp
Date: Sat Jun 12 13:43:48 2010
New Revision: 954004
URL: http://svn.apache.org/viewvc?rev=954004&view=rev
Log:
* subversion/libsvn_wc/diff.c
(file_diff): Expect svn_wc__get_pristine_props() to return NULL baseprops,
and continue gracefully rather than crashing.
Review by: julianfoad
Modified:
subversion/trunk/subversion/libsvn_wc/diff.c
Modified: subversion/trunk/subversion/libsvn_wc/diff.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff.c?rev=954004&r1=954003&r2=954004&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff.c Sat Jun 12 13:43:48 2010
@@ -664,7 +664,10 @@ file_diff(struct dir_baton *db,
/* Get svn:mime-type from pristine props (in BASE or WORKING) of PATH. */
SVN_ERR(svn_wc__get_pristine_props(&baseprops, eb->db, local_abspath,
pool, pool));
- base_mimetype = get_prop_mimetype(baseprops);
+ if (baseprops)
+ base_mimetype = get_prop_mimetype(baseprops);
+ else
+ base_mimetype = NULL;
SVN_ERR(eb->callbacks->file_deleted(NULL, NULL, NULL, path,
textbase,
