commit fc3816d11747d0bdf205724cad7de56d51b4fcb7
from: Stefan Sperling <stsp@stsp.name>
date: Tue Jul 22 08:13:39 2025 UTC

avoid clobbering earlier errors in got_delta_apply and got_delta_apply_in_mem

ok op@

commit - ae784b42e06f525e360bf478bb382845f718fc09
commit + fc3816d11747d0bdf205724cad7de56d51b4fcb7
blob - 2c3f8c2ebcd41b76c90f5701a0b1ffc43fbdccc3
blob + d101d183c5835c655baa20b5ca59d7a24025c0be
--- lib/delta.c
+++ lib/delta.c
@@ -320,7 +320,7 @@ got_delta_apply_in_mem(uint8_t *base_buf, size_t base_
 		}
 	}
 
-	if (*outsize != result_size)
+	if (err == NULL && *outsize != result_size)
 		err = got_error_msg(GOT_ERR_BAD_DELTA,
 		    "delta application result size mismatch");
 	return err;
@@ -387,12 +387,12 @@ got_delta_apply(FILE *base_file, const uint8_t *delta_
 		}
 	}
 
-	if (*outsize != result_size)
+	if (err == NULL && *outsize != result_size)
 		err = got_error_msg(GOT_ERR_BAD_DELTA,
 		    "delta application result size mismatch");
 
 	if (memstream != NULL) {
-		if (fclose(memstream) == EOF)
+		if (fclose(memstream) == EOF && err == NULL)
 			err = got_error_from_errno("fclose");
 		if (err == NULL) {
 			size_t n;