Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=2951ec7f03d741f891732a41b2c7d5741ffd2d13
commit 2951ec7f03d741f891732a41b2c7d5741ffd2d13
Author: Michel Hermier <herm...@frugalware.org>
Date: Thu Nov 14 23:06:39 2013 +0100
libpacman: Rework argument checking in _pacman_db_read.
diff --git a/lib/libpacman/db.c b/lib/libpacman/db.c
index 370e4c6..bc640d6 100644
--- a/lib/libpacman/db.c
+++ b/lib/libpacman/db.c
@@ -242,7 +242,8 @@ int _pacman_db_read(pmdb_t *db, unsigned int inforeq,
pmpkg_t *info)
int ret;
ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
- if(info == NULL || info->name[0] == 0 || info->version[0] == 0) {
+ ASSERT(info != NULL, RET_ERR(PM_ERR_PKG_INVALID, -1));
+ if(_pacman_strempty(info->name) || _pacman_strempty(info->version)) {
_pacman_log(PM_LOG_ERROR, _("invalid package entry provided to
_pacman_db_read"));
return(-1);
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
