Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
8224f1e0
Commit
8224f1e0
authored
Feb 04, 2020
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/urldecode: add the ability to not decode plus sign to space
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
6a7b5226
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
httpauth.c
libavformat/httpauth.c
+2
-2
urldecode.c
libavformat/urldecode.c
+2
-2
urldecode.h
libavformat/urldecode.h
+2
-1
No files found.
libavformat/httpauth.c
View file @
8224f1e0
...
@@ -255,7 +255,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
...
@@ -255,7 +255,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
if
(
state
->
auth_type
==
HTTP_AUTH_BASIC
)
{
if
(
state
->
auth_type
==
HTTP_AUTH_BASIC
)
{
int
auth_b64_len
,
len
;
int
auth_b64_len
,
len
;
char
*
ptr
,
*
decoded_auth
=
ff_urldecode
(
auth
);
char
*
ptr
,
*
decoded_auth
=
ff_urldecode
(
auth
,
1
);
if
(
!
decoded_auth
)
if
(
!
decoded_auth
)
return
NULL
;
return
NULL
;
...
@@ -275,7 +275,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
...
@@ -275,7 +275,7 @@ char *ff_http_auth_create_response(HTTPAuthState *state, const char *auth,
av_strlcat
(
ptr
,
"
\r\n
"
,
len
-
(
ptr
-
authstr
));
av_strlcat
(
ptr
,
"
\r\n
"
,
len
-
(
ptr
-
authstr
));
av_free
(
decoded_auth
);
av_free
(
decoded_auth
);
}
else
if
(
state
->
auth_type
==
HTTP_AUTH_DIGEST
)
{
}
else
if
(
state
->
auth_type
==
HTTP_AUTH_DIGEST
)
{
char
*
username
=
ff_urldecode
(
auth
),
*
password
;
char
*
username
=
ff_urldecode
(
auth
,
1
),
*
password
;
if
(
!
username
)
if
(
!
username
)
return
NULL
;
return
NULL
;
...
...
libavformat/urldecode.c
View file @
8224f1e0
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
#include "libavutil/avstring.h"
#include "libavutil/avstring.h"
#include "urldecode.h"
#include "urldecode.h"
char
*
ff_urldecode
(
const
char
*
url
)
char
*
ff_urldecode
(
const
char
*
url
,
int
decode_plus_sign
)
{
{
int
s
=
0
,
d
=
0
,
url_len
=
0
;
int
s
=
0
,
d
=
0
,
url_len
=
0
;
char
c
;
char
c
;
...
@@ -74,7 +74,7 @@ char *ff_urldecode(const char *url)
...
@@ -74,7 +74,7 @@ char *ff_urldecode(const char *url)
dest
[
d
++
]
=
c2
;
dest
[
d
++
]
=
c2
;
dest
[
d
++
]
=
c3
;
dest
[
d
++
]
=
c3
;
}
}
}
else
if
(
c
==
'+'
)
{
}
else
if
(
c
==
'+'
&&
decode_plus_sign
)
{
dest
[
d
++
]
=
' '
;
dest
[
d
++
]
=
' '
;
}
else
{
}
else
{
dest
[
d
++
]
=
c
;
dest
[
d
++
]
=
c
;
...
...
libavformat/urldecode.h
View file @
8224f1e0
...
@@ -26,10 +26,11 @@
...
@@ -26,10 +26,11 @@
* in that case the original string is duplicated.
* in that case the original string is duplicated.
*
*
* @param url a string to be decoded.
* @param url a string to be decoded.
* @param decode_plus_sign if nonzero plus sign is decoded to space
* @return new string with the URL decoded or NULL if decoding failed.
* @return new string with the URL decoded or NULL if decoding failed.
* Note that the returned string should be explicitly freed when not
* Note that the returned string should be explicitly freed when not
* used anymore.
* used anymore.
*/
*/
char
*
ff_urldecode
(
const
char
*
url
);
char
*
ff_urldecode
(
const
char
*
url
,
int
decode_plus_sign
);
#endif
/* AVFORMAT_URLDECODE_H */
#endif
/* AVFORMAT_URLDECODE_H */
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