Changeset 3949 for pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

Timestamp:

Feb 3, 2012 7:56:12 AM (12 years ago)

Author:

ming

Message:

Re #1446 (misc fix): Fix crash problem due to uninitialized list when SDL creation failed

File:

• pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -915 +915 @@
     strm->sf = sf;
     pj_memcpy(&strm->vid_cb, cb, sizeof(*cb));
+    pj_list_init(&strm->list_entry);
+    strm->list_entry.stream = strm;
     strm->user_data = user_data;
 
     /* Create render stream here */
-    if (param->dir & PJMEDIA_DIR_RENDER) {
-        job_queue_post_job(sf->jq, sdl_create, strm, 0, &status);
-        if (status != PJ_SUCCESS) {
-            goto on_error;
-        }
-        pj_list_init(&strm->list_entry);
-        strm->list_entry.stream = strm;
-        pj_mutex_lock(strm->sf->mutex);
-        if (pj_list_empty(&strm->sf->streams))
-            pj_sem_post(strm->sf->sem);
-        pj_list_insert_after(&strm->sf->streams, &strm->list_entry);
-        pj_mutex_unlock(strm->sf->mutex);
-    }
+    job_queue_post_job(sf->jq, sdl_create, strm, 0, &status);
+    if (status != PJ_SUCCESS) {
+        goto on_error;
+    }
+    pj_mutex_lock(strm->sf->mutex);
+    if (pj_list_empty(&strm->sf->streams))
+        pj_sem_post(strm->sf->sem);
+    pj_list_insert_after(&strm->sf->streams, &strm->list_entry);
+    pj_mutex_unlock(strm->sf->mutex);
 
     /* Apply the remaining settings */