From 32b028e5a65d0a4f84fcf89f544d8e578f04f4d8 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 31 Aug 2015 17:11:16 +0200 Subject: [PATCH] If elems count is 0 when reading array, set resulting pointer to NULL --- renderdoc/serialise/serialiser.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/renderdoc/serialise/serialiser.h b/renderdoc/serialise/serialiser.h index 328823943..f703a7353 100644 --- a/renderdoc/serialise/serialiser.h +++ b/renderdoc/serialise/serialiser.h @@ -364,11 +364,14 @@ class Serialiser { ReadInto(numElems); - if(el == NULL) el = new T[numElems]; + if(numElems > 0) + { + if(el == NULL) el = new T[numElems]; - size_t length = numElems*sizeof(T); + size_t length = numElems*sizeof(T); - memcpy(el, ReadBytes(length), length); + memcpy(el, ReadBytes(length), length); + } } Num = (size_t)numElems;