diff options
| author | Dan McGee <dan@archlinux.org> | 2011-06-14 17:01:08 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-14 17:01:08 +0200 |
| commit | ee015f086f3c40390659bbc0129b7c08ffd0ed5f (patch) | |
| tree | b2ba33041450fd5c5fb226649b88534fdac60ff1 /lib/libalpm/add.c | |
| parent | be972767358e6dfbb08686555d8e2c0176a55106 (diff) | |
| download | pacman-ee015f086f3c40390659bbc0129b7c08ffd0ed5f.tar.gz 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/add.c')
| -rw-r--r-- | lib/libalpm/add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 6f93c61d..7b394a5b 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -57,7 +57,7 @@ int SYMEXPORT alpm_add_pkg(pmhandle_t *handle, pmpkg_t *pkg) pmpkg_t *local; /* Sanity checks */ - ASSERT(handle != NULL, return -1); + CHECK_HANDLE(handle, return -1); ASSERT(pkg != NULL, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); ASSERT(handle == pkg->handle, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1)); trans = handle->trans; @@ -715,11 +715,12 @@ int _alpm_upgrade_packages(pmhandle_t *handle) /* loop through our package list adding/upgrading one at a time */ for(targ = trans->add; targ; targ = targ->next) { + pmpkg_t *newpkg = targ->data; + if(handle->trans->state == STATE_INTERRUPTED) { return ret; } - pmpkg_t *newpkg = (pmpkg_t *)targ->data; if(commit_single_pkg(handle, newpkg, pkg_current, pkg_count)) { /* something screwed up on the commit, abort the trans */ trans->state = STATE_INTERRUPTED; |