svn commit: r1687443 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[stsp]

Author: stsp
Date: Thu Jun 25 08:44:04 2015
New Revision: 1687443

URL: http://svn.apache.org/r1687443
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Avoid dereferencing a NULL mime-type string.

Found by: philip

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1687443&r1=1687442&r2=1687443&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Jun 25 08:44:04 
2015
@@ -730,8 +730,9 @@ handle_text_conflict(svn_wc_conflict_res
   svn_boolean_t knows_something = FALSE;
   const char *local_relpath;
   const char *local_abspath = svn_client_conflict_get_local_abspath(desc);
-  svn_boolean_t is_binary = svn_mime_type_is_binary(
-                              svn_client_conflict_text_get_mime_type(desc));
+  const char *mime_type = svn_client_conflict_text_get_mime_type(desc);
+  svn_boolean_t is_binary = mime_type ? svn_mime_type_is_binary(mime_type)
+                                      : FALSE;
   const char *base_abspath;
   const char *my_abspath;
   const char *their_abspath;