Merge remote-tracking branch 'origin/candidate-9.2.x' into candidate-…

…9.4.x Signed-off-by: Jake Smith <jake.smith@lexisnexisrisk.com> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Nov 17, 2023 · e557d19 · e557d19
2 parents f1df0f2 + b59abdc
commit e557d19
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/system/jlib/jfile.cpp b/system/jlib/jfile.cpp
@@ -7711,10 +7711,10 @@ class CBlockedFileIO : public CSimpleInterfaceOf<IFileIO>
             offset_t readPos = (pos / blockSize) * blockSize; // NB: could be beyond end of file
             if (readPos != lastReadPos)
             {
-                readLen = io->read(readPos, blockSize, buffer); // NB: can be less than blockSize (and 0 if beyodn end of file)
+                readLen = io->read(readPos, blockSize, buffer); // NB: can be less than blockSize (and 0 if beyond end of file)
                 lastReadPos = readPos;
             }
-            size32_t endPos = readPos+readLen;
+            offset_t endPos = readPos+readLen;
             size32_t copyNow;
             if (pos+len <= endPos) // common case hopefully
                 copyNow = len;