Author: hwright
Date: Mon Jun 6 20:01:10 2011
New Revision: 1132739
URL: http://svn.apache.org/viewvc?rev=1132739&view=rev
Log:
Avoid a potential null-pointer dereference in an error path.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_read_pristine_info): Only attempt to recreate an error if it
exists, otherwise just use an existing 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=1132739&r1=1132738&r2=1132739&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Jun 6 20:01:10 2011
@@ -7026,13 +7026,18 @@ svn_wc__db_read_pristine_info(svn_wc__db
err2 = svn_sqlite__column_checksum(checksum, stmt, 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)));
+ {
+ if (err)
+ 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)));
+ else
+ err = err2;
+ }
}
}
if (target)
