From c0b1c6013ea8a5e22d2335442956d420b184cc92 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 14 May 2018 17:41:05 +0200
Subject: [PATCH] Fix parsing of url

Fix kiwix/kiwix-tools#193
---
 src/reader.cpp    | 32 +++++++++------------
 test/meson.build  |  1 +
 test/parseUrl.cpp | 73 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 18 deletions(-)
 create mode 100644 test/parseUrl.cpp

diff --git a/src/reader.cpp b/src/reader.cpp
index ccbede73c..7ef3d7c8b 100644
--- a/src/reader.cpp
+++ b/src/reader.cpp
@@ -411,30 +411,26 @@ bool _parseUrl(const string& url, char* ns, string& title)
   unsigned int urlLength = url.size();
   unsigned int offset = 0;
 
-  /* Ignore the '/' */
-  while ((offset < urlLength) && (url[offset] == '/')) {
+  /* Ignore the first '/' */
+  if (url[offset] == '/')
     offset++;
-  }
+
+  if (url[offset] == '/' || offset >= urlLength)
+    return false;
 
   /* Get namespace */
-  while ((offset < urlLength) && (url[offset] != '/')) {
-    *ns = url[offset];
-    offset++;
-  }
+  *ns = url[offset++];
 
-  /* Ignore the '/' */
-  while ((offset < urlLength) && (url[offset] == '/')) {
-    offset++;
-  }
+  if (url[offset] != '/' || offset >= urlLength)
+    return false;
+
+  offset++;
+
+  if ( offset >= urlLength)
+    return false;
 
   /* Get content title */
-  unsigned int titleOffset = offset;
-  while (offset < urlLength) {
-    offset++;
-  }
-
-  /* unescape title */
-  title = url.substr(titleOffset, offset - titleOffset);
+  title = url.substr(offset, urlLength - offset);
 
   return true;
 }
diff --git a/test/meson.build b/test/meson.build
index 7b999da0e..9accb6562 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,6 +1,7 @@
 
 
 tests = [
+    'parseUrl'
 ]
 
 
diff --git a/test/parseUrl.cpp b/test/parseUrl.cpp
new file mode 100644
index 000000000..dbb4d1790
--- /dev/null
+++ b/test/parseUrl.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2013 Tommi Maekitalo
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * is provided AS IS, WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, and
+ * NON-INFRINGEMENT.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ *
+ */
+
+#include "gtest/gtest.h"
+#include <string>
+
+namespace kiwix {
+bool _parseUrl(const std::string& url, char* ns, std::string& title);
+};
+
+using namespace kiwix;
+
+namespace
+{
+TEST(ParseUrlTest, invalid)
+{
+  char ns;
+  std::string title;
+
+  ASSERT_FALSE(_parseUrl("", &ns, title));
+  ASSERT_FALSE(_parseUrl("A", &ns, title));
+  ASSERT_FALSE(_parseUrl("/", &ns, title));
+  ASSERT_FALSE(_parseUrl("//", &ns, title));
+  ASSERT_FALSE(_parseUrl("/A", &ns, title));
+  ASSERT_FALSE(_parseUrl("/A/", &ns, title));
+  ASSERT_FALSE(_parseUrl("/AB", &ns, title));
+  ASSERT_FALSE(_parseUrl("//A/title", &ns, title));
+}
+
+TEST(ParseUrlTest, valid)
+{
+  char ns;
+  std::string title;
+
+  ASSERT_TRUE(_parseUrl("A/title", &ns, title));
+  ASSERT_EQ(ns, 'A');
+  ASSERT_EQ(title, "title");
+
+  ASSERT_TRUE(_parseUrl("/A/title", &ns, title));
+  ASSERT_EQ(ns, 'A');
+  ASSERT_EQ(title, "title");
+
+  ASSERT_TRUE(_parseUrl("A//title", &ns, title));
+  ASSERT_EQ(ns, 'A');
+  ASSERT_EQ(title, "/title");
+
+  ASSERT_TRUE(_parseUrl("/A//title", &ns, title));
+  ASSERT_EQ(ns, 'A');
+  ASSERT_EQ(title, "/title");
+}
+};
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}