Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=7b3335a948bac3197e6311151af12c9cd609e6e2
commit 7b3335a948bac3197e6311151af12c9cd609e6e2
Author: Michel Hermier <herm...@frugalware.org>
Date: Tue Oct 21 09:49:00 2014 +0200
libpacman: Fix errneous return value in _pacman_fpmpackage_load.
diff --git a/lib/libpacman/package/fpmpackage.cpp
b/lib/libpacman/package/fpmpackage.cpp
index 7db9a5a..ebd5913 100644
--- a/lib/libpacman/package/fpmpackage.cpp
+++ b/lib/libpacman/package/fpmpackage.cpp
@@ -182,7 +182,7 @@ package_ptr _pacman_fpmpackage_load(const char *pkgfile)
char *str;
if((str = (char *)malloc(PATH_MAX)) == NULL) {
- RET_ERR(PM_ERR_MEMORY, (package_ptr)-1);
+ RET_ERR(PM_ERR_MEMORY, nullptr);
}
filelist = _pacman_archive_read_fropen(archive);
while(!feof(filelist)) {
@@ -227,9 +227,7 @@ error:
if(!ret) {
archive_read_finish (archive);
}
- pm_errno = PM_ERR_PKG_CORRUPTED;
-
- return(NULL);
+ RET_ERR(PM_ERR_PKG_CORRUPTED, nullptr);
}
/* vim: set ts=2 sw=2 noet: */
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
