summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-12-12 20:21:14 +0000
committerjstebbins <[email protected]>2012-12-12 20:21:14 +0000
commit6a14c28cf9ed9c5f7eb217bc25c4a736326d3c13 (patch)
treee6fe227c5eb7717b9aeeb9c438d02d5a7d3e6dfe /libhb
parent0677b1b418d3cbaaa69cd2202283443036937150 (diff)
fix some crashes in the macui
I missed setting some pointers to NULL after free and missed place where the ui was setting job->file directly instead of using hb_job_set_file(). Also, a NULL chapter name caused a crash. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5097 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/common.c2
-rw-r--r--libhb/stream.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/libhb/common.c b/libhb/common.c
index 60c2b4ed7..34c97da54 100644
--- a/libhb/common.c
+++ b/libhb/common.c
@@ -1738,7 +1738,9 @@ static void job_clean( hb_job_t * job )
hb_attachment_t *attachment;
free(job->file);
+ job->file = NULL;
free(job->advanced_opts);
+ job->advanced_opts = NULL;
// clean up chapter list
while( ( chapter = hb_list_item( job->list_chapter, 0 ) ) )
diff --git a/libhb/stream.c b/libhb/stream.c
index 5d4f36516..02a49e20c 100644
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -1076,6 +1076,7 @@ hb_title_t * hb_stream_title_scan(hb_stream_t *stream, hb_title_t * title)
// One Chapter
hb_chapter_t * chapter;
chapter = calloc( sizeof( hb_chapter_t ), 1 );
+ hb_chapter_set_title( chapter, "Chapter 1" );
chapter->index = 1;
chapter->duration = title->duration;
chapter->hours = title->hours;