Player Driver and Author Driver crash fix, if InitializeThread fails

diff --git a/android/author/authordriver.cpp b/android/author/authordriver.cpp
index fd3c357..71835d6 100644 (file)
--- a/android/author/authordriver.cpp
+++ b/android/author/authordriver.cpp
@@ -151,6 +151,9 @@ author_command *AuthorDriver::dequeueCommand()
 
 status_t AuthorDriver::enqueueCommand(author_command *ac, media_completion_f comp, void *cookie)
 {
+    if (mAuthor == NULL) {
+        return NO_INIT;
+    }
     // If the user didn't specify a completion callback, we
     // are running in synchronous mode.
     if (comp == NULL) {

diff --git a/android/playerdriver.cpp b/android/playerdriver.cpp
index b817bb0..64ba67c 100644 (file)
--- a/android/playerdriver.cpp
+++ b/android/playerdriver.cpp
@@ -390,7 +390,8 @@ PlayerCommand* PlayerDriver::dequeueCommand()
 status_t PlayerDriver::enqueueCommand(PlayerCommand* command)
 {
     if (mPlayer == NULL) {
-        delete command;
+        // Only commands which can come in this use-case is PLAYER_SETUP and PLAYER_QUIT
+        // The calling function should take responsibility to delete the command and cleanup
         return NO_INIT;
     }
 
@@ -1330,7 +1331,11 @@ PVPlayer::PVPlayer()
     LOGV("construct PlayerDriver");
     mPlayerDriver = new PlayerDriver(this);
     LOGV("send PLAYER_SETUP");
-    mInit = mPlayerDriver->enqueueCommand(new PlayerSetup(0,0));
+    PlayerSetup* setup = new PlayerSetup(0,0);
+    mInit = mPlayerDriver->enqueueCommand(setup);
+    if (mInit == NO_INIT) {
+        delete setup;
+    }
 }
 
 status_t PVPlayer::initCheck()