From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsf-0001WC-4F for qemu-devel@nongnu.org; Thu, 10 May 2012 07:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSRsd-0006Hm-7m for qemu-devel@nongnu.org; Thu, 10 May 2012 07:50:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSRsc-0006H3-W1 for qemu-devel@nongnu.org; Thu, 10 May 2012 07:49:59 -0400 From: Kevin Wolf Date: Thu, 10 May 2012 13:49:22 +0200 Message-Id: <1336650574-12835-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1336650574-12835-1-git-send-email-kwolf@redhat.com> References: <1336650574-12835-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 18/30] block: protect path_has_protocol from filenames with colons List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini path_has_protocol will erroneously return "true" if the colon is part of a filename. These names are common with stable device names produced by udev. We cannot fully protect against this in case the filename does not have a path component (e.g. if the current directory is /dev/disk/by-path), but in the common case there will be a slash before and path_has_protocol can easily detect that and return false. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- block.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/block.c b/block.c index 0fb188f..8eeb519 100644 --- a/block.c +++ b/block.c @@ -198,14 +198,19 @@ static void bdrv_io_limits_intercept(BlockDriverState *bs, /* check if the path starts with ":" */ static int path_has_protocol(const char *path) { + const char *p; + #ifdef _WIN32 if (is_windows_drive(path) || is_windows_drive_prefix(path)) { return 0; } + p = path + strcspn(path, ":/\\"); +#else + p = path + strcspn(path, ":/"); #endif - return strchr(path, ':') != NULL; + return *p == ':'; } int path_is_absolute(const char *path) -- 1.7.6.5