opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Can't use vol->dev->d_name before it is allocated! D'oh! 

Thanks to Szaka for reporting this.

(Logical change 1.152)
edge.strict_endians
cantab.net!aia21 2003-07-11 14:35:49 +00:00
parent 622901527f
commit 163d414c9f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ntfsprogs/mkntfs.c
View File

@ -123,6 +123,7 @@ runlist *rl = NULL, *rl_mft = NULL, *rl_mft_bmp = NULL, *rl_mftmirr = NULL;
runlist *rl_logfile = NULL, *rl_boot = NULL, *rl_bad = NULL, *rl_index;
INDEX_ALLOCATION *index_block = NULL;
ntfs_volume *vol;
char *dev_name;
struct {
int sector_size; /* -s, in bytes, power of 2, default is
@ -351,7 +352,7 @@ void parse_options(int argc, char *argv[])
}
if (optind == argc)
usage();
vol->dev->d_name = argv[optind++];
dev_name = argv[optind++];
if (optind < argc) {
u = strtoul(argv[optind++], &s, 0);
if (*s || !u || (u >= ULONG_MAX && errno == ERANGE))
@ -2553,7 +2554,7 @@ int main(int argc, char **argv)
* Allocate and initialize an ntfs device structure and attach it to
* the volume.
*/
if (!(vol->dev = ntfs_device_alloc(vol->dev->d_name, 0,
if (!(vol->dev = ntfs_device_alloc(dev_name, 0,
&ntfs_device_disk_io_ops, NULL)))
err_exit("Could not allocate memory for internal buffer.\n");
/* Open the device for reading or reading and writing. */