From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yO-0000iF-Fn for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ5yM-0001Ob-CW for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ5yM-0001OI-2z for qemu-devel@nongnu.org; Fri, 22 Mar 2013 13:41:46 -0400 From: Kevin Wolf Date: Fri, 22 Mar 2013 18:41:20 +0100 Message-Id: <1363974083-28440-12-git-send-email-kwolf@redhat.com> In-Reply-To: <1363974083-28440-1-git-send-email-kwolf@redhat.com> References: <1363974083-28440-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 11/14] block: Make find_image_format safe with NULL filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 Reviewed-by: Eric Blake --- 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