Improved quality, by fixing issues detected by Coverity Scan:

	-CID 984487: BUFFER_SIZE_WARNING
	-CID 984488: BUFFER_SIZE_WARNING
	-CID 984489: BUFFER_SIZE_WARNING
	-CID 984490: CHECKED_RETURN
	-CID 984493: DEADCODE
	-CID 984504: NO_EFFECT

5 files changed, 20 insertions, 9 deletions

diff --git a/src/persistence_client_library.c b/src/persistence_client_library.c
index 9b285c1..02bd5c2 100644
--- a/src/persistence_client_library.c
+++ b/src/persistence_client_library.c
@@ -130,6 +130,8 @@ void pers_library_init(void)
 
    //printf("A p p l i c a t i o n   n a m e => %s \n", __progname /*program_invocation_short_name*/);   // TODO: only temp solution for application name
    strncpy(gAppId, __progname, MaxAppNameLen);
+   gAppId[MaxAppNameLen-1] = '\0';
+
    // destory mutex
    pthread_mutex_destroy(&gDbusInitializedMtx);
    pthread_cond_destroy(&gDbusInitializedCond);
diff --git a/src/persistence_client_library_custom_loader.c b/src/persistence_client_library_custom_loader.c
index bbb2024..d1f8a8d 100644
--- a/src/persistence_client_library_custom_loader.c
+++ b/src/persistence_client_library_custom_loader.c
@@ -163,7 +163,9 @@ int get_custom_libraries()
 
             // get the library name
             token  = strtok (NULL, delimiters);
-            strncpy(gCustomLibArray[i++], token, CustLibMaxLen);
+            strncpy(gCustomLibArray[i], token, CustLibMaxLen);
+            gCustomLibArray[i][CustLibMaxLen-1] = '\0'; // Ensures 0-Termination
+            i++;
 
             while( token != NULL )
             {
@@ -191,7 +193,9 @@ int get_custom_libraries()
                token  = strtok (NULL, delimiters);
                if(token != NULL)
                {
-                  strncpy(gCustomLibArray[i++], token, CustLibMaxLen);
+                  strncpy(gCustomLibArray[i], token, CustLibMaxLen);
+                  gCustomLibArray[i][CustLibMaxLen-1] = '\0'; // Ensures 0-Termination
+                  i++;
                }
                else
                {
diff --git a/src/persistence_client_library_db_access.c b/src/persistence_client_library_db_access.c
index 545f005..778cd03 100644
--- a/src/persistence_client_library_db_access.c
+++ b/src/persistence_client_library_db_access.c
@@ -515,7 +515,8 @@ int pers_db_cursor_create(char* dbPath)
 int pers_db_cursor_next(unsigned int handlerDB)
 {
    int rval = -1;
-   if(handlerDB < MaxPersHandle && handlerDB >= 0)
+   //if(handlerDB < MaxPersHandle && handlerDB >= 0)
+   if(handlerDB < MaxPersHandle )
    {
       if(gCursorArray[handlerDB].m_empty != 1)
       {
@@ -652,7 +653,13 @@ int pers_db_cursor_destroy(unsigned int handlerDB)
       itzam_btree_cursor_free(&gCursorArray[handlerDB].m_cursor);
       gCursorArray[handlerDB].m_empty = 1;
 
-      itzam_btree_close(&gCursorArray[handlerDB].m_btree);
+      itzam_state state = ITZAM_FAILED;
+      state = itzam_btree_close(&gCursorArray[handlerDB].m_btree);
+      if (state != ITZAM_OKAY)
+      {
+            fprintf(stderr, "pers_db_cursor_destroy ==> Close: Itzam problem: %s\n", STATE_MESSAGES[state]);
+      }
+
       close_cursor_handle(handlerDB);
 
       rval = 0;
diff --git a/src/persistence_client_library_dbus_service.c b/src/persistence_client_library_dbus_service.c
index dcf77eb..2fc6473 100644
--- a/src/persistence_client_library_dbus_service.c
+++ b/src/persistence_client_library_dbus_service.c
@@ -394,10 +394,6 @@ int mainLoop(DBusObjectPathVTable vtable, DBusObjectPathVTable vtable2,
                                           break;
                                     }
                                  }
-                                 else
-                                 {
-                                    printf("read() returned %d \n", ret);
-                                 }
                               }
                            }
                            else
diff --git a/src/persistence_client_library_key.c b/src/persistence_client_library_key.c
index 0d92a73..f4f4949 100644
--- a/src/persistence_client_library_key.c
+++ b/src/persistence_client_library_key.c
@@ -81,7 +81,9 @@ int pclKeyHandleOpen(unsigned int ldbid, const char* resource_id, unsigned int u
          {
             // remember data in handle array
             strncpy(gHandleArray[handle].dbPath, dbPath, DbPathMaxLen);
-            strncpy(gHandleArray[handle].dbKey, dbKey,   DbKeyMaxLen);
+            strncpy(gHandleArray[handle].dbKey,  dbKey,  DbKeyMaxLen);
+            gHandleArray[handle].dbPath[DbPathMaxLen-1] = '\0'; // Ensures 0-Termination
+            gHandleArray[handle].dbKey[ DbPathMaxLen-1] = '\0'; // Ensures 0-Termination
             gHandleArray[handle].info = dbContext;
          }
          else