HPCC-35956 Improve the error reporting when cannot read enough data

ghalliday · ghalliday · commit fbe89a97d476 · 2026-03-06T10:48:15.000Z
Signed-off-by: Gavin Halliday &lt;gavin.halliday@lexisnexis.com&gt;
diff --git a/rtl/eclrtl/rtlcommon.hpp b/rtl/eclrtl/rtlcommon.hpp
@@ -4,6 +4,7 @@
 
 #include "jiface.hpp"
 #include "jfile.hpp"
+#include "jexcept.hpp"
 #include "eclrtl.hpp"
 #include "eclhelper.hpp"
 
@@ -134,7 +135,8 @@ class ECLRTL_API CThorContiguousRowBuffer : public CContiguousRowBuffer, impleme
         if (required > maxAvailable())
         {
             peekBytesDirect(required);
-            assertex(required <= maxAvailable());
+            if (unlikely(required > maxAvailable()))
+                throw makeStringExceptionV(0, "Required %u bytes, but only %u available (row offset %u file offset %llu)", required, (unsigned)maxAvailable(), readOffset, tell() + readOffset);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`#include "jiface.hpp"`
`6`	`6`	`#include "jfile.hpp"`
	`7`	`+#include "jexcept.hpp"`
`7`	`8`	`#include "eclrtl.hpp"`
`8`	`9`	`#include "eclhelper.hpp"`
`9`	`10`
`@@ -134,7 +135,8 @@ class ECLRTL_API CThorContiguousRowBuffer : public CContiguousRowBuffer, impleme`
`134`	`135`	`if (required > maxAvailable())`
`135`	`136`	`{`
`136`	`137`	`peekBytesDirect(required);`
`137`		`- assertex(required <= maxAvailable());`
	`138`	`+ if (unlikely(required > maxAvailable()))`
	`139`	`+ throw makeStringExceptionV(0, "Required %u bytes, but only %u available (row offset %u file offset %llu)", required, (unsigned)maxAvailable(), readOffset, tell() + readOffset);`
`138`	`140`	`}`
`139`	`141`	`}`
`140`	`142`