From 1bf2db24f2b5fd4aea815a2d3aa2d713117ffe93 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 2 Nov 2017 11:48:39 +0000 Subject: [PATCH] Moved memset to after check for null memory pointer --- src/osgPlugins/md2/ReaderWriterMD2.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osgPlugins/md2/ReaderWriterMD2.cpp b/src/osgPlugins/md2/ReaderWriterMD2.cpp index c10399520..f2dc98909 100644 --- a/src/osgPlugins/md2/ReaderWriterMD2.cpp +++ b/src/osgPlugins/md2/ReaderWriterMD2.cpp @@ -166,13 +166,14 @@ load_md2 (const char *filename, const osgDB::ReaderWriter::Options* options) } mapbase = malloc (st.st_size+1); - memset(mapbase, 0, st.st_size+1); if (!mapbase) { close (file_fd); return NULL; } + memset(mapbase, 0, st.st_size+1); + if (read(file_fd, mapbase, st.st_size) != st.st_size) { close (file_fd);