X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/a95be497452fac9dc598e7e6d8500f90a7d3cbef..64d557a287f0e695856d6bc579293b399b8a07ea:/src/dem.c

diff --git a/src/dem.c b/src/dem.c
index 66085671..9c86a052 100644
--- a/src/dem.c
+++ b/src/dem.c
@@ -19,11 +19,21 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <glib.h>
+#ifdef HAVE_MATH_H
 #include <math.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 #include <zlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -431,8 +441,10 @@ VikDEM *vik_dem_new_from_file(const gchar *file)
 
       /* Header */
   f = g_fopen(file, "r");
-  if ( !f )
+  if ( !f ) {
+    g_free ( rv );
     return NULL;
+  }
   buffer[fread(buffer, 1, DEM_BLOCK_SIZE, f)] = '\0';
   if ( ! dem_parse_header ( buffer, rv ) ) {
     g_free ( rv );