Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
obs-studio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Yunxiang Li
obs-studio
Commits
10f5d7f3
Commit
10f5d7f3
authored
10 years ago
by
GoaLitiuM
Browse files
Options
Downloads
Patches
Plain Diff
Fixed NULL pointer dereferencing in linked lists
parent
d17565af
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
libobs-opengl/gl-shader.c
+2
-1
2 additions, 1 deletion
libobs-opengl/gl-shader.c
libobs/media-io/audio-io.c
+2
-1
2 additions, 1 deletion
libobs/media-io/audio-io.c
libobs/obs-display.c
+2
-1
2 additions, 1 deletion
libobs/obs-display.c
libobs/obs.c
+2
-1
2 additions, 1 deletion
libobs/obs.c
with
8 additions
and
4 deletions
libobs-opengl/gl-shader.c
+
2
−
1
View file @
10f5d7f3
...
@@ -673,7 +673,8 @@ void gs_program_destroy(struct gs_program *program)
...
@@ -673,7 +673,8 @@ void gs_program_destroy(struct gs_program *program)
if
(
program
->
next
)
if
(
program
->
next
)
program
->
next
->
prev_next
=
program
->
prev_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
);
glDeleteProgram
(
program
->
obj
);
gl_success
(
"glDeleteProgram"
);
gl_success
(
"glDeleteProgram"
);
...
...
This diff is collapsed.
Click to expand it.
libobs/media-io/audio-io.c
+
2
−
1
View file @
10f5d7f3
...
@@ -99,7 +99,8 @@ static inline void audio_output_removeline(struct audio_output *audio,
...
@@ -99,7 +99,8 @@ static inline void audio_output_removeline(struct audio_output *audio,
struct
audio_line
*
line
)
struct
audio_line
*
line
)
{
{
pthread_mutex_lock
(
&
audio
->
line_mutex
);
pthread_mutex_lock
(
&
audio
->
line_mutex
);
*
line
->
prev_next
=
line
->
next
;
if
(
line
->
prev_next
)
*
line
->
prev_next
=
line
->
next
;
if
(
line
->
next
)
if
(
line
->
next
)
line
->
next
->
prev_next
=
line
->
prev_next
;
line
->
next
->
prev_next
=
line
->
prev_next
;
pthread_mutex_unlock
(
&
audio
->
line_mutex
);
pthread_mutex_unlock
(
&
audio
->
line_mutex
);
...
...
This diff is collapsed.
Click to expand it.
libobs/obs-display.c
+
2
−
1
View file @
10f5d7f3
...
@@ -86,7 +86,8 @@ void obs_display_destroy(obs_display_t *display)
...
@@ -86,7 +86,8 @@ void obs_display_destroy(obs_display_t *display)
{
{
if
(
display
)
{
if
(
display
)
{
pthread_mutex_lock
(
&
obs
->
data
.
displays_mutex
);
pthread_mutex_lock
(
&
obs
->
data
.
displays_mutex
);
*
display
->
prev_next
=
display
->
next
;
if
(
display
->
prev_next
)
*
display
->
prev_next
=
display
->
next
;
if
(
display
->
next
)
if
(
display
->
next
)
display
->
next
->
prev_next
=
display
->
prev_next
;
display
->
next
->
prev_next
=
display
->
prev_next
;
pthread_mutex_unlock
(
&
obs
->
data
.
displays_mutex
);
pthread_mutex_unlock
(
&
obs
->
data
.
displays_mutex
);
...
...
This diff is collapsed.
Click to expand it.
libobs/obs.c
+
2
−
1
View file @
10f5d7f3
...
@@ -1326,7 +1326,8 @@ void obs_context_data_remove(struct obs_context_data *context)
...
@@ -1326,7 +1326,8 @@ void obs_context_data_remove(struct obs_context_data *context)
{
{
if
(
context
&&
context
->
mutex
)
{
if
(
context
&&
context
->
mutex
)
{
pthread_mutex_lock
(
context
->
mutex
);
pthread_mutex_lock
(
context
->
mutex
);
*
context
->
prev_next
=
context
->
next
;
if
(
context
->
prev_next
)
*
context
->
prev_next
=
context
->
next
;
if
(
context
->
next
)
if
(
context
->
next
)
context
->
next
->
prev_next
=
context
->
prev_next
;
context
->
next
->
prev_next
=
context
->
prev_next
;
pthread_mutex_unlock
(
context
->
mutex
);
pthread_mutex_unlock
(
context
->
mutex
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment