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

xbps_rindex_sync: check that downloaded repo index is a dictionary.

Browse Source
This commit is contained in:
Juan RP 2012-12-07 08:34:45 +01:00
parent 3e3073e44c
commit 305659644f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/rindex_sync.c
View File

@ -83,7 +83,7 @@ xbps_get_remote_repo_string(const char *uri)
int HIDDEN int HIDDEN
xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf) xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf)
{ {
prop_array_t array; prop_dictionary_t repod;
const char *fetchstr = NULL; const char *fetchstr = NULL;
char *rpidx, *lrepodir, *uri_fixedp, *lrepofile; char *rpidx, *lrepodir, *uri_fixedp, *lrepofile;
int rv = 0; int rv = 0;
@ -156,8 +156,8 @@ xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf)
* some HTTP servers don't return proper errors and sometimes * some HTTP servers don't return proper errors and sometimes
* you get an HTML ASCII file :-) * you get an HTML ASCII file :-)
*/ */
array = prop_array_internalize_from_zfile(lrepofile); repod = prop_dictionary_internalize_from_zfile(lrepofile);
if (array == NULL) { if (repod == NULL) {
xbps_set_cb_state(xhp, XBPS_STATE_REPOSYNC_FAIL, 0, NULL, NULL, xbps_set_cb_state(xhp, XBPS_STATE_REPOSYNC_FAIL, 0, NULL, NULL,
"[reposync] downloaded file `%s' is not valid.", rpidx); "[reposync] downloaded file `%s' is not valid.", rpidx);
(void)unlink(lrepofile); (void)unlink(lrepofile);
@ -165,7 +165,7 @@ xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf)
rv = -1; rv = -1;
goto out; goto out;
} }
prop_object_release(array); prop_object_release(repod);
out: out:
if (rpidx) if (rpidx)