Merge branch 'maint'

lib/libalpm/add.c

@@ -229,6 +229,7 @@ static int upgrade_remove(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *trans, pm
 		char *backup = _alpm_backup_file(b->data);
 		/* safety check (fix the upgrade026 pactest) */
 		if(!alpm_list_find_str(filelist, backup)) {
+			FREE(backup);
 			continue;
 		}
 		_alpm_log(PM_LOG_DEBUG, "adding %s to the NoUpgrade array temporarily\n",

lib/libalpm/backup.c

@@ -42,6 +42,9 @@ int _alpm_backup_split(const char *string, char **file, char **hash)
 	if(ptr == NULL) {
 		if(file) {
 			*file = str;
+		} else {
+			/* don't need our dup as the fname wasn't requested, so free it */
+			FREE(str);
 		}
 		return(0);
 	}

src/pacman/util.c

@@ -388,7 +388,7 @@ alpm_list_t *strsplit(const char *str, const char splitchar)
 	if(dup == NULL) {
 		return(NULL);
 	}
-	list = alpm_list_add(list, strdup(prev));
+	list = alpm_list_add(list, dup);
 
 	return(list);
 }