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

Check that return value of snprintf(3) is not negative, rather than only -1.

Browse Source
This commit is contained in:
Juan RP 2011-01-21 00:32:46 +01:00
parent 84b578b0e4
commit ab857595d7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-repo/repository.c
View File

@ -69,7 +69,7 @@ sanitize_url(const char *path)
goto out; goto out;
r = snprintf(buf, sizeof(buf) - 1, "%s/%s", dirnp, basenp); r = snprintf(buf, sizeof(buf) - 1, "%s/%s", dirnp, basenp);
if (r == -1 || r >= (int)sizeof(buf) - 1) if (r < 0 || r >= (int)sizeof(buf) - 1)
goto out; goto out;
res = buf; res = buf;

4
lib/util.c
View File

@ -445,7 +445,7 @@ xbps_set_cachedir(const char *dir)
assert(dir != NULL); assert(dir != NULL);
r = snprintf(res, sizeof(res) - 1, "%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) - 1) { if (r < 0 || 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;
@ -462,7 +462,7 @@ xbps_get_cachedir(void)
if (cachedir == NULL) { if (cachedir == NULL) {
r = snprintf(res, sizeof(res) - 1, "%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) - 1) if (r < 0 || r >= (int)sizeof(res) - 1)
return NULL; return NULL;
cachedir = res; cachedir = res;