From c8cbb4f24d2b763530785df79c35cf6f2487fe54 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 23 Nov 2015 14:30:39 -0500 Subject: Fix crash when request contains invalid path URI Fixes #1108 --- ingen/Node.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'ingen/Node.hpp') diff --git a/ingen/Node.hpp b/ingen/Node.hpp index fd001897..640b63cf 100644 --- a/ingen/Node.hpp +++ b/ingen/Node.hpp @@ -86,8 +86,14 @@ public: static Raul::URI root_graph_uri() { return Raul::URI("ingen:/graph"); } static bool uri_is_path(const Raul::URI& uri) { - return uri == root_graph_uri() || - uri.substr(0, root_graph_uri().length() + 1) == root_graph_uri() + "/"; + const size_t root_len = root_graph_uri().length(); + if (uri == root_graph_uri()) { + return true; + } else if (uri.substr(0, root_len + 1) != root_graph_uri() + "/") { + return false; + } else { + return Raul::URI::is_valid(uri.substr(root_len)); + } } static Raul::Path uri_to_path(const Raul::URI& uri) { -- cgit v1.2.1