//\r
// Return an error if buffer is too small\r
//\r
- if (SizeOfNvStore > *ImageLength) {\r
+ if (SizeOfNvStore > *ImageLength || DefaultImage == NULL) {\r
gBS->FreePool (OldData);\r
*ImageLength = (UINT16) SizeOfNvStore;\r
return EFI_BUFFER_TOO_SMALL;\r