diff options
| author | Dan McGee <dan@archlinux.org> | 2011-08-19 18:06:55 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-08-19 18:09:57 +0200 |
| commit | 6d544984f2418ea34caab4c433580487b760362a (patch) | |
| tree | cf0510b97a6495587c87598a70bf8761189f5c32 /lib/libalpm/deps.h | |
| parent | 9934b3bd345011eef6a96249d8d90de594c04cd0 (diff) | |
| download | pacman-6d544984f2418ea34caab4c433580487b760362a.tar.gz pacman-6d544984f2418ea34caab4c433580487b760362a.tar.xz | |
Be more robust when copying package data
This changes the signature of _alpm_pkg_dup() to return an integer error
code and provide the new package in a passed pointer argument. All
callers are now more robust with checking the return value of this
function to ensure a fatal error did not occur.
We allow load failures to proceed as otherwise we have a chicken and egg
problem- if a 'desc' local database entry is missing, the best way of
restoring said file is `pacman -Sf --dbonly packagename`. This patch
fixes a segfault that was occurring in this case.
Fixes the segfault reported in FS#25667.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/deps.h')
| -rw-r--r-- | lib/libalpm/deps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 29e69eb2..ce25bda6 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -31,7 +31,7 @@ void _alpm_dep_free(alpm_depend_t *dep); alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep); void _alpm_depmiss_free(alpm_depmissing_t *miss); alpm_list_t *_alpm_sortbydeps(alpm_handle_t *handle, alpm_list_t *targets, int reverse); -void _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); +int _alpm_recursedeps(alpm_db_t *db, alpm_list_t *targs, int include_explicit); int _alpm_resolvedeps(alpm_handle_t *handle, alpm_list_t *localpkgs, alpm_pkg_t *pkg, alpm_list_t *preferred, alpm_list_t **packages, alpm_list_t *remove, alpm_list_t **data); |