Ensure "this should never happen" doesn't

Fixes simplepie#219
skyzyx · Nov 28, 2012 · 438acfe · 438acfe
1 parent 0d876f3
commit 438acfe
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/library/SimplePie/IRI.php b/library/SimplePie/IRI.php
@@ -390,8 +390,8 @@ protected function parse_iri($iri)
 		}
 		else
 		{
-			trigger_error('This should never happen', E_USER_ERROR);
-			die;
+			// This can occur when a paragraph is accidentally parsed as a URI
+			return false;
 		}
 	}
 
@@ -824,6 +824,10 @@ public function set_iri($iri)
 		else
 		{
 			$parsed = $this->parse_iri((string) $iri);
+			if (!$parsed)
+			{
+				return false;
+			}
 
 			$return = $this->set_scheme($parsed['scheme'])
 				&& $this->set_authority($parsed['authority'])