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

xbps-rindex/repoflush.c: stop abusing assert().

Browse Source 
assert() must not change the program behaviour.

Make sure fchmod() and rename() succeed properly and
fail gracefully otherwise.
This commit is contained in:
Juan RP 2019-06-18 17:32:50 +02:00
parent ab44f4ef80
commit 8018f53e0a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bin/xbps-rindex/repoflush.c
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2013-2015 Juan Romero Pardines. * Copyright (c) 2013-2019 Juan Romero Pardines.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -46,10 +46,13 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
char *repofile, *tname, *buf; char *repofile, *tname, *buf;
int rv, repofd = -1; int rv, repofd = -1;
mode_t mask; mode_t mask;
bool result;
/* Create a tempfile for our repository archive */ /* Create a tempfile for our repository archive */
repofile = xbps_repo_path_with_name(xhp, repodir, reponame); repofile = xbps_repo_path_with_name(xhp, repodir, reponame);
assert(repofile);
tname = xbps_xasprintf("%s.XXXXXXXXXX", repofile); tname = xbps_xasprintf("%s.XXXXXXXXXX", repofile);
assert(tname);
mask = umask(S_IXUSR|S_IRWXG|S_IRWXO); mask = umask(S_IXUSR|S_IRWXG|S_IRWXO);
if ((repofd = mkstemp(tname)) == -1) if ((repofd = mkstemp(tname)) == -1)
return false; return false;
@ -111,11 +114,22 @@ repodata_flush(struct xbps_handle *xhp, const char *repodir,
#else #else
fsync(repofd); fsync(repofd);
#endif #endif
assert(fchmod(repofd, 0664) != -1); if (fchmod(repofd, 0664) == -1) {
unlink(repofile);
close(repofd);
result = false;
goto out;
}
close(repofd); close(repofd);
rename(tname, repofile); if (rename(tname, repofile) == -1) {
unlink(repofile);
result = false;
goto out;
}
result = true;
out:
free(repofile); free(repofile);
free(tname); free(tname);
return true; return result;
} }