From aabaf69bcda79a839d074f56f98032d78c88c928 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Sat, 16 Jan 2016 12:00:11 +0100
Subject: [PATCH] [g2clib] Fix redundant nullptr check when freeing memory

---
 src/plugins/weatherdata/gfs/g2clib/g2_unpack3.c | 2 +-
 src/plugins/weatherdata/gfs/g2clib/g2_unpack4.c | 2 +-
 src/plugins/weatherdata/gfs/g2clib/g2_unpack5.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/weatherdata/gfs/g2clib/g2_unpack3.c b/src/plugins/weatherdata/gfs/g2clib/g2_unpack3.c
index 2d97bb676..c8667f850 100644
--- a/src/plugins/weatherdata/gfs/g2clib/g2_unpack3.c
+++ b/src/plugins/weatherdata/gfs/g2clib/g2_unpack3.c
@@ -124,7 +124,7 @@ g2int g2_unpack3(unsigned char *cgrib,g2int *iofst,g2int **igds,g2int **igdstmpl
               ierr=6;
               *mapgridlen=0;
               *igdstmpl=0;    //NULL
-              if( mapgrid != 0 ) free(mapgrid);
+              free(mapgrid);
               return(ierr);
            }
            else {
diff --git a/src/plugins/weatherdata/gfs/g2clib/g2_unpack4.c b/src/plugins/weatherdata/gfs/g2clib/g2_unpack4.c
index 524549d0b..608f39894 100644
--- a/src/plugins/weatherdata/gfs/g2clib/g2_unpack4.c
+++ b/src/plugins/weatherdata/gfs/g2clib/g2_unpack4.c
@@ -105,7 +105,7 @@ g2int g2_unpack4(unsigned char *cgrib,g2int *iofst,g2int *ipdsnum,g2int **ipdstm
          ierr=6;
          *mappdslen=0;
          *ipdstmpl=0;     //NULL
-         if ( mappds != 0 ) free(mappds);
+         free(mappds);
          return(ierr);
       }
       else {
diff --git a/src/plugins/weatherdata/gfs/g2clib/g2_unpack5.c b/src/plugins/weatherdata/gfs/g2clib/g2_unpack5.c
index 978c12829..27e9a55cd 100644
--- a/src/plugins/weatherdata/gfs/g2clib/g2_unpack5.c
+++ b/src/plugins/weatherdata/gfs/g2clib/g2_unpack5.c
@@ -96,7 +96,7 @@ g2int g2_unpack5(unsigned char *cgrib,g2int *iofst,g2int *ndpts,g2int *idrsnum,
          ierr=6;
          *mapdrslen=0;
          *idrstmpl=0;     //NULL
-         if ( mapdrs != 0 ) free(mapdrs);
+         free(mapdrs);
          return(ierr);
       }
       else {