libvips
diff --git a/‎ChangeLog
+4-1 b/‎ChangeLog
+4-1
diff --git a/‎libvips/foreign/heifsave.c
+9-3 b/‎libvips/foreign/heifsave.c
+9-3
@@ -27,8 +27,11 @@ master 8.16
 
 8.15.4
 
-- heifsave: fix crash when passing an invalid bitdepth
 - fix an off-by-one error in vips__token_get()
+- heifsave: fix crash when passing an invalid bitdepth [kleisauke]
+- webpsave: fix memory leak on error [dloebl]
+- heifsave: ensure NCLX profile is freed in lossless mode [kleisauke]
+- threadpool: fix a race condition in error handling [kleisauke]
 
 11/8/24 8.15.3
 
 
@@ -270,6 +270,9 @@ vips_foreign_save_heif_write_page(VipsForeignSaveHeif *heif, int page)
 
 	struct heif_error error;
 	struct heif_encoding_options *options;
+#ifdef HAVE_HEIF_ENCODING_OPTIONS_OUTPUT_NCLX_PROFILE
+	struct heif_color_profile_nclx *nclx = NULL;
+#endif
 
 #ifdef HAVE_HEIF_COLOR_PROFILE
 	/* A profile supplied as an argument overrides an embedded
@@ -294,10 +297,10 @@ vips_foreign_save_heif_write_page(VipsForeignSaveHeif *heif, int page)
 	 * mode.
 	 */
 	if (heif->lossless) {
-		struct heif_color_profile_nclx *nclx;
-
-		if (!(nclx = heif_nclx_color_profile_alloc()))
+		if (!(nclx = heif_nclx_color_profile_alloc())) {
+			heif_encoding_options_free(options);
 			return -1;
+		}
 
 		nclx->matrix_coefficients = heif_matrix_coefficients_RGB_GBR;
 		options->output_nclx_profile = nclx;
@@ -326,6 +329,9 @@ vips_foreign_save_heif_write_page(VipsForeignSaveHeif *heif, int page)
 #endif /*DEBUG*/
 
 	heif_encoding_options_free(options);
+#ifdef HAVE_HEIF_ENCODING_OPTIONS_OUTPUT_NCLX_PROFILE
+	VIPS_FREEF(heif_nclx_color_profile_free, nclx);
+#endif
 
 	if (error.code) {
 		vips__heif_error(&error);