Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
a1d4c652
Commit
a1d4c652
authored
Oct 29, 2008
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use asprintf and use free instead of g_free (fixes #2252)
parent
35d35480
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
11 deletions
+10
-11
modules/access/gnomevfs.c
modules/access/gnomevfs.c
+10
-11
No files found.
modules/access/gnomevfs.c
View file @
a1d4c652
...
@@ -81,6 +81,9 @@ struct access_sys_t
...
@@ -81,6 +81,9 @@ struct access_sys_t
bool
b_pace_control
;
bool
b_pace_control
;
};
};
/* NOTE: we do not handle memory errors in this plugin.
* Underlying glib does not, so there is no point in doing it here either. */
/*****************************************************************************
/*****************************************************************************
* Open: open the file
* Open: open the file
*****************************************************************************/
*****************************************************************************/
...
@@ -116,9 +119,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -116,9 +119,7 @@ static int Open( vlc_object_t *p_this )
if
(
strcmp
(
"gnomevfs"
,
p_access
->
psz_access
)
&&
if
(
strcmp
(
"gnomevfs"
,
p_access
->
psz_access
)
&&
*
(
p_access
->
psz_access
)
!=
'\0'
)
*
(
p_access
->
psz_access
)
!=
'\0'
)
{
{
psz_name
=
malloc
(
strlen
(
p_access
->
psz_access
)
+
asprintf
(
&
psz_name
,
"%s://%s"
,
p_access
->
psz_access
,
strlen
(
p_access
->
psz_path
)
+
4
);
sprintf
(
psz_name
,
"%s://%s"
,
p_access
->
psz_access
,
p_access
->
psz_path
);
p_access
->
psz_path
);
}
}
else
else
...
@@ -156,9 +157,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -156,9 +157,7 @@ static int Open( vlc_object_t *p_this )
psz_path_begin
=
psz_unescaped
+
strlen
(
psz_unescaped
)
psz_path_begin
=
psz_unescaped
+
strlen
(
psz_unescaped
)
-
strlen
(
url
.
psz_path
);
-
strlen
(
url
.
psz_path
);
*
psz_path_begin
=
'\0'
;
*
psz_path_begin
=
'\0'
;
psz_uri
=
malloc
(
strlen
(
psz_unescaped
)
+
asprintf
(
&
psz_uri
,
"%s%s"
,
psz_unescaped
,
psz_escaped_path
);
strlen
(
psz_escaped_path
)
+
1
);
sprintf
(
psz_uri
,
"%s%s"
,
psz_unescaped
,
psz_escaped_path
);
g_free
(
psz_escaped_path
);
g_free
(
psz_escaped_path
);
g_free
(
psz_unescaped
);
g_free
(
psz_unescaped
);
...
@@ -188,7 +187,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -188,7 +187,7 @@ static int Open( vlc_object_t *p_this )
gnome_vfs_file_info_unref
(
p_sys
->
p_file_info
);
gnome_vfs_file_info_unref
(
p_sys
->
p_file_info
);
gnome_vfs_uri_unref
(
p_uri
);
gnome_vfs_uri_unref
(
p_uri
);
free
(
p_sys
);
free
(
p_sys
);
g_
free
(
psz_uri
);
free
(
psz_uri
);
free
(
psz_name
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -196,7 +195,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -196,7 +195,7 @@ static int Open( vlc_object_t *p_this )
else
else
{
{
msg_Warn
(
p_access
,
"cannot parse MRL %s or unsupported protocol"
,
psz_name
);
msg_Warn
(
p_access
,
"cannot parse MRL %s or unsupported protocol"
,
psz_name
);
g_
free
(
psz_uri
);
free
(
psz_uri
);
free
(
p_sys
);
free
(
p_sys
);
free
(
psz_name
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -210,7 +209,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -210,7 +209,7 @@ static int Open( vlc_object_t *p_this )
gnome_vfs_result_to_string
(
i_ret
)
);
gnome_vfs_result_to_string
(
i_ret
)
);
gnome_vfs_uri_unref
(
p_uri
);
gnome_vfs_uri_unref
(
p_uri
);
g_
free
(
psz_uri
);
free
(
psz_uri
);
free
(
p_sys
);
free
(
p_sys
);
free
(
psz_name
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -246,7 +245,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -246,7 +245,7 @@ static int Open( vlc_object_t *p_this )
gnome_vfs_file_info_unref
(
p_sys
->
p_file_info
);
gnome_vfs_file_info_unref
(
p_sys
->
p_file_info
);
gnome_vfs_uri_unref
(
p_uri
);
gnome_vfs_uri_unref
(
p_uri
);
free
(
p_sys
);
free
(
p_sys
);
g_
free
(
psz_uri
);
free
(
psz_uri
);
free
(
psz_name
);
free
(
psz_name
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
...
@@ -255,7 +254,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -255,7 +254,7 @@ static int Open( vlc_object_t *p_this )
var_Create
(
p_access
,
"gnomevfs-caching"
,
var_Create
(
p_access
,
"gnomevfs-caching"
,
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
VLC_VAR_INTEGER
|
VLC_VAR_DOINHERIT
);
g_
free
(
psz_uri
);
free
(
psz_uri
);
p_sys
->
psz_name
=
psz_name
;
p_sys
->
psz_name
=
psz_name
;
gnome_vfs_uri_unref
(
p_uri
);
gnome_vfs_uri_unref
(
p_uri
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment