emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_find_pkg_dict_installed: dictionary MUST be copied before calling

Browse Source 
xbps_regpkgs_dictionary_release(), otherwise it will be NULL.

Found by executing this function without initializing regpkgdb.
This commit is contained in:
Juan RP 2010-11-08 01:37:53 +01:00
parent 756a5ec654
commit ab10cc3b15
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/plist.c
View File

@ -158,7 +158,7 @@ xbps_find_pkg_from_plist(const char *plist, const char *pkgname)
prop_dictionary_t
xbps_find_pkg_dict_installed(const char *str, bool bypattern)
{
prop_dictionary_t d, pkgd;
prop_dictionary_t d, pkgd, rpkgd = NULL;
pkg_state_t state = 0;
if ((d = xbps_regpkgs_dictionary_init()) == NULL)
@ -169,25 +169,25 @@ xbps_find_pkg_dict_installed(const char *str, bool bypattern)
else
pkgd = xbps_find_pkg_in_dict_by_name(d, "packages", str);
if (pkgd == NULL)
goto fail;
goto out;
if (xbps_get_pkg_state_dictionary(pkgd, &state) != 0)
goto fail;
goto out;
switch (state) {
case XBPS_PKG_STATE_INSTALLED:
case XBPS_PKG_STATE_UNPACKED:
xbps_regpkgs_dictionary_release();
return prop_dictionary_copy(pkgd);
rpkgd = prop_dictionary_copy(pkgd);
break;
case XBPS_PKG_STATE_CONFIG_FILES:
errno = ENOENT;
break;
default:
break;
}
fail:
out:
xbps_regpkgs_dictionary_release();
return NULL;
return rpkgd;
}
prop_dictionary_t