[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/14] block: Make find_image_format safe with NULL
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 11/14] block: Make find_image_format safe with NULL filename |
Date: |
Fri, 22 Mar 2013 18:41:20 +0100 |
In order to achieve this, the .bdrv_probe callbacks of all drivers must
cope with this. The DMG driver is the only one that bases its decision
on the filename and it needs to be changed.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/dmg.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/block/dmg.c b/block/dmg.c
index c1066df..3141cb5 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -51,9 +51,16 @@ typedef struct BDRVDMGState {
static int dmg_probe(const uint8_t *buf, int buf_size, const char *filename)
{
- int len=strlen(filename);
- if(len>4 && !strcmp(filename+len-4,".dmg"))
- return 2;
+ int len;
+
+ if (!filename) {
+ return 0;
+ }
+
+ len = strlen(filename);
+ if (len > 4 && !strcmp(filename + len - 4, ".dmg")) {
+ return 2;
+ }
return 0;
}
--
1.8.1.4
- [Qemu-devel] [PULL 00/14] Block patches, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 01/14] Revert "block: complete all IOs before .bdrv_truncate", Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 02/14] block: complete all IOs before resizing a device, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 04/14] block: Pass bdrv_file_open() options to block drivers, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 07/14] nbd: Remove unused functions, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 08/14] nbd: Accept -drive options for the network connection, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 05/14] qemu-socket: Make socket_optslist public, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 10/14] block: Rename variable to avoid shadowing, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 11/14] block: Make find_image_format safe with NULL filename,
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/14] block: Add options QDict to bdrv_file_open() prototypes, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 14/14] nbd: Check against invalid option combinations, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 06/14] nbd: Keep hostname and port separate, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 09/14] block: Introduce .bdrv_parse_filename callback, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 12/14] block: Allow omitting the file name when using driver-specific options, Kevin Wolf, 2013/03/22
- [Qemu-devel] [PATCH 13/14] nbd: Use default port if only host is specified, Kevin Wolf, 2013/03/22