FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 07-15-2008, 10:41 AM
Nagy Gabor
 
Default Fix a wrong FREELIST usage in add.c

>From 4b272f807e2302f1ee184abd8be63f8d02ab47f9 Mon Sep 17 00:00:00 2001
From: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Date: Tue, 15 Jul 2008 12:36:10 +0200
Subject: [PATCH] Fix a wrong FREELIST usage in add.c

The dynamic pmconflict_t must be freed with _alpm_conflict_free.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
---
lib/libalpm/add.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index 6cf865a..5bf3fcd 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -137,7 +137,8 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
if(data) {
*data = lp;
} else {
- FREELIST(lp);
+ alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_conflict_free);
+ alpm_list_free(lp);
}
if(inner) {
_alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list
"));
--
1.5.6.2


_______________________________________________
pacman-dev mailing list
pacman-dev@archlinux.org
http://archlinux.org/mailman/listinfo/pacman-dev
 
Old 07-16-2008, 12:12 AM
"Dan McGee"
 
Default Fix a wrong FREELIST usage in add.c

On Tue, Jul 15, 2008 at 5:41 AM, Nagy Gabor <ngaba@bibl.u-szeged.hu> wrote:
> >From 4b272f807e2302f1ee184abd8be63f8d02ab47f9 Mon Sep 17 00:00:00 2001
> From: Nagy Gabor <ngaba@bibl.u-szeged.hu>
> Date: Tue, 15 Jul 2008 12:36:10 +0200
> Subject: [PATCH] Fix a wrong FREELIST usage in add.c
>
> The dynamic pmconflict_t must be freed with _alpm_conflict_free.
>
> Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
> ---
> lib/libalpm/add.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
> index 6cf865a..5bf3fcd 100644
> --- a/lib/libalpm/add.c
> +++ b/lib/libalpm/add.c
> @@ -137,7 +137,8 @@ int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data)
> if(data) {
> *data = lp;
> } else {
> - FREELIST(lp);
> + alpm_list_free_inner(lp, (alpm_list_fn_free)_alpm_conflict_free);
> + alpm_list_free(lp);
Applied, but watch out for the tab/space mixup here. Your patch used spaces.

> }
> if(inner) {
> _alpm_log(PM_LOG_ERROR, _("conflicting packages were found in the target list
"));
> --
> 1.5.6.2
>
>
> _______________________________________________
> pacman-dev mailing list
> pacman-dev@archlinux.org
> http://archlinux.org/mailman/listinfo/pacman-dev
>

_______________________________________________
pacman-dev mailing list
pacman-dev@archlinux.org
http://archlinux.org/mailman/listinfo/pacman-dev
 

Thread Tools




All times are GMT. The time now is 08:06 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org