Skip to content

V
vlc
Commit 767b9137 authored by JP Dinger's avatar JP Dinger Committed by Rémi Denis-Courmont
Browse files
Options

Cosmetics 

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent b7f934a7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
projects/mozilla/vlcplugin.cpp
View file @ 767b9137
...@@ -476,7 +476,7 @@ relativeurl: ...@@ -476,7 +476,7 @@ relativeurl:
if( href ) if( href )
{ {
/* prepend base URL */ /* prepend base URL */
strcpy(href, psz_baseURL); memcpy(href, psz_baseURL, baseLen+1);
/* /*
** relative url could be empty, ** relative url could be empty,
...@@ -491,7 +491,7 @@ relativeurl: ...@@ -491,7 +491,7 @@ relativeurl:
/* skip over protocol part */ /* skip over protocol part */
char *pathstart = strchr(href, ':'); char *pathstart = strchr(href, ':');
char *pathend; char *pathend = href+baseLen;
if( pathstart ) if( pathstart )
{ {
if( '/' == *(++pathstart) ) if( '/' == *(++pathstart) )
...@@ -503,7 +503,6 @@ relativeurl: ...@@ -503,7 +503,6 @@ relativeurl:
} }
/* skip over host part */ /* skip over host part */
pathstart = strchr(pathstart, '/'); pathstart = strchr(pathstart, '/');
pathend = href+baseLen;
if( ! pathstart ) if( ! pathstart )
{ {
// no path, add a / past end of url (over '\0') // no path, add a / past end of url (over '\0')
...@@ -521,7 +520,6 @@ relativeurl: ...@@ -521,7 +520,6 @@ relativeurl:
return NULL; return NULL;
} }
pathstart = href; pathstart = href;
pathend = href+baseLen;
} }
/* relative URL made of an absolute path ? */ /* relative URL made of an absolute path ? */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment