diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-16 13:17:09 +0100 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-03-16 17:16:57 +0100 |
| commit | e06c822023ac2f5d2b2dae50dd813f4a0d5e908b (patch) | |
| tree | a2435ce65e5adba3925d5fe7a97092be48290d2c /src/virt-viewer-util.c | |
| parent | cf5082577a41e93d5ed397c7da5351813ff442e6 (diff) | |
| download | virt-viewer-e06c822023ac2f5d2b2dae50dd813f4a0d5e908b.tar.gz virt-viewer-e06c822023ac2f5d2b2dae50dd813f4a0d5e908b.tar.xz virt-viewer-e06c822023ac2f5d2b2dae50dd813f4a0d5e908b.zip | |
Do not crash so easily when given invalid uri
'remote-viewer foobar' shouldn't crash
Diffstat (limited to 'src/virt-viewer-util.c')
| -rw-r--r-- | src/virt-viewer-util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/virt-viewer-util.c b/src/virt-viewer-util.c index dbb0bce..e4a0cc4 100644 --- a/src/virt-viewer-util.c +++ b/src/virt-viewer-util.c @@ -81,7 +81,7 @@ virt_viewer_util_extract_host(const char *uristr, int *port) { xmlURIPtr uri; - char *offset; + char *offset = NULL; if (uristr == NULL || !g_ascii_strcasecmp(uristr, "xen")) @@ -107,16 +107,17 @@ virt_viewer_util_extract_host(const char *uristr, if (port) *port = uri->port; - offset = strchr(uri->scheme, '+'); + if (uri->scheme) + offset = strchr(uri->scheme, '+'); if (transport) { if (offset) - *transport = g_strdup(offset+1); + *transport = g_strdup(offset + 1); else *transport = NULL; } - if (scheme) { + if (scheme && uri->scheme) { if (offset) *scheme = g_strndup(uri->scheme, offset - uri->scheme); else |