Merge topic 'dev/gdal-image-io-null-md'

chetnieter · kwrobot · commit af3554f1fbe3 · 2025-06-18T12:04:02.000-04:00
017285e Prevent segfault when saving image with null metadata Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !194
diff --git a/arrows/gdal/image_io.cxx b/arrows/gdal/image_io.cxx
@@ -252,8 +252,9 @@ ::save_( const std::string& filename, vital::image_container_sptr data ) const
     }
   }
 
-  if( auto const& corners_entry =
-        metadata->find( vital::VITAL_META_CORNER_POINTS ) )
+  vital::metadata_item corners_entry{ vital::VITAL_META_UNKNOWN, 0 };
+  if( metadata &&
+      ( corners_entry = metadata->find( vital::VITAL_META_CORNER_POINTS ) ) )
   {
     auto const points =
       corners_entry
diff --git a/doc/release-notes/master.txt b/doc/release-notes/master.txt
@@ -6,3 +6,7 @@ Updates
 
 Bug Fixes
 ---------
+
+Arrows: GDAL
+
+* Prevented segfault when saving image with null metadata.

Original file line number	Diff line number	Diff line change
`@@ -252,8 +252,9 @@ ::save_( const std::string& filename, vital::image_container_sptr data ) const`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`- if( auto const& corners_entry =`
`256`		`- metadata->find( vital::VITAL_META_CORNER_POINTS ) )`
	`255`	`+ vital::metadata_item corners_entry{ vital::VITAL_META_UNKNOWN, 0 };`
	`256`	`+ if( metadata &&`
	`257`	`+ ( corners_entry = metadata->find( vital::VITAL_META_CORNER_POINTS ) ) )`
`257`	`258`	`{`
`258`	`259`	`auto const points =`
`259`	`260`	`corners_entry`