aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2011-11-16 15:43:47 +0100
committerStefan Hajnoczi <stefanha@linux.vnet.ibm.com>2011-11-17 12:57:49 +0000
commitc951d9a6751576a076ac80a5e5145ceb8d794d38 (patch)
tree3fb2ec211e17e11476872061d70a7056b72ba8d2
parente6d89f8c2518763b4d84f05a10d3fca02b9c8182 (diff)
downloadqemu-c951d9a6751576a076ac80a5e5145ceb8d794d38.zip
qemu-c951d9a6751576a076ac80a5e5145ceb8d794d38.tar.gz
qemu-c951d9a6751576a076ac80a5e5145ceb8d794d38.tar.bz2
monitor: Fix file_completion() to check for stat() failure
stat() can fail for a file name just read with readdir(). Easiest way to trigger is a dangling symbolic link --- look ma, no race! When it fails, file_completion() uses sb.st_mode uninitialized. If the directory bit happens to be set, it appends a "/" to the completed name. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 5ea35de..1be222e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4207,9 +4207,9 @@ static void file_completion(const char *input)
/* stat the file to find out if it's a directory.
* In that case add a slash to speed up typing long paths
*/
- stat(file, &sb);
- if(S_ISDIR(sb.st_mode))
+ if (stat(file, &sb) == 0 && S_ISDIR(sb.st_mode)) {
pstrcat(file, sizeof(file), "/");
+ }
readline_add_completion(cur_mon->rs, file);
}
}