Skip to content

Commit e738687

Browse files
authored
Merge pull request hpcc-systems#19544 from streeterd/HPCC-33475_Return_nullptr_instead_of_zero_for_pointer_function_reserveTruncate
HPCC-33475 Return nullptr for empty buffer Reviewed-by: Jake Smith <jake.smith@lexisnexisrisk.com> Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
2 parents bd95a9b + 174c525 commit e738687

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

system/jlib/jbuff.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,11 @@ void * MemoryBuffer::reserveTruncate(unsigned size)
354354
unsigned newLen = checkMemoryBufferOverflow(curLen, size);
355355
curLen += size;
356356
_reallocExact(newLen);
357-
truncate();
358-
return buffer + curLen - size;
357+
truncate(); // can set buffer to null.
358+
if (buffer)
359+
return buffer + curLen - size;
360+
else
361+
return nullptr;
359362
}
360363

361364
void MemoryBuffer::truncate()

0 commit comments

Comments
 (0)