06b2601 Multiple fixes. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Multiple fixes.

jlaffaye committed 14 years ago

commit 06b2601342f77bd636c27cf9f6860ed2546b55d0
parent 496835c

4 files changed +10 -2

modified libpkg/dump.c

@@ -8,7 +8,7 @@ int

 pkgdb_dump(struct pkgdb *db, char *dest)
 {
 	struct pkgdb_it *it;
 	struct pkg *pkg;
 	struct pkg *pkg = NULL;
 	struct sbuf *path;
 	struct packing *pack;
 	char *m;

modified libpkg/packing.c

@@ -2,6 +2,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <assert.h>
 #include <archive.h>
 #include <archive_entry.h>
 #include <fcntl.h>

@@ -194,12 +195,16 @@ cleanup:

 int
 packing_finish(struct packing *pack)
 {
 	assert(pack != NULL);
 	archive_entry_free(pack->entry);
 	archive_read_finish(pack->aread);
 	archive_write_close(pack->awrite);
 	archive_write_finish(pack->awrite);
 	free(pack);
 	return (EPKG_OK);
 }

modified libpkg/pkg_manifest.c

@@ -347,6 +347,7 @@ pkg_parse_manifest(struct pkg *pkg, char *buf)

 	else
 		retcode = EPKG_FATAL;
 	yaml_document_delete(&doc);
 	yaml_parser_delete(&parser);
 	return retcode;

modified libpkg/pkgdb.c

@@ -117,8 +117,10 @@ pkgdb_upgrade(sqlite3 *sdb)

 	if (db_version == DBVERSION)
 		return (EPKG_OK);
 	else if (db_version > DBVERSION)
 	else if (db_version > DBVERSION) {
 		EMIT_PKG_ERROR("%s", "database version is newer than libpkg(3)");
 		return (EPKG_FATAL);
 	}
 	sql = sbuf_new_auto();