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

xbps_[gs]et_cachedir(): ensure we don't copy more than buffer's size including NUL.

Browse Source
This commit is contained in:
Juan RP 2010-05-20 15:10:36 +02:00
parent 8e764dca60
commit 1bcf9de67a
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/util.c
View File

@ -431,8 +431,8 @@ xbps_set_cachedir(const char *dir)
assert(dir != NULL); assert(dir != NULL);
r = snprintf(res, sizeof(res), "%s/%s", xbps_get_rootdir(), dir); r = snprintf(res, sizeof(res) - 1, "%s/%s", xbps_get_rootdir(), dir);
if (r == -1 || r >= (int)sizeof(res)) { if (r == -1 || r >= (int)sizeof(res) - 1) {
/* If error or truncated set to default */ /* If error or truncated set to default */
cachedir = XBPS_CACHE_PATH; cachedir = XBPS_CACHE_PATH;
return; return;
@ -447,9 +447,9 @@ xbps_get_cachedir(void)
int r = 0; int r = 0;
if (cachedir == NULL) { if (cachedir == NULL) {
r = snprintf(res, sizeof(res), "%s/%s", r = snprintf(res, sizeof(res) - 1, "%s/%s",
xbps_get_rootdir(), XBPS_CACHE_PATH); xbps_get_rootdir(), XBPS_CACHE_PATH);
if (r == -1 || r >= (int)sizeof(res)) if (r == -1 || r >= (int)sizeof(res) - 1)
return NULL; return NULL;
cachedir = res; cachedir = res;