Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8fcf7013
Commit
8fcf7013
authored
Jul 26, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 26, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
urlmon: Store URI host len in parse_ipv4address before further parsing.
parent
7c04ed36
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
3 deletions
+28
-3
uri.c
dlls/urlmon/tests/uri.c
+25
-0
uri.c
dlls/urlmon/uri.c
+3
-3
No files found.
dlls/urlmon/tests/uri.c
View file @
8fcf7013
...
...
@@ -997,6 +997,31 @@ static const uri_properties uri_tests[] = {
{
URLZONE_INVALID
,
E_NOTIMPL
,
FALSE
}
}
},
{
"http://127.0.0.1:8000"
,
0
,
S_OK
,
FALSE
,
{
{
"http://127.0.0.1:8000/"
,
S_OK
},
{
"127.0.0.1:8000"
,
S_OK
},
{
"http://127.0.0.1:8000/"
,
S_OK
},
{
""
,
S_FALSE
},
{
""
,
S_FALSE
},
{
""
,
S_FALSE
},
{
"127.0.0.1"
,
S_OK
},
{
""
,
S_FALSE
},
{
"/"
,
S_OK
},
{
"/"
,
S_OK
},
{
""
,
S_FALSE
},
{
"http://127.0.0.1:8000"
,
S_OK
},
{
"http"
,
S_OK
},
{
""
,
S_FALSE
},
{
""
,
S_FALSE
}
},
{
{
Uri_HOST_IPV4
,
S_OK
,
FALSE
},
{
8000
,
S_OK
,
FALSE
},
{
URL_SCHEME_HTTP
,
S_OK
,
FALSE
},
{
URLZONE_INVALID
,
E_NOTIMPL
,
FALSE
}
}
},
/* Make sure it normalizes partial IPv4 addresses correctly. */
{
"http://127.0/"
,
0
,
S_OK
,
FALSE
,
{
...
...
dlls/urlmon/uri.c
View file @
8fcf7013
...
...
@@ -1493,6 +1493,9 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags)
data
->
has_implicit_ip
=
TRUE
;
}
data
->
host_len
=
*
ptr
-
data
->
host
;
data
->
host_type
=
Uri_HOST_IPV4
;
/* Check if what we found is the only part of the host name (if it isn't
* we don't have an IPv4 address).
*/
...
...
@@ -1511,9 +1514,6 @@ static BOOL parse_ipv4address(const WCHAR **ptr, parse_data *data, DWORD flags)
return
FALSE
;
}
data
->
host_len
=
*
ptr
-
data
->
host
;
data
->
host_type
=
Uri_HOST_IPV4
;
TRACE
(
"(%p %p %x): IPv4 address found. host=%s host_len=%d host_type=%d
\n
"
,
ptr
,
data
,
flags
,
debugstr_wn
(
data
->
host
,
data
->
host_len
),
data
->
host_len
,
data
->
host_type
);
...
...
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