diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-14 10:01:08 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 10:01:08 -0500 |
| commit | ee015f086f3c40390659bbc0129b7c08ffd0ed5f (patch) | |
| tree | b2ba33041450fd5c5fb226649b88534fdac60ff1 /lib/libalpm/conflict.c | |
| parent | be972767358e6dfbb08686555d8e2c0176a55106 (diff) | |
| download | pacman-ee015f086f3c40390659bbc0129b7c08ffd0ed5f.tar.xz | |
Ensure handle is valid and pm_errno is reset when calling into API
We didn't do due diligence before and ensure prior pm_errno values
weren't influencing what happened in further ALPM calls. I observed one
case of early setup code setting pm_errno to PM_ERR_WRONG_ARGS and that
flag persisting the entire time we were calling library code.
Add a new CHECK_HANDLE() macro that does two things: 1) ensures the
handle variable passed to it is non-NULL and 2) clears any existing
pm_errno flag set on the handle. This macro can replace many places we
used the ASSERT(handle != NULL, ...) pattern before.
Several other other places only need a simple 'set to zero' of the
pm_errno field.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
| -rw-r--r-- | lib/libalpm/conflict.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index d2734d76..a6bbe093 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -214,6 +214,7 @@ alpm_list_t *_alpm_outerconflicts(pmdb_t *db, alpm_list_t *packages) alpm_list_t SYMEXPORT *alpm_checkconflicts(pmhandle_t *handle, alpm_list_t *pkglist) { + CHECK_HANDLE(handle, return NULL); return _alpm_innerconflicts(handle, pkglist); } |