libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix: Wrong stack usage caused SIGBUS on sparc when compiled by gcc -O2

Browse Source
This commit is contained in:
Thomas Schmitt 2014-04-29 06:18:41 +00:00
parent e54f6ebd68
commit 91eca50221
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2014.04.19.114816" #define Cdrskin_timestamP "2014.04.29.061645"

63
libburn/async.c
View File

@ -1,7 +1,7 @@
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */ /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net> Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
*/ */
@ -98,6 +98,14 @@ struct fifo_opts
int flag; int flag;
}; };
union w_list_data
{
struct scan_opts scan;
struct erase_opts erase;
struct format_opts format;
struct write_opts write;
struct fifo_opts fifo;
};
struct w_list struct w_list
{ {
@ -109,14 +117,7 @@ struct w_list
struct w_list *next; struct w_list *next;
union w_list_data union w_list_data u;
{
struct scan_opts scan;
struct erase_opts erase;
struct format_opts format;
struct write_opts write;
struct fifo_opts fifo;
} u;
}; };
static struct w_list *workers = NULL; static struct w_list *workers = NULL;
@ -133,7 +134,7 @@ static struct w_list *find_worker(struct burn_drive *d)
} }
static void add_worker(int w_type, struct burn_drive *d, static void add_worker(int w_type, struct burn_drive *d,
WorkerFunc f, void *data) WorkerFunc f, union w_list_data *data)
{ {
struct w_list *a; struct w_list *a;
struct w_list *tmp; struct w_list *tmp;
@ -146,7 +147,11 @@ static void add_worker(int w_type, struct burn_drive *d,
a = calloc(1, sizeof(struct w_list)); a = calloc(1, sizeof(struct w_list));
a->w_type = w_type; a->w_type = w_type;
a->drive = d; a->drive = d;
a->u = *(union w_list_data *)data;
a->u = *data;
/*
memcpy(&(a->u), data, sizeof(union w_list_data));
*/
/* insert at front of the list */ /* insert at front of the list */
a->next = workers; a->next = workers;
@ -253,7 +258,7 @@ static void reset_progress(struct burn_drive *d, int sessions, int tracks,
int burn_drive_scan(struct burn_drive_info *drives[], unsigned int *n_drives) int burn_drive_scan(struct burn_drive_info *drives[], unsigned int *n_drives)
{ {
struct scan_opts o; union w_list_data o;
int ret = 0; int ret = 0;
/* ts A61006 : moved up from burn_drive_scan_sync , former Assert */ /* ts A61006 : moved up from burn_drive_scan_sync , former Assert */
@ -292,9 +297,9 @@ drive_is_active:;
*drives = NULL; *drives = NULL;
*n_drives = 0; *n_drives = 0;
o.drives = drives; o.scan.drives = drives;
o.n_drives = n_drives; o.scan.n_drives = n_drives;
o.done = 0; o.scan.done = 0;
add_worker(Burnworker_type_scaN, NULL, add_worker(Burnworker_type_scaN, NULL,
(WorkerFunc) scan_worker_func, &o); (WorkerFunc) scan_worker_func, &o);
} else if (workers->u.scan.done) { } else if (workers->u.scan.done) {
@ -346,7 +351,7 @@ static void *erase_worker_func(struct w_list *w)
void burn_disc_erase(struct burn_drive *drive, int fast) void burn_disc_erase(struct burn_drive *drive, int fast)
{ {
struct erase_opts o; union w_list_data o;
/* ts A61006 */ /* ts A61006 */
/* a ssert(drive); */ /* a ssert(drive); */
@ -408,8 +413,8 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
return; return;
} }
o.drive = drive; o.erase.drive = drive;
o.fast = fast; o.erase.fast = fast;
add_worker(Burnworker_type_erasE, drive, add_worker(Burnworker_type_erasE, drive,
(WorkerFunc) erase_worker_func, &o); (WorkerFunc) erase_worker_func, &o);
} }
@ -447,7 +452,7 @@ static void *format_worker_func(struct w_list *w)
/* ts A61230 */ /* ts A61230 */
void burn_disc_format(struct burn_drive *drive, off_t size, int flag) void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
{ {
struct format_opts o; union w_list_data o;
int ok = 0, ret; int ok = 0, ret;
char msg[40]; char msg[40];
@ -535,9 +540,9 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
drive->cancel = 1; drive->cancel = 1;
return; return;
} }
o.drive = drive; o.format.drive = drive;
o.size = size; o.format.size = size;
o.flag = flag; o.format.flag = flag;
add_worker(Burnworker_type_formaT, drive, add_worker(Burnworker_type_formaT, drive,
(WorkerFunc) format_worker_func, &o); (WorkerFunc) format_worker_func, &o);
} }
@ -589,7 +594,7 @@ static void *write_disc_worker_func(struct w_list *w)
void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc) void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
{ {
struct write_opts o; union w_list_data o;
char *reasons= NULL; char *reasons= NULL;
struct burn_drive *d; struct burn_drive *d;
int mvalid; int mvalid;
@ -683,9 +688,9 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
d->cancel = 0; /* End of the return = failure area */ d->cancel = 0; /* End of the return = failure area */
o.drive = d; o.write.drive = d;
o.opts = opts; o.write.opts = opts;
o.disc = disc; o.write.disc = disc;
opts->refcount++; opts->refcount++;
@ -731,7 +736,7 @@ static void *fifo_worker_func(struct w_list *w)
int burn_fifo_start(struct burn_source *source, int flag) int burn_fifo_start(struct burn_source *source, int flag)
{ {
struct fifo_opts o; union w_list_data o;
struct burn_source_fifo *fs = source->data; struct burn_source_fifo *fs = source->data;
fs->is_started = -1; fs->is_started = -1;
@ -744,8 +749,8 @@ int burn_fifo_start(struct burn_source *source, int flag)
return -1; return -1;
} }
o.source = source; o.fifo.source = source;
o.flag = flag; o.fifo.flag = flag;
add_worker(Burnworker_type_fifO, NULL, add_worker(Burnworker_type_fifO, NULL,
(WorkerFunc) fifo_worker_func, &o); (WorkerFunc) fifo_worker_func, &o);
fs->is_started = 1; fs->is_started = 1;