From 240a696c399dbf43800d0b5b43f453b1f1d469fc Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 6 Aug 2008 07:20:21 +0000
Subject: [PATCH] Utilities::addURLParameter: Fix assertion failure on URL
ending with '?'.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@798 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index b794f89ec..313f09e4e 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -166,7 +166,12 @@ class SimpleSAML_Utilities {
$oldQuery = array();
$url .= '?';
} else {
- $oldQuery = self::parseQueryString(substr($url, $queryStart + 1));
+ $oldQuery = substr($url, $queryStart + 1);
+ if($oldQuery === FALSE) {
+ $oldQuery = array();
+ } else {
+ $oldQuery = self::parseQueryString($oldQuery);
+ }
$url = substr($url, 0, $queryStart + 1);
}
--
GitLab