From: Jakub Vrana <jakub@vrana.cz>
Date: Sun, 7 Jul 2013 05:33:19 +0000 (-0700)
Subject: SimpleDB: Handle XML error
X-Git-Tag: v4.0.0~152
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=c1b0ecda3ea33a07f5a82ed9fc4681ced49726e6;p=adminer.git

SimpleDB: Handle XML error
---

diff --git a/adminer/drivers/simpledb.inc.php b/adminer/drivers/simpledb.inc.php
index a7ae0108..4d12e2be 100644
--- a/adminer/drivers/simpledb.inc.php
+++ b/adminer/drivers/simpledb.inc.php
@@ -394,10 +394,17 @@ if (isset($_GET["simpledb"])) {
 			'content' => $query,
 			'ignore_errors' => 1, // available since PHP 5.2.10
 		))));
-		if (!$file || !($xml = simplexml_load_string($file))) {
+		if (!$file) {
 			$connection->error = $php_errormsg;
 			return false;
 		}
+		libxml_use_internal_errors(true);
+		$xml = simplexml_load_string($file);
+		if (!$xml) {
+			$error = libxml_get_last_error();
+			$connection->error = $error->message;
+			return false;
+		}
 		if ($xml->Errors) {
 			$error = $xml->Errors->Error;
 			$connection->error = "$error->Message ($error->Code)";