(trunk, gtk) #5088 'gtr_is_supported_url(), gtr_is_magnet_link() aren't NULL-safe...

diff --git a/gtk/util.c b/gtk/util.c
index 8e669ba727cd373ebfff970aa9dd5de6aa232092..b64769afc063eb1f2de5f66018917e5c9d17a7b1 100644 (file)
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -13,7 +13,7 @@
 #include <ctype.h> /* isxdigit() */
 #include <errno.h>
 #include <stdarg.h>
-#include <string.h> /* strchr(), strrchr(), strlen(), strncmp(), strstr() */
+#include <string.h> /* strchr(), strrchr(), strlen(), strstr() */
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
@@ -170,15 +170,17 @@ gtr_get_host_from_url( char * buf, size_t buflen, const char * url )
 static gboolean
 gtr_is_supported_url( const char * str )
 {
-    return !strncmp( str, "ftp://", 6 )
-        || !strncmp( str, "http://", 7 )
-        || !strncmp( str, "https://", 8 );
+    return ( ( str != NULL ) &&
+             ( g_str_has_prefix( str, "ftp://" ) ||
+               g_str_has_prefix( str, "http://" ) ||
+               g_str_has_prefix( str, "https://" ) ) );
 }
 
 gboolean
 gtr_is_magnet_link( const char * str )
 {
-    return !strncmp( str, "magnet:?", 8 );
+    return ( str != NULL ) &&
+           ( g_str_has_prefix( str, "magnet:?" ) );
 }
 
 gboolean