Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-20 00:31:28 +00:00
Code Issues Projects Releases Wiki Activity

sparsebundle: Minor fixes

Browse Source 
- Allocate memory in disk_sparsebundle() constructor
- Constify constructor parameter
- Be careful with invalid fds
This commit is contained in:
Dave Vasilevsky 2013-03-10 12:03:34 -04:00
parent 17aabc4c40
commit 0c8292aea3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BasiliskII/src/Unix/disk_sparsebundle.cpp
View File

@ -39,18 +39,19 @@ static ssize_t band_read(int fd, void *buf, size_t len) {
} }
static ssize_t band_write(int fd, void *buf, size_t len) { static ssize_t band_write(int fd, void *buf, size_t len) {
return ::write(fd, buf, len); return (fd == -1 ? 0 : ::write(fd, buf, len));
} }
struct disk_sparsebundle : disk_generic { struct disk_sparsebundle : disk_generic {
disk_sparsebundle(char *bands, int fd, bool read_only, loff_t band_size, disk_sparsebundle(const char *bands, int fd, bool read_only,
loff_t total_size) loff_t band_size, loff_t total_size)
: token_fd(fd), read_only(read_only), band_size(band_size), : token_fd(fd), read_only(read_only), band_size(band_size),
total_size(total_size), band_dir(bands), band_cur(-1), band_fd(0) { total_size(total_size), band_dir(strdup(bands)),
band_cur(-1), band_fd(-1) {
} }
virtual ~disk_sparsebundle() { virtual ~disk_sparsebundle() {
if (band_fd) if (band_fd != -1)
close(band_fd); close(band_fd);
close(token_fd); close(token_fd);
free(band_dir); free(band_dir);
@ -256,7 +257,6 @@ disk_generic *disk_sparsebundle_factory(const char *path, bool read_only) {
// We're good to go! // We're good to go!
if (snprintf(buf, PATH_MAX, "%s/%s", path, "bands") >= PATH_MAX) if (snprintf(buf, PATH_MAX, "%s/%s", path, "bands") >= PATH_MAX)
return NULL; return NULL;
char *bands = strdup(buf); return new disk_sparsebundle(buf, token, read_only, band_size,
return new disk_sparsebundle(bands, token, read_only, band_size,
total_size); total_size);
} }