From ee015f086f3c40390659bbc0129b7c08ffd0ed5f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 14 Jun 2011 10:01:08 -0500 Subject: 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 --- lib/libalpm/alpm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/libalpm/alpm.c') diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 5d475ce4..9b9719d1 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -104,7 +104,7 @@ int SYMEXPORT alpm_release(pmhandle_t *myhandle) int ret = 0; pmdb_t *db; - ASSERT(myhandle != NULL, return -1); + CHECK_HANDLE(myhandle, return -1); /* close local database */ db = myhandle->db_local; -- cgit v1.2.3-70-g09d2