You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2011/10/14 11:40:40 UTC
svn commit: r1183263 - /subversion/trunk/subversion/libsvn_wc/wc_db.c
Author: philip
Date: Fri Oct 14 09:40:40 2011
New Revision: 1183263
URL: http://svn.apache.org/viewvc?rev=1183263&view=rev
Log:
* subversion/libsvn_wc/wc_db.c
(read_info): Avoid dererencing a potentially NULL error pointer, ensure
all errors include the local relpath not just the checksum error.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1183263&r1=1183262&r2=1183263&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Fri Oct 14 09:40:40 2011
@@ -6728,18 +6728,10 @@ read_info(svn_wc__db_status_t *status,
}
else
{
- svn_error_t *err2;
- err2 = svn_sqlite__column_checksum(checksum, stmt_info, 6,
- result_pool);
- if (err2 != NULL)
- err = svn_error_compose_create(
- err,
- svn_error_createf(
- err->apr_err, err2,
- _("The node '%s' has a corrupt checksum value."),
- path_for_error_message(wcroot, local_relpath,
- scratch_pool)));
+ err = svn_error_compose_create(
+ err, svn_sqlite__column_checksum(checksum, stmt_info, 6,
+ result_pool));
}
}
if (recorded_size)
@@ -6922,6 +6914,12 @@ read_info(svn_wc__db_status_t *status,
if (stmt_act != NULL)
err = svn_error_compose_create(err, svn_sqlite__reset(stmt_act));
+ if (err && err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
+ err = svn_error_quick_wrap(err,
+ apr_psprintf(scratch_pool,
+ "Error reading node '%s'",
+ local_relpath));
+
SVN_ERR(svn_error_compose_create(err, svn_sqlite__reset(stmt_info)));
return SVN_NO_ERROR;