External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

absolutePathFromBaseFile: avoid an unnecessary use of assert

Browse Source 
* src/util/storage_file.c (absolutePathFromBaseFile): While this use
of virAsprintf is slightly cleaner than using stpncpy(stpcpy(...,
it does impose an artificial limitation on the length of the base_file
name.  Rather than asserting that it does not exceed INT_MAX, return
NULL when it does.
This commit is contained in:
Jim Meyering 2010-02-10 11:54:24 +01:00
parent 69cf62adac
commit e3042683bd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/storage_file.c
View File

@ -26,7 +26,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <assert.h>
#include "dirname.h" #include "dirname.h"
#include "ignore-value.h" #include "ignore-value.h"
#include "memory.h" #include "memory.h"
@ -251,7 +250,8 @@ absolutePathFromBaseFile(const char *base_file, const char *path)
return strdup(path); return strdup(path);
/* Ensure that the following cast-to-int is valid. */ /* Ensure that the following cast-to-int is valid. */
assert (d_len <= INT_MAX); if (d_len > INT_MAX)
return NULL;
ignore_value(virAsprintf(&res, "%.*s/%s", (int) d_len, base_file, path)); ignore_value(virAsprintf(&res, "%.*s/%s", (int) d_len, base_file, path));
return res; return res;