[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH 18/30] block: protect path_has_protocol from filenam

From: Kevin Wolf
Subject: [Qemu-devel] [PATCH 18/30] block: protect path_has_protocol from filenames with colons
Date: Thu, 10 May 2012 13:49:22 +0200

From: Paolo Bonzini <address@hidden>

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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
 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 "<protocol>:" */
 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, ":/\\");
+    p = path + strcspn(path, ":/");
-    return strchr(path, ':') != NULL;
+    return *p == ':';
 int path_is_absolute(const char *path)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]