Fix linking code after own recent commit.

More stupid mistake in recent enhanced reports for file load code,
rB82c17082ba0e left some read-after-free situations.

3 files changed, 13 insertions, 9 deletions

diff --git a/source/blender/blenloader/intern/blend_validate.c b/source/blender/blenloader/intern/blend_validate.c
index 0f729304128..5b093223fda 100644
--- a/source/blender/blenloader/intern/blend_validate.c
+++ b/source/blender/blenloader/intern/blend_validate.c
@@ -83,8 +83,8 @@ bool BLO_main_validate_libraries(Main *bmain, ReportList *reports)
     }
 
     BKE_library_filepath_set(bmain, curlib, curlib->filepath);
-    BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath_abs,
-                                                &(BlendFileReadReport){.reports = reports});
+    BlendFileReadReport bf_reports = {.reports = reports};
+    BlendHandle *bh = BLO_blendhandle_from_file(curlib->filepath_abs, &bf_reports);
 
     if (bh == NULL) {
       BKE_reportf(reports,
diff --git a/source/blender/blenloader/intern/readblenentry.c b/source/blender/blenloader/intern/readblenentry.c
index 1a324d56f06..44a26b9bf85 100644
--- a/source/blender/blenloader/intern/readblenentry.c
+++ b/source/blender/blenloader/intern/readblenentry.c
@@ -84,12 +84,13 @@ BlendHandle *BLO_blendhandle_from_file(const char *filepath, BlendFileReadReport
  * \param memsize: The size of the data.
  * \return A handle on success, or NULL on failure.
  */
-BlendHandle *BLO_blendhandle_from_memory(const void *mem, int memsize)
+BlendHandle *BLO_blendhandle_from_memory(const void *mem,
+                                         int memsize,
+                                         BlendFileReadReport *reports)
 {
   BlendHandle *bh;
 
-  bh = (BlendHandle *)blo_filedata_from_memory(
-      mem, memsize, &(BlendFileReadReport){.reports = NULL});
+  bh = (BlendHandle *)blo_filedata_from_memory(mem, memsize, reports);
 
   return bh;
 }
@@ -398,8 +399,9 @@ BlendFileData *BLO_read_from_memory(const void *mem,
 {
   BlendFileData *bfd = NULL;
   FileData *fd;
+  BlendFileReadReport bf_reports = {.reports = reports};
 
-  fd = blo_filedata_from_memory(mem, memsize, &(BlendFileReadReport){.reports = reports});
+  fd = blo_filedata_from_memory(mem, memsize, &bf_reports);
   if (fd) {
     fd->skip_flags = skip_flags;
     bfd = blo_read_file_internal(fd, "");
@@ -426,8 +428,9 @@ BlendFileData *BLO_read_from_memfile(Main *oldmain,
   BlendFileData *bfd = NULL;
   FileData *fd;
   ListBase old_mainlist;
+  BlendFileReadReport bf_reports = {.reports = reports};
 
-  fd = blo_filedata_from_memfile(memfile, params, &(BlendFileReadReport){.reports = reports});
+  fd = blo_filedata_from_memfile(memfile, params, &bf_reports);
   if (fd) {
     fd->skip_flags = params->skip_flags;
     BLI_strncpy(fd->relabase, filename, sizeof(fd->relabase));
diff --git a/source/blender/blenloader/intern/readfile_tempload.c b/source/blender/blenloader/intern/readfile_tempload.c
index f440a06acf8..1b1cbb29ef5 100644
--- a/source/blender/blenloader/intern/readfile_tempload.c
+++ b/source/blender/blenloader/intern/readfile_tempload.c
@@ -36,12 +36,13 @@ TempLibraryContext *BLO_library_temp_load_id(struct Main *real_main,
 {
   TempLibraryContext *temp_lib_ctx = MEM_callocN(sizeof(*temp_lib_ctx), __func__);
   temp_lib_ctx->bmain_base = BKE_main_new();
+  temp_lib_ctx->bf_reports.reports = reports;
 
   /* Copy the file path so any path remapping is performed properly. */
   STRNCPY(temp_lib_ctx->bmain_base->name, real_main->name);
 
-  temp_lib_ctx->blendhandle = BLO_blendhandle_from_file(
-      blend_file_path, &(BlendFileReadReport){.reports = reports});
+  temp_lib_ctx->blendhandle = BLO_blendhandle_from_file(blend_file_path,
+                                                        &temp_lib_ctx->bf_reports);
 
   BLO_library_link_params_init(
       &temp_lib_ctx->liblink_params, temp_lib_ctx->bmain_base, 0, LIB_TAG_TEMP_MAIN);