summaryrefslogtreecommitdiff
path: root/rpmdb
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2004-11-11 06:11:37 +0000
committerjbj <devnull@localhost>2004-11-11 06:11:37 +0000
commitf9473219d523ace837a3ef5a1212bb6dcad2a690 (patch)
tree987faa61dcefd2565dc1ccdf2cb778fc95307e09 /rpmdb
parent8ce559b875c401630120a251cc73b23012f45080 (diff)
downloadlibrpm-tizen-f9473219d523ace837a3ef5a1212bb6dcad2a690.tar.gz
librpm-tizen-f9473219d523ace837a3ef5a1212bb6dcad2a690.tar.bz2
librpm-tizen-f9473219d523ace837a3ef5a1212bb6dcad2a690.zip
- selinux: use rpm_execcon, not execv, to run scriptlets (#136848).
- fix: segfault on --verifydb (#138589). CVS patchset: 7577 CVS date: 2004/11/11 06:11:37
Diffstat (limited to 'rpmdb')
-rw-r--r--rpmdb/db3.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/rpmdb/db3.c b/rpmdb/db3.c
index efbfb688b..ff2bd3186 100644
--- a/rpmdb/db3.c
+++ b/rpmdb/db3.c
@@ -862,13 +862,11 @@ static int db3close(/*@only@*/ dbiIndex dbi, /*@unused@*/ unsigned int flags)
(dbhome ? dbhome : ""),
(dbfile ? dbfile : tagName(dbi->dbi_rpmtag)));
- xx = db->close(db, 0);
- /* XXX ignore not found error messages. */
- _printit = (xx == ENOENT ? 0 : _debug);
- xx = cvtdberr(dbi, "db->close", xx, _printit);
+ /*
+ * The DB handle may not be accessed again after
+ * DB->verify is called, regardless of its return.
+ */
db = NULL;
- if (rc == 0 && xx) rc = xx;
-
dbf = _free(dbf);
}
xx = dbenv->close(dbenv, 0);