|
 |
4ff70e |
From e3e9e7961b721d2bdbf50ca81fdc869170289e28 Mon Sep 17 00:00:00 2001
|
|
|
4ff70e |
From: Tomas Popela <tpopela@redhat.com>
|
|
|
4ff70e |
Date: Mon, 23 Jul 2018 11:56:21 +0200
|
|
|
4ff70e |
Subject: [PATCH 13/17] Check the strstr() return value before using it
|
|
|
4ff70e |
|
|
|
4ff70e |
yelp-3.28.1/libyelp/yelp-uri-builder.c:81: returned_null: "strstr" returns null (checked 10 out of 12 times).
|
|
|
4ff70e |
yelp-3.28.1/libyelp/yelp-uri-builder.c:81: var_assigned: Assigning: "resource" = null return value from "strstr".
|
|
|
4ff70e |
yelp-3.28.1/libyelp/yelp-uri-builder.c:82: dereference: Incrementing a pointer which might be null: "resource".
|
|
|
4ff70e |
---
|
|
|
4ff70e |
libyelp/yelp-uri-builder.c | 7 ++++---
|
|
|
4ff70e |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
4ff70e |
|
|
|
4ff70e |
diff --git a/libyelp/yelp-uri-builder.c b/libyelp/yelp-uri-builder.c
|
|
|
4ff70e |
index bb34d202..58a53ac9 100644
|
|
|
4ff70e |
--- a/libyelp/yelp-uri-builder.c
|
|
|
4ff70e |
+++ b/libyelp/yelp-uri-builder.c
|
|
|
4ff70e |
@@ -78,9 +78,10 @@ build_yelp_uri (const gchar *uri_str)
|
|
|
4ff70e |
memmove (uri, uri + BOGUS_PREFIX_LEN, strlen (uri) - BOGUS_PREFIX_LEN + 1);
|
|
|
4ff70e |
|
|
|
4ff70e |
/* Remove the leading slash */
|
|
|
4ff70e |
- resource = strstr (uri, ":");
|
|
|
4ff70e |
- resource++;
|
|
|
4ff70e |
- memmove (resource, resource + 1, strlen (resource));
|
|
|
4ff70e |
+ if ((resource = strstr (uri, ":"))) {
|
|
|
4ff70e |
+ resource++;
|
|
|
4ff70e |
+ memmove (resource, resource + 1, strlen (resource));
|
|
|
4ff70e |
+ }
|
|
|
4ff70e |
|
|
|
4ff70e |
/* Remove the trailing slash if any */
|
|
|
4ff70e |
path_len = strlen (uri);
|
|
|
4ff70e |
--
|
|
|
4ff70e |
2.19.1
|
|
|
4ff70e |
|