diff options
| author | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-07-09 12:18:10 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhsoting.net> | 2018-07-09 12:18:10 +0200 |
| commit | f10130df30ed342e6064aa60d2a56f5107385d6b (patch) | |
| tree | 202b9eac5bfd92ebfcb3b6402d68141032054eb0 /src/UriResolve.c | |
| parent | 12af0f6afae11029a608e33b98047aea4e82da7d (diff) | |
| parent | 86fee0b29894235a4a9a5e64afe0a643841f500f (diff) | |
Merge branch 'release/debian/0.8.5-2'debian/0.8.5-2
Diffstat (limited to 'src/UriResolve.c')
| -rw-r--r-- | src/UriResolve.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/UriResolve.c b/src/UriResolve.c index 3660b6b..bb1d21a 100644 --- a/src/UriResolve.c +++ b/src/UriResolve.c @@ -2,7 +2,7 @@ * uriparser - RFC 3986 URI parsing library * * Copyright (C) 2007, Weijia Song <songweijia@gmail.com> - * Copyright (C) 2007, Sebastian Pipping <webmaster@hartwork.org> + * Copyright (C) 2007, Sebastian Pipping <sebastian@pipping.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -152,6 +152,8 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest, const URI_TYPE(Uri) * relSource, const URI_TYPE(Uri) * absBase, UriResolutionOptions options) { + UriBool relSourceHasScheme; + if (absDest == NULL) { return URI_ERROR_NULL; } @@ -169,7 +171,7 @@ static int URI_FUNC(AddBaseUriImpl)(URI_TYPE(Uri) * absDest, /* [00/32] -- A non-strict parser may ignore a scheme in the reference */ /* [00/32] -- if it is identical to the base URI's scheme. */ /* [00/32] if ((not strict) and (R.scheme == Base.scheme)) then */ - UriBool relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE; + relSourceHasScheme = (relSource->scheme.first != NULL) ? URI_TRUE : URI_FALSE; if ((options & URI_RESOLVE_IDENTICAL_SCHEME_COMPAT) && (absBase->scheme.first != NULL) && (relSource->scheme.first != NULL) |