subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1482327 - /subversion/trunk/subversion/libsvn_wc/entries.c
Date Tue, 14 May 2013 13:29:07 GMT
Author: rhuijben
Date: Tue May 14 13:29:06 2013
New Revision: 1482327

URL: http://svn.apache.org/r1482327
Log:
* subversion/libsvn_wc/entries.c
  (insert_actual_node): Avoid segfault by passing NULL to strlen on upgrading
    from entries when there is an ACTUAL node to upgrade but no tree conflict.

Found by: SharpSvn test suite

Modified:
    subversion/trunk/subversion/libsvn_wc/entries.c

Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1482327&r1=1482326&r2=1482327&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue May 14 13:29:06 2013
@@ -1565,7 +1565,9 @@ insert_actual_node(svn_sqlite__db_t *sdb
                                 actual_node->conflict_new,
                                 actual_node->prop_reject,
                                 actual_node->tree_conflict_data,
-                                strlen(actual_node->tree_conflict_data),
+                                actual_node->tree_conflict_data
+                                    ? strlen(actual_node->tree_conflict_data)
+                                    : 0,
                                 scratch_pool, scratch_pool));
 
   if (conflict_data)



Mime
View raw message