Changeset: c4b0650d49be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c4b0650d49be
Modified Files:
        tools/monetdbe/monetdbe.c
        tools/monetdbe/monetdbe.h
Branch: default
Log Message:

Compilation and memory leak fixes


diffs (36 lines):

diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -254,6 +254,7 @@ monetdbe_destroy_column(monetdbe_column*
                                GDKfree(data[j].data);
                }
        }
+       GDKfree(column->type.sql_type);
        GDKfree(column->data);
        GDKfree(column);
 }
@@ -1924,8 +1925,8 @@ GENERATE_BASE_HEADERS(monetdbe_data_time
        }                                                                       
                                                                \
        bat_data->type.type = monetdbe_##tpe;                                   
                        \
        if ((bat_data->type.sql_type = GDKstrdup(sqltpe->type->base.name)) == 
NULL) {\
-                               set_error(mdbe, createException(MAL, 
"monetdbe.monetdbe_result_fetch", MAL_MALLOC_FAIL)); \
-                               goto cleanup;                                   
                                                \
+               set_error(mdbe, createException(MAL, 
"monetdbe.monetdbe_result_fetch", MAL_MALLOC_FAIL)); \
+               goto cleanup;                                                   
                                \
        }                                                                       
                                                                \
        bat_data->type.scale = sqltpe->scale;                                   
                        \
        bat_data->type.digits = sqltpe->digits;                                 
                        \
diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h
--- a/tools/monetdbe/monetdbe.h
+++ b/tools/monetdbe/monetdbe.h
@@ -68,8 +68,8 @@ typedef enum  {
 typedef struct {
        monetdbe_types type;
        char* sql_type;
-       size_t scale;
-       size_t digits;
+       unsigned int scale;
+       unsigned int digits;
 } monetdbe_type;
 
 typedef struct {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to