opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #271 from GoaLitiuM/master

Browse Source 
Fixed NULL pointer dereferencing in linked lists
This commit is contained in:
Jim
2014-09-26 15:45:22 -07:00
parent d17565afc8 10f5d7f3aa
commit 3b91247f4b
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libobs-opengl/gl-shader.c
+2 -1
View File
@@ -673,7 +673,8 @@ void gs_program_destroy(struct gs_program *program)
if (program->next)
program->next->prev_next = program->prev_next;
*program->prev_next = program->next;
if (program->prev_next)
*program->prev_next = program->next;
glDeleteProgram(program->obj);
gl_success("glDeleteProgram");
libobs/media-io/audio-io.c
+2 -1
View File
@@ -99,7 +99,8 @@ static inline void audio_output_removeline(struct audio_output *audio,
struct audio_line *line)
{
pthread_mutex_lock(&audio->line_mutex);
*line->prev_next = line->next;
if (line->prev_next)
*line->prev_next = line->next;
if (line->next)
line->next->prev_next = line->prev_next;
pthread_mutex_unlock(&audio->line_mutex);
libobs/obs-display.c
+2 -1
View File
@@ -86,7 +86,8 @@ void obs_display_destroy(obs_display_t *display)
{
if (display) {
pthread_mutex_lock(&obs->data.displays_mutex);
*display->prev_next = display->next;
if (display->prev_next)
*display->prev_next = display->next;
if (display->next)
display->next->prev_next = display->prev_next;
pthread_mutex_unlock(&obs->data.displays_mutex);
libobs/obs.c
+2 -1
View File
@@ -1326,7 +1326,8 @@ void obs_context_data_remove(struct obs_context_data *context)
{
if (context && context->mutex) {
pthread_mutex_lock(context->mutex);
*context->prev_next = context->next;
if (context->prev_next)
*context->prev_next = context->next;
if (context->next)
context->next->prev_next = context->prev_next;
pthread_mutex_unlock(context->mutex);