MDEV-28719: compress_write() leaks data_mutex on error

1 files changed, 11 insertions, 12 deletions

diff --git a/extra/mariabackup/ds_compress.cc b/extra/mariabackup/ds_compress.cc
index dcfb3d5a82f..39a72cdca34 100644
--- a/extra/mariabackup/ds_compress.cc
+++ b/extra/mariabackup/ds_compress.cc
@@ -238,25 +238,24 @@ compress_write(ds_file_t *file, const uchar *buf, size_t len)
 
 			xb_a(threads[i].to_len > 0);
 
-			if (ds_write(dest_file, "NEWBNEWB", 8) ||
-			    write_uint64_le(dest_file,
-					    comp_file->bytes_processed)) {
-				msg("compress: write to the destination stream "
-				    "failed.");
-				return 1;
+			bool fail = ds_write(dest_file, "NEWBNEWB", 8) ||
+				write_uint64_le(dest_file,
+						comp_file->bytes_processed);
+			comp_file->bytes_processed += threads[i].from_len;
+
+			if (!fail) {
+				fail = write_uint32_le(dest_file, threads[i].adler) ||
+					ds_write(dest_file, threads[i].to,
+						 threads[i].to_len);
 			}
 
-			comp_file->bytes_processed += threads[i].from_len;
+			pthread_mutex_unlock(&threads[i].data_mutex);
 
-			if (write_uint32_le(dest_file, threads[i].adler) ||
-			    ds_write(dest_file, threads[i].to,
-					   threads[i].to_len)) {
+			if (fail) {
 				msg("compress: write to the destination stream "
 				    "failed.");
 				return 1;
 			}
-
-			pthread_mutex_unlock(&threads[i].data_mutex);
 		}
 	}