diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-11 00:01:58 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-11 00:01:58 -0600 |
| commit | ccc1c731529de16f6fa4064fd992a8f63d7cfc26 (patch) | |
| tree | dc5b96634cb255cfcbee1e57079d32491db9fc5e /lib/libalpm/add.c | |
| parent | 0a65de10b1cd8bd450e47e735cb909eec13822d0 (diff) | |
| download | pacman-ccc1c731529de16f6fa4064fd992a8f63d7cfc26.tar.xz | |
Use dynamic string allocation in package structures
This also affects all structures with static strings, such as depmiss,
conflict, etc. This should help a lot with memory usage, and hopefully make
things a bit more "idiot proof".
Currently our pactest pass/fail rate is identical before and after this
patch. This is not to say it is a perfect patch- I have yet to pull valgrind
out. However, this should be quite safe to use in all situations from here
on out, and we can start plugging the memleaks.
Original-work-by: Aaron Griffin <aaronmgriffin@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index ec49c2a3..72b89345 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -143,7 +143,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_depmiss_free); + alpm_list_free(lp); } RET_ERR(PM_ERR_UNSATISFIED_DEPS, -1); } @@ -193,7 +194,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_fileconflict_free); + alpm_list_free(lp); } RET_ERR(PM_ERR_FILE_CONFLICTS, -1); } |