Sanity check in encfaacClose or we'll abort on an illegal channel spec or sample ratesince init sets job->die which causes close to be called when the work struct hasn't been fully set up.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1812 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 23 insertions, 6 deletions

diff --git a/libhb/encfaac.c b/libhb/encfaac.c
index ae2e54b36..cd333d3f3 100644
--- a/libhb/encfaac.c
+++ b/libhb/encfaac.c
@@ -127,12 +127,29 @@ int encfaacInit( hb_work_object_t * w, hb_job_t * job )
 void encfaacClose( hb_work_object_t * w )
 {
     hb_work_private_t * pv = w->private_data;
-    faacEncClose( pv->faac );
-    free( pv->buf );
-    free( pv->obuf );
-    hb_list_empty( &pv->list );
-    free( pv );
-    w->private_data = NULL;
+    if ( pv )
+    {
+        if ( pv->faac )
+        {
+            faacEncClose( pv->faac );
+            pv->faac = NULL;
+        }
+        if ( pv->buf )
+        {
+            free( pv->buf );
+            pv->buf = NULL;
+        }
+        if ( pv->obuf )
+        {
+            free( pv->obuf );
+            pv->obuf = NULL;
+        }
+        if ( pv->list )
+            hb_list_empty( &pv->list );
+
+        free( pv );
+        w->private_data = NULL;
+    }
 }
 
 /***********************************************************************