Author: kotkov
Date: Tue Nov 29 10:07:24 2022
New Revision: 1905600

URL: http://svn.apache.org/viewvc?rev=1905600&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Ensure that the hydrated pristine
contents has the expected checksum before completing its install it into the
pristine store.

* subversion/libsvn_wc/wc_db_textbase.c
  (textbase_hydrate): Compare expected and actual checksums.

Modified:
    
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c

Modified: 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c?rev=1905600&r1=1905599&r2=1905600&view=diff
==============================================================================
--- 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
 (original)
+++ 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc_db_textbase.c
 Tue Nov 29 10:07:24 2022
@@ -196,6 +196,16 @@ textbase_hydrate(svn_wc__db_t *db,
     return svn_error_compose_create(err,
              svn_wc__db_pristine_install_abort(install_data, scratch_pool));
 
+  if (!svn_checksum_match(checksum, install_sha1_checksum))
+    {
+      err = svn_checksum_mismatch_err(
+              checksum, install_sha1_checksum, scratch_pool,
+              _("Checksum mismatch while fetching text base"));
+
+      return svn_error_compose_create(err,
+               svn_wc__db_pristine_install_abort(install_data, scratch_pool));
+    }
+
   err = svn_wc__db_pristine_install(install_data,
                                     install_sha1_checksum,
                                     install_md5_checksum,


Reply via email to