Fix memory leak

Debug statement in inventory_conn caused memory leak because I did not
read documentation detailed enough, and forgot to free memory. Also, fix
some compile warnings and valgrind warnings about unitialized variables.

Author: kristrev

CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 2.6)
 project(meta_exporter)
 
-set(CMAKE_C_FLAGS "-O1 -Wall -std=gnu99 -g -s")
+set(CMAKE_C_FLAGS "-O1 -Wall -std=gnu99 -g")
 
 set(LIBS pthread mnl)
 set(SOURCE

metadata_input_zeromq.c

@@ -238,19 +238,26 @@ static void md_input_zeromq_handle_event(void *ptr, int32_t fd, uint32_t events)
     int zmq_events = 0;
     size_t events_len = sizeof(zmq_events);
     json_object *json_event = NULL, *zmqh_obj = NULL;
-    const char *json_msg;
+    const char *json_msg = NULL, *json_str;
     uint8_t event_type = 0;
 
     zmq_getsockopt(miz->zmq_socket, ZMQ_EVENTS, &zmq_events, &events_len);
 
     while (zmq_events & ZMQ_POLLIN)
     {
         char buf[2048] = {0};
-        zmq_recv(miz->zmq_socket, buf, 2048, 0);
+        int nbytes = zmq_recv(miz->zmq_socket, buf, 2047, 0);
+
+        if (nbytes == -1) {
+            zmq_getsockopt(miz->zmq_socket, ZMQ_EVENTS, &zmq_events, &events_len);
+            continue;
+        }
+
+        //Ensure zero teminated string, in case zmq does something funky with buffer
+        buf[nbytes] = '\0';
 
         json_msg = strchr(buf, '{');
-        if (json_msg == NULL)
-        {
+        if (json_msg == NULL) {
             zmq_getsockopt(miz->zmq_socket, ZMQ_EVENTS, &zmq_events, &events_len);
             continue;
         }
@@ -289,7 +296,8 @@ static void md_input_zeromq_handle_event(void *ptr, int32_t fd, uint32_t events)
             return;
         }
 
-        META_PRINT(miz->parent->logfile, "Got JSON %s\n", json_object_to_json_string(zmqh_obj));
+        json_str = json_object_to_json_string(zmqh_obj);
+        META_PRINT(miz->parent->logfile, "Got JSON %s\n", json_str);
 
         switch (event_type) {
             case META_TYPE_INTERFACE:

metadata_writer_file.c

@@ -51,14 +51,14 @@ static int md_file_add_json_string(struct json_object *obj,
 {
     struct json_object *value_obj = NULL;
 
-    if (value != NULL)
-    {
+    if (value != NULL) {
         value_obj = json_object_new_string(value);
         if (!value_obj)
             return RETVAL_FAILURE;
+
+	json_object_object_add(obj, key, value_obj);
     }
 
-    json_object_object_add(obj, key, value_obj);
     return RETVAL_SUCCESS;
 }
 
@@ -79,7 +79,7 @@ static int md_file_add_json_obj(struct json_object *obj,
 static int md_file_save(struct md_writer_file *mwf, int event_type, const char *content)
 {
     int output_fd;
-    char dst_filename[128] = {0};
+    char dst_filename[133] = {0};
     char *prefix;
     FILE *output;
 

metadata_writer_inventory_conn.c

@@ -284,6 +284,8 @@ static int32_t md_inventory_execute_update_usage(struct md_writer_sqlite *mws,
                                               uint64_t date_start)
 {
     const char *no_iccid_str = "0";
+    char *sql_stmt_str;
+
     sqlite3_stmt *stmt = mws->update_usage;
 
     sqlite3_clear_bindings(stmt);
@@ -319,7 +321,12 @@ static int32_t md_inventory_execute_update_usage(struct md_writer_sqlite *mws,
         }
     }
 
-    META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Update query: %s\n", sqlite3_expanded_sql(stmt));
+    sql_stmt_str = sqlite3_expanded_sql(stmt);
+
+    if (sql_stmt_str) {
+        META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Update query: %s\n", sql_stmt_str);
+        sqlite3_free(sql_stmt_str);
+    }
 
     return sqlite3_step(stmt);
 }

system_helpers.c

@@ -45,18 +45,17 @@
 #ifdef OPENWRT
 uint32_t system_helpers_get_nodeid()
 {
-    char *opt;
-    struct uci_ptr uciptr;
+    char *opt = NULL;
+    struct uci_ptr uciptr = {0};
     int retval;
     long node_id;
     struct uci_context *ctx = uci_alloc_context();
 
-    if(ctx == NULL)
+    if (ctx == NULL)
         return 0;
 
-    opt = malloc(strlen(NODEIDPATH)+1);
+    opt = calloc(strlen(NODEIDPATH)+1, 1);
     strcpy(opt, NODEIDPATH);
-    memset(&uciptr, 0, sizeof(uciptr));
 
     retval = uci_lookup_ptr(ctx, &uciptr, opt, true);