diff options
| author | Simon Rettberg | 2013-08-02 13:44:09 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-08-02 13:44:09 +0200 |
| commit | 92d643e8640d2609ee81d8b9f1605ce127cd8a31 (patch) | |
| tree | 4c3fb404b81af5584198ca997b7967e0ca7ade10 /src/server/image.c | |
| parent | [SERVER] Fix create_image() by adding fallback solutions for fallocate() (diff) | |
| download | dnbd3-92d643e8640d2609ee81d8b9f1605ce127cd8a31.tar.gz dnbd3-92d643e8640d2609ee81d8b9f1605ce127cd8a31.tar.xz dnbd3-92d643e8640d2609ee81d8b9f1605ce127cd8a31.zip | |
fix0rs
Diffstat (limited to 'src/server/image.c')
| -rw-r--r-- | src/server/image.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/server/image.c b/src/server/image.c index 6b6fb99..d4ed5cf 100644 --- a/src/server/image.c +++ b/src/server/image.c @@ -332,12 +332,13 @@ static int image_try_load(char *base, char *path) assert( path != NULL ); assert( *path == '/' ); assert( strncmp( path, base, strlen(base)) == 0 ); - assert( base[strlen(base) - 1] == '/' ); + assert( base[strlen(base) - 1] != '/' ); + assert( strlen(path) > strlen(base) ); char *lastSlash = strrchr( path, '/' ); char *fileName = lastSlash + 1; char imgName[strlen( path )]; const int fileNameLen = strlen( fileName ); - char * const virtBase = path + strlen( base ); + char * const virtBase = path + strlen( base ) + 1; // Copy virtual path assert( *virtBase != '/' ); char *src = virtBase, *dst = imgName; |