Memory leak

src/grib_accessor_class_proj_string.c

@@ -0,0 +1,177 @@
+/*
+ * (C) Copyright 2005- ECMWF.
+ *
+ * This software is licensed under the terms of the Apache Licence Version 2.0
+ * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+ * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+ */
+
+#include "grib_api_internal.h"
+/*
+   This is used by make_class.pl
+
+   START_CLASS_DEF
+   CLASS      = accessor
+   SUPER      = grib_accessor_class_gen
+   IMPLEMENTS = get_native_type;init
+   IMPLEMENTS = unpack_string;value_count
+   MEMBERS = const char* grid_type
+   END_CLASS_DEF
+
+ */
+
+/* START_CLASS_IMP */
+
+/*
+
+Don't edit anything between START_CLASS_IMP and END_CLASS_IMP
+Instead edit values between START_CLASS_DEF and END_CLASS_DEF
+or edit "accessor.class" and rerun ./make_class.pl
+
+*/
+
+static int get_native_type(grib_accessor*);
+static int unpack_string(grib_accessor*, char*, size_t* len);
+static int value_count(grib_accessor*, long*);
+static void init(grib_accessor*, const long, grib_arguments*);
+static void init_class(grib_accessor_class*);
+
+typedef struct grib_accessor_proj_string
+{
+    grib_accessor att;
+    /* Members defined in gen */
+    /* Members defined in proj_string */
+    const char* grid_type;
+} grib_accessor_proj_string;
+
+extern grib_accessor_class* grib_accessor_class_gen;
+
+static grib_accessor_class _grib_accessor_class_proj_string = {
+    &grib_accessor_class_gen,                      /* super                     */
+    "proj_string",                      /* name                      */
+    sizeof(grib_accessor_proj_string),  /* size                      */
+    0,                           /* inited */
+    &init_class,                 /* init_class */
+    &init,                       /* init                      */
+    0,                  /* post_init                      */
+    0,                    /* free mem                       */
+    0,                       /* describes himself         */
+    0,                /* get length of section     */
+    0,              /* get length of string      */
+    &value_count,                /* get number of values      */
+    0,                 /* get number of bytes      */
+    0,                /* get offset to bytes           */
+    &get_native_type,            /* get native type               */
+    0,                /* get sub_section                */
+    0,               /* grib_pack procedures long      */
+    0,                 /* grib_pack procedures long      */
+    0,                  /* grib_pack procedures long      */
+    0,                /* grib_unpack procedures long    */
+    0,                /* grib_pack procedures double    */
+    0,              /* grib_unpack procedures double  */
+    0,                /* grib_pack procedures string    */
+    &unpack_string,              /* grib_unpack procedures string  */
+    0,          /* grib_pack array procedures string    */
+    0,        /* grib_unpack array procedures string  */
+    0,                 /* grib_pack procedures bytes     */
+    0,               /* grib_unpack procedures bytes   */
+    0,            /* pack_expression */
+    0,              /* notify_change   */
+    0,                /* update_size   */
+    0,             /* preferred_size   */
+    0,                     /* resize   */
+    0,      /* nearest_smaller_value */
+    0,                       /* next accessor    */
+    0,                    /* compare vs. another accessor   */
+    0,      /* unpack only ith value          */
+    0,     /* unpack a subarray         */
+    0,                      /* clear          */
+    0,                 /* clone accessor          */
+};
+
+
+grib_accessor_class* grib_accessor_class_proj_string = &_grib_accessor_class_proj_string;
+
+
+static void init_class(grib_accessor_class* c)
+{
+    c->dump    =    (*(c->super))->dump;
+    c->next_offset    =    (*(c->super))->next_offset;
+    c->string_length    =    (*(c->super))->string_length;
+    c->byte_count    =    (*(c->super))->byte_count;
+    c->byte_offset    =    (*(c->super))->byte_offset;
+    c->sub_section    =    (*(c->super))->sub_section;
+    c->pack_missing    =    (*(c->super))->pack_missing;
+    c->is_missing    =    (*(c->super))->is_missing;
+    c->pack_long    =    (*(c->super))->pack_long;
+    c->unpack_long    =    (*(c->super))->unpack_long;
+    c->pack_double    =    (*(c->super))->pack_double;
+    c->unpack_double    =    (*(c->super))->unpack_double;
+    c->pack_string    =    (*(c->super))->pack_string;
+    c->pack_string_array    =    (*(c->super))->pack_string_array;
+    c->unpack_string_array    =    (*(c->super))->unpack_string_array;
+    c->pack_bytes    =    (*(c->super))->pack_bytes;
+    c->unpack_bytes    =    (*(c->super))->unpack_bytes;
+    c->pack_expression    =    (*(c->super))->pack_expression;
+    c->notify_change    =    (*(c->super))->notify_change;
+    c->update_size    =    (*(c->super))->update_size;
+    c->preferred_size    =    (*(c->super))->preferred_size;
+    c->resize    =    (*(c->super))->resize;
+    c->nearest_smaller_value    =    (*(c->super))->nearest_smaller_value;
+    c->next    =    (*(c->super))->next;
+    c->compare    =    (*(c->super))->compare;
+    c->unpack_double_element    =    (*(c->super))->unpack_double_element;
+    c->unpack_double_subarray    =    (*(c->super))->unpack_double_subarray;
+    c->clear    =    (*(c->super))->clear;
+    c->make_clone    =    (*(c->super))->make_clone;
+}
+
+/* END_CLASS_IMP */
+
+static void init(grib_accessor* a, const long len, grib_arguments* arg)
+{
+    grib_accessor_proj_string* self   = (grib_accessor_proj_string*)a;
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    self->grid_type  = grib_arguments_get_name(h, arg, 0);
+    a->length = 0;
+    a->flags |= GRIB_ACCESSOR_FLAG_READ_ONLY;
+    a->flags |= GRIB_ACCESSOR_FLAG_EDITION_SPECIFIC;
+}
+
+static int get_native_type(grib_accessor* a)
+{
+    return GRIB_TYPE_STRING;
+}
+
+static int unpack_string(grib_accessor* a, char* v, size_t* len)
+{
+    grib_accessor_proj_string* self = (grib_accessor_proj_string*)a;
+    int err = 0;
+    size_t size = 64;
+    char grid_type[512] = {0,};
+    grib_handle* h = grib_handle_of_accessor(a);
+
+    err = grib_get_string(h, self->grid_type, grid_type, &size);
+    if (err) return err;
+    
+    if (strcmp(grid_type, "mercator") == 0) {
+        sprintf(v, "%s", "mercator proj string");
+    }
+    else {
+        grib_context_log(a->context, GRIB_LOG_ERROR, "proj string for grid '%s' not implemented", grid_type);
+        *len = 0;
+        return GRIB_NOT_IMPLEMENTED;
+    }
+    
+    *len = strlen(v)+1;
+    return err;
+}
+
+static int value_count(grib_accessor* a, long* count)
+{
+    *count = 16;
+    return 0;
+}

tools/grib_tools.c

@@ -978,8 +978,10 @@ static int get_initial_element_of_array(grib_handle* h, const char* keyName, siz
             sval = (char*)grib_context_malloc(c, len * sizeof(char));
             if (!sval)
                 return GRIB_OUT_OF_MEMORY;
-            if ((err = grib_get_string(h, keyName, sval, &len)) != GRIB_SUCCESS)
+            if ((err = grib_get_string(h, keyName, sval, &len)) != GRIB_SUCCESS) {
+                free(sval);
                 return err;
+            }
             sprintf(value, "%s", sval);
             free(sval);
             break;