[Midnightbsd-cvs] src [7505] trunk/lib/libmport/delete_primative.c: sanity check checksums

[laffer1 at midnightbsd.org]

Revision: 7505
          http://svnweb.midnightbsd.org/src/?rev=7505
Author:   laffer1
Date:     2016-04-08 22:36:27 -0400 (Fri, 08 Apr 2016)
Log Message:
-----------
sanity check checksums

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

Modified: trunk/lib/libmport/delete_primative.c
===================================================================
--- trunk/lib/libmport/delete_primative.c	2016-04-09 01:53:33 UTC (rev 7504)
+++ trunk/lib/libmport/delete_primative.c	2016-04-09 02:36:27 UTC (rev 7505)
@@ -150,7 +150,7 @@
             snprintf(file, sizeof(file), "%s", mport->root);
         } else if (*data == '/') {
 	    /* TODO: do we still want to support mport->root here? seems to fail for /var entries */
-            snprintf(file, sizeof(file), "%s", data);
+            snprintf(file, sizeof(file), "%s%s", mport->root, data);
         } else {
             snprintf(file, sizeof(file), "%s%s/%s", mport->root, pack->prefix, data);
         }
@@ -174,7 +174,7 @@
                     if (MD5File(file, md5) == NULL)
                         mport_call_msg_cb(mport, "Can't md5 %s: %s", file, strerror(errno));
 
-                    if (strcmp(md5, checksum) != 0)
+                    if (checksum == NULL || md5 == NULL || strcmp(md5, checksum) != 0)
                         mport_call_msg_cb(mport, "Checksum mismatch: %s", file);
 
                     if (type == ASSET_SAMPLE) {