dfaggioli/qemu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Legacy Patch kvm-qemu-preXX-dictzip3.patch

Browse Source
This commit is contained in:
Alexander Graf
2012-12-12 19:11:30 +01:00
committed by Andreas Färber
parent 6b8c388560
commit 36f1cdefb3
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
block/tar.c
View File

@@ -83,7 +83,8 @@ static int str_ends(char *str, const char *end)
return !strncmp(str + str_len - end_len, end, end_len); return !strncmp(str + str_len - end_len, end, end_len);
} }
static int is_target_file(BlockDriverState *bs, char *filename) static int is_target_file(BlockDriverState *bs, char *filename,
char *header)
{ {
int retval = 0; int retval = 0;
@@ -99,10 +100,17 @@ static int is_target_file(BlockDriverState *bs, char *filename)
if (str_ends(filename, ".vmdk")) if (str_ends(filename, ".vmdk"))
retval = 1; retval = 1;
if (retval &&
(header[OFFS_TYPE] != '0') &&
(header[OFFS_TYPE] != 'S')) {
retval = 0;
}
dprintf("does filename %s match? %s\n", filename, retval ? "yes" : "no"); dprintf("does filename %s match? %s\n", filename, retval ? "yes" : "no");
/* make sure we're not using this name again */ /* make sure we're not using this name again */
filename[0] = '\0'; filename[0] = '\0';
return retval; return retval;
} }
@@ -229,12 +237,13 @@ static int tar_open(BlockDriverState *bs, QDict *options, int flags, Error **err
bdrv_pread(s->hd, header_offs - s->file_len, s->longfile, bdrv_pread(s->hd, header_offs - s->file_len, s->longfile,
sizeof(s->longfile)); sizeof(s->longfile));
s->longfile[sizeof(s->longfile)-1] = '\0'; s->longfile[sizeof(s->longfile)-1] = '\0';
real_file = header;
} else if (s->longfile[0]) { } else if (s->longfile[0]) {
real_file = s->longfile; real_file = s->longfile;
} else { } else {
real_file = header; real_file = header;
} }
} while(!is_target_file(bs, real_file)); } while(!is_target_file(bs, real_file, header));
/* We found an image! */ /* We found an image! */