[Midnightbsd-cvs] src [12289] stable/1.2/lib/libmport/pkgmeta.c: workaround some bugs with mport upgrade for now

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Nov 13 01:01:18 EST 2019


Revision: 12289
          http://svnweb.midnightbsd.org/src/?rev=12289
Author:   laffer1
Date:     2019-11-13 01:01:17 -0500 (Wed, 13 Nov 2019)
Log Message:
-----------
workaround some bugs with mport upgrade for now

Modified Paths:
--------------
    stable/1.2/lib/libmport/pkgmeta.c

Modified: stable/1.2/lib/libmport/pkgmeta.c
===================================================================
--- stable/1.2/lib/libmport/pkgmeta.c	2019-11-13 03:43:00 UTC (rev 12288)
+++ stable/1.2/lib/libmport/pkgmeta.c	2019-11-13 06:01:17 UTC (rev 12289)
@@ -55,24 +55,34 @@
 
 	free(pack->name);
 	pack->name = NULL;
+
 	free(pack->version);
 	pack->version = NULL;
+
 	free(pack->lang);
 	pack->lang = NULL;
+
 	free(pack->comment);
 	pack->comment = NULL;
+	
 	free(pack->desc);
 	pack->desc = NULL;
+
 	free(pack->prefix);
 	pack->prefix = NULL;
+
 	free(pack->origin);
 	pack->origin = NULL;
+
 	free(pack->os_release);
 	pack->os_release = NULL;
+
 	free(pack->cpe);
 	pack->cpe = NULL;
+
 	free(pack->deprecated);
 	pack->deprecated = NULL;
+
 	free(pack->flavor);
 	pack->flavor = NULL;
 
@@ -84,8 +94,8 @@
 			i++;
 		}
 	}
-
 	free(pack->categories);
+	pack->categories = NULL;
 	free(pack);
 }
 
@@ -94,11 +104,16 @@
 mport_pkgmeta_vec_free(mportPackageMeta **vec)
 {
     int i;
+
+    if (vec == NULL) 
+	return;
+
     for (i = 0; *(vec + i) != NULL; i++) {
-        mport_pkgmeta_free(*(vec + i));
+	mportPackageMeta *pack = *(vec + i);
+        mport_pkgmeta_free(pack);
     }
 
-    free(vec);
+//    free(vec);
 }
 
 



More information about the Midnightbsd-cvs mailing list