From 92d643e8640d2609ee81d8b9f1605ce127cd8a31 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 2 Aug 2013 13:44:09 +0200 Subject: fix0rs --- src/server/image.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/image.c') 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; -- cgit v1.2.3-55-g7522