[Midnightbsd-cvs] src [7639] trunk/lib/libmport/pkgmeta.c: fix some merging issues

[laffer1 at midnightbsd.org]

Revision: 7639
          http://svnweb.midnightbsd.org/src/?rev=7639
Author:   laffer1
Date:     2016-06-25 20:18:17 -0400 (Sat, 25 Jun 2016)
Log Message:
-----------
fix some merging issues

Modified Paths:
--------------
    trunk/lib/libmport/pkgmeta.c

Modified: trunk/lib/libmport/pkgmeta.c
===================================================================
--- trunk/lib/libmport/pkgmeta.c	2016-06-26 00:05:42 UTC (rev 7638)
+++ trunk/lib/libmport/pkgmeta.c	2016-06-26 00:18:17 UTC (rev 7639)
@@ -349,7 +349,8 @@
 }  
 
 
-int mport_pkgmeta_get_assetlist(mportInstance *mport, mportPackageMeta *pkg, mportAssetList **alist_p)
+int
+mport_pkgmeta_get_assetlist(mportInstance *mport, mportPackageMeta *pkg, mportAssetList **alist_p)
 {
   mportAssetList *alist;
   sqlite3_stmt *stmt;
@@ -365,6 +366,9 @@
     sqlite3_finalize(stmt);
     RETURN_CURRENT_ERROR;
   }
+
+  if (stmt == NULL)
+	RETURN_CURRENT_ERROR;
     
   while (1) {
     ret = sqlite3_step(stmt);
@@ -383,13 +387,31 @@
       sqlite3_finalize(stmt);
       RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
     }
+
+    const unsigned char *data;
+    const unsigned char *owner;
+    const unsigned char *group;
+    const unsigned char *mode;
     
     e->type = sqlite3_column_int(stmt, 0);
-    e->data = strdup(sqlite3_column_text(stmt, 1));
-    e->owner = strdup(sqlite3_column_text(stmt, 2));
-    e->group = strdup(sqlite3_column_text(stmt, 3));
-    e->mode = strdup(sqlite3_column_text(stmt, 4));
-    
+    data = sqlite3_column_text(stmt, 1);
+    owner = sqlite3_column_text(stmt, 2);
+    group = sqlite3_column_text(stmt, 3);
+    mode = sqlite3_column_text(stmt, 4);
+     
+    if (data == NULL) {
+      sqlite3_finalize(stmt);
+      RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
+    }
+
+    e->data = strdup(data);
+    if (owner != NULL)
+        e->owner = strdup(owner);
+    if (group != NULL)
+        e->group = strdup(group);
+    if (mode != NULL)
+        e->mode = strdup(mode);
+
     if (e->data == NULL) {
       sqlite3_finalize(stmt);
       RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
@@ -399,6 +421,7 @@
   }
   
   sqlite3_finalize(stmt);
+
   return MPORT_OK;
 }
 
@@ -407,15 +430,27 @@
  *
  * Create an entry in the log table for this pkg (and version), using the given message.
  */
-int mport_pkgmeta_logevent(mportInstance *mport, mportPackageMeta *pkg, const char *msg) 
+int
+mport_pkgmeta_logevent(mportInstance *mport, mportPackageMeta *pkg, const char *msg) 
 {
-  struct timespec now;
+	struct timespec now;
   
-  if (clock_gettime(CLOCK_REALTIME, &now) != 0) {
-    RETURN_ERROR(MPORT_ERR_FATAL, strerror(errno));
-  }
+	if (clock_gettime(CLOCK_REALTIME, &now) != 0) {
+		RETURN_ERROR(MPORT_ERR_FATAL, strerror(errno));
+	}
+
+	if (pkg == NULL)
+		RETURN_ERROR(MPORT_ERR_FATAL, "pkg is null");
+
+	if (pkg->name == NULL || pkg->version == NULL)
+		RETURN_ERROR(MPORT_ERR_FATAL, "pkg is not initialized");
+
+	if (msg == NULL)
+		RETURN_ERROR(MPORT_ERR_WARN, "null message to log");
           
-  return mport_db_do(mport->db, "INSERT INTO log (pkg, version, date, msg) VALUES (%s,%s,%i,%s)", pkg->name, pkg->version, now.tv_sec, msg);
+	return mport_db_do(mport->db, 
+	  "INSERT INTO log (pkg, version, date, msg) VALUES (%s,%s,%i,%s)", 
+		pkg->name, pkg->version, now.tv_sec, msg);
 }