diff --git a/libobs-opengl/gl-shader.c b/libobs-opengl/gl-shader.c index b3c03e16676bbad6a990718505899c1fa6a9af76..931a95edee05324f16d2fc06dff96c321ec04943 100644 --- a/libobs-opengl/gl-shader.c +++ b/libobs-opengl/gl-shader.c @@ -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"); diff --git a/libobs/media-io/audio-io.c b/libobs/media-io/audio-io.c index 806a3315609580c25d82fe5b7e78f98c5b6f6993..3829f81c9c93afa324722df378569580318b2a7c 100644 --- a/libobs/media-io/audio-io.c +++ b/libobs/media-io/audio-io.c @@ -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); diff --git a/libobs/obs-display.c b/libobs/obs-display.c index a20b5524994fd4ce71c047abbb6172a2ede2b48c..f433d8620753bce8c0949e6ec440d9133eb99f98 100644 --- a/libobs/obs-display.c +++ b/libobs/obs-display.c @@ -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); diff --git a/libobs/obs.c b/libobs/obs.c index e06ff457fea999bc01e4d43b2d8d7ec7dec8ee4a..fc5904467ad876168195b834adf6f2a868c95f98 100644 --- a/libobs/obs.c +++ b/libobs/obs.c @@ -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);