keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pkg_yumdb_strdup leaking error, and returning NULL.

Browse Source
This commit is contained in:
James Antill 2014-07-24 22:58:32 -04:00
parent 8fdc8fd772
commit 0b6bc7d243
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rpmostree-builtin-rpm.c
View File

@ -337,13 +337,20 @@ pkg_yumdb_strdup (GFile *root, Header pkg, const char *yumdb_key,
gs_free char *pkgpath = pkg_yumdb_relpath (pkg); gs_free char *pkgpath = pkg_yumdb_relpath (pkg);
gs_free char *path = g_strconcat ("/var/lib/yum/yumdb/", pkgpath, "/", gs_free char *path = g_strconcat ("/var/lib/yum/yumdb/", pkgpath, "/",
yumdb_key, NULL); yumdb_key, NULL);
GError *tmp_error = NULL;
char *ret = NULL; char *ret = NULL;
f = g_file_resolve_relative_path (root, path); f = g_file_resolve_relative_path (root, path);
// allow_noent returns true for noent, false for other errors.
if (!_rpmostree_file_load_contents_utf8_allow_noent (f, &ret, if (!_rpmostree_file_load_contents_utf8_allow_noent (f, &ret,
cancellable, error)) cancellable,
return g_strdup (""); &tmp_error) ||
!ret)
{
g_clear_error (&tmp_error);
return g_strdup ("");
}
return ret; return ret;
} }