Set some things NULL when we dealloc

MidnightBSD · Feb 5, 2022 · c8766fc · c8766fc
1 parent 0f6b86e
commit c8766fc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/libmport/clean.c b/libmport/clean.c
@@ -79,8 +79,10 @@ mport_clean_oldpackages(mportInstance *mport)
 
 		asprintf(&path, "%s/%s", MPORT_FETCH_STAGING_DIR, de->d_name);
 		if (path == NULL) {
-			if (indexEntry != NULL)
+			if (indexEntry != NULL) {
 				mport_index_entry_free_vec(indexEntry);
+				indexEntry = NULL;
+			}
 			continue;
 		}
 
@@ -94,24 +96,20 @@ mport_clean_oldpackages(mportInstance *mport)
 			}
 		} else if (mport_verify_hash(path, (*indexEntry)->hash) == 0) {
 			if (unlink(path) < 0) {
-
-				error_code = SET_ERRORX(MPORT_ERR_FATAL, "Could not delete file %s: %s",
-
-				                        path, strerror(errno));
-
+				error_code = SET_ERRORX(MPORT_ERR_FATAL, "Could not delete file %s: %s", path, strerror(errno));
 				mport_call_msg_cb(mport, "%s\n", mport_err_string());
-
 			} else {
-
 				deleted++;
-
 			}
 			mport_index_entry_free_vec(indexEntry);
+			indexEntry = NULL;
 		} else {
 			mport_index_entry_free_vec(indexEntry);
+			indexEntry = NULL;
 		}
 
 		free(path);
+		path = NULL;
 	}
 
 	closedir(d);

diff --git a/libmport/fetch.c b/libmport/fetch.c
@@ -267,6 +267,7 @@ mport_download(mportInstance *mport, const char *packageName, char **path) {
 	asprintf(path, "%s/%s", MPORT_LOCAL_PKG_PATH, (*indexEntry)->bundlefile);
 	if (path == NULL) {
 		mport_index_entry_free_vec(indexEntry);
+		indexEntry = NULL;
 		SET_ERRORX(1, "%s", "Unable to allocate memory for path.");
 		RETURN_CURRENT_ERROR;
 	}
@@ -276,7 +277,9 @@ mport_download(mportInstance *mport, const char *packageName, char **path) {
 		if (mport_fetch_bundle(mport, (*indexEntry)->bundlefile) != MPORT_OK) {
 			mport_call_msg_cb(mport, "Error fetching package %s, %s", packageName, mport_err_string());
 			free(*path);
+			path = NULL;
 			mport_index_entry_free_vec(indexEntry);
+			indexEntry = NULL;
 			return mport_err_code();
 
 		}
@@ -293,7 +296,9 @@ mport_download(mportInstance *mport, const char *packageName, char **path) {
 			}
 		}
 		free(*path);
+		path = NULL;
 		mport_index_entry_free_vec(indexEntry);
+		indexEntry = NULL;
 		SET_ERRORX(1, "Package %s fails hash verification.", packageName);
 		RETURN_CURRENT_ERROR;
 	}
@@ -304,6 +309,7 @@ mport_download(mportInstance *mport, const char *packageName, char **path) {
 		mport_call_msg_cb(mport, "Package %s exists at %s\n", packageName, *path);
 
 	mport_index_entry_free_vec(indexEntry);
+	indexEntry = NULL;
 
 	return (0);
 }

diff --git a/libmport/index.c b/libmport/index.c
@@ -182,6 +182,8 @@ mport_index_check(mportInstance *mport, mportPackageMeta *pack) {
 			indexEntries++;
 		}
 		mport_index_entry_free_vec(indexEntries_orig);
+		indexEntries_orig = NULL;
+		indexEntries = NULL;
 	}
 
 	return (ret);

diff --git a/libmport/install.c b/libmport/install.c
@@ -73,6 +73,7 @@ mport_install(mportInstance *mport, const char *pkgname, const char *version, co
         }
         if (e[e_loc] == NULL) {
           mport_index_entry_free_vec(e);
+          e = NULL;
           RETURN_ERRORX(MPORT_ERR_FATAL, "Could not resolve '%s-%s'.", pkgname, version);
         }
     } else {
@@ -84,13 +85,16 @@ mport_install(mportInstance *mport, const char *pkgname, const char *version, co
   asprintf(&filename, "%s/%s", MPORT_FETCH_STAGING_DIR, e[e_loc]->bundlefile);
   if (filename == NULL) {
     mport_index_entry_free_vec(e);
+    e = NULL;
     RETURN_ERROR(MPORT_ERR_FATAL, "Out of memory.");
   }
 
   if (!mport_file_exists(filename)) {
     if (mport_fetch_bundle(mport, e[e_loc]->bundlefile) != MPORT_OK) {
       free(filename);
+      filename = NULL;
       mport_index_entry_free_vec(e);
+      e = NULL;
       RETURN_CURRENT_ERROR;
     }
   }
@@ -100,17 +104,21 @@ mport_install(mportInstance *mport, const char *pkgname, const char *version, co
 
   	if (unlink(filename) == 0) {
 	    free(filename);
+      filename = NULL;
   		RETURN_ERROR(MPORT_ERR_FATAL, "Package failed hash verification and was removed.\n");
   	} else {
 	    free(filename);
+      filename = NULL;
   		RETURN_ERROR(MPORT_ERR_FATAL, "Package failed hash verification, but could not be removed.\n");
   	}
   }
 
   ret = mport_install_primative(mport, filename, prefix, automatic);
 
   free(filename);
+  filename = NULL;
   mport_index_entry_free_vec(e);
+  e = NULL;
 
   return ret;
 }