fix some logic errors with index lookup error handling.

MidnightBSD · Sep 11, 2021 · c3e7b54 · c3e7b54
1 parent 0019f90
commit c3e7b54
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/libmport/fetch.c b/libmport/fetch.c
@@ -246,21 +246,29 @@ fetch(mportInstance *mport, const char *url, const char *dest)
  */
 int
 mport_download(mportInstance *mport, const char *packageName, char **path) {
-	mportIndexEntry **indexEntry;
+	mportIndexEntry **indexEntry = NULL;
 	bool existed = true;
 	int retryCount = 0;
 
 	if (mport_index_lookup_pkgname(mport, packageName, &indexEntry) != MPORT_OK) {
 		RETURN_CURRENT_ERROR;
 	}
 
-	if (indexEntry == NULL || *indexEntry == NULL)
+	if (indexEntry == NULL || (*indexEntry) == NULL) {
 		SET_ERRORX(1, "Package %s not found in index.\n", packageName);
+		RETURN_CURRENT_ERROR;
+	}
+
+	if ((*indexEntry)->bundlefile == NULL) {
+		SET_ERRORX(1, "Package %s does not contain a bundle file.\n", packageName);
+		RETURN_CURRENT_ERROR;
+	}
 
 	asprintf(path, "%s/%s", MPORT_LOCAL_PKG_PATH, (*indexEntry)->bundlefile);
 	if (path == NULL) {
 		mport_index_entry_free_vec(indexEntry);
 		SET_ERRORX(1, "%s", "Unable to allocate memory for path.");
+		RETURN_CURRENT_ERROR;
 	}
 
 getfile:
@@ -287,6 +295,7 @@ mport_download(mportInstance *mport, const char *packageName, char **path) {
 		free(*path);
 		mport_index_entry_free_vec(indexEntry);
 		SET_ERRORX(1, "Package %s fails hash verification.", packageName);
+		RETURN_CURRENT_ERROR;
 	}
 
 	if (!existed)