You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/14 22:05:26 UTC
svn commit: r1146877 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_fs_fs/fs_fs.c
Author: hwright
Date: Thu Jul 14 20:05:25 2011
New Revision: 1146877
URL: http://svn.apache.org/viewvc?rev=1146877&view=rev
Log:
Merge r1146222 from trunk:
* r1146222
Add a NULL check in an error path.
Justification
Avoids segfaults.
Votes:
+1: danielsh, gstein, stsp, rhuijben
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 14 20:05:25 2011
@@ -53,4 +53,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146219
+/subversion/trunk:1146013,1146219,1146222
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1146877&r1=1146876&r2=1146877&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Jul 14 20:05:25 2011
@@ -52,13 +52,6 @@ Candidate changes:
Approved changes:
=================
- * r1146222
- Add a NULL check in an error path.
- Justification
- Avoids segfaults.
- Votes:
- +1: danielsh, gstein, stsp, rhuijben
-
* r1146274
Make svn_client_infoX() return proper results for tree conflicts. Without
this patch the structure is just memcleared instead of properly set to
Modified: subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c?rev=1146877&r1=1146876&r2=1146877&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_fs_fs/fs_fs.c Thu Jul 14 20:05:25 2011
@@ -3131,8 +3131,10 @@ create_rep_state(struct rep_state **rep_
### going to jump straight to this comment anyway! */
return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
"Corrupt representation '%s'",
- representation_string(rep, ffd->format, TRUE,
- pool));
+ rep
+ ? representation_string(rep, ffd->format, TRUE,
+ pool)
+ : "(null)");
}
/* ### Call representation_string() ? */
return svn_error_trace(err);