summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-01-27 17:13:52 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2015-02-10 09:27:20 +0300
commitafb30dde3ad71349fc65726946d58e5d3c61f8af (patch)
tree4467ee905e89ff5fe7db42d9a230f9233e73191d /util
parentafd5ea3671f936f511015a71af9cd0ed23788515 (diff)
downloadhqemu-afb30dde3ad71349fc65726946d58e5d3c61f8af.zip
hqemu-afb30dde3ad71349fc65726946d58e5d3c61f8af.tar.gz
util/uri: URI member path can be null, compare more carfully
uri_resolve_relative() calls strcmp(bas->path, ref->path). However, either argument could be null! Evidence: the code checks for null after the comparison. Spotted by Coverity. I suspect this was screwed up when we stole the code from libxml2. There the conditional reads xmlStrEqual((xmlChar *)bas->path, (xmlChar *)ref->path) with int xmlStrEqual(const xmlChar *str1, const xmlChar *str2) { if (str1 == str2) return(1); if (str1 == NULL) return(0); if (str2 == NULL) return(0); do { if (*str1++ != *str2) return(0); } while (*str2++); return(1); } Fix by replicating libxml2's logic faithfully. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'util')
-rw-r--r--util/uri.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/uri.c b/util/uri.c
index b9a7b54..1cfd78b 100644
--- a/util/uri.c
+++ b/util/uri.c
@@ -1935,7 +1935,8 @@ uri_resolve_relative (const char *uri, const char * base)
val = g_strdup (uri);
goto done;
}
- if (!strcmp(bas->path, ref->path)) {
+ if (bas->path == ref->path ||
+ (bas->path && ref->path && !strcmp(bas->path, ref->path))) {
val = g_strdup("");
goto done;
}
OpenPOWER on IntegriCloud