Merge pull request #1782 from daniel-riehm/dev/klv-too-large-int-warning

Allow writing too-large integers with a warning
Kitware · Jun 21, 2023 · 7435252 · 7435252
2 parents 1994b83 + 5b8038e
commit 7435252
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/arrows/klv/klv_data_format.cxx b/arrows/klv/klv_data_format.cxx
@@ -238,7 +238,8 @@ size_t
 klv_uint_format
 ::length_of_typed( uint64_t const& value ) const
 {
-  return m_length_constraints.fixed_or( klv_int_length( value ) );
+  auto const int_length = klv_int_length( value );
+  return std::max( m_length_constraints.fixed_or( 1 ), int_length );
 }
 
 // ----------------------------------------------------------------------------
@@ -277,7 +278,8 @@ size_t
 klv_sint_format
 ::length_of_typed( int64_t const& value ) const
 {
-  return m_length_constraints.fixed_or( klv_int_length( value ) );
+  auto const int_length = klv_int_length( value );
+  return std::max( m_length_constraints.fixed_or( 1 ), int_length );
 }
 
 // ----------------------------------------------------------------------------

diff --git a/doc/release-notes/master.txt b/doc/release-notes/master.txt
@@ -38,5 +38,6 @@ Arrows: KLV
 
 * Implemented metadata_map_io_csv.load_().
 
-* Modified flint/IMAP behavior to print a warning when writing values with
-  incorrect lengths instead of correcting the length and possibly losing data.
+* Modified flint, IMAP, and integer behavior to print a warning when writing
+  values with incorrect lengths instead of correcting the length and possibly
+  losing data.