Detect failure of curl_init

Signed-off-by: Michal Čihař <michal@cihar.com>
phpmyadmin · Dec 5, 2014 · 61fcf21 · 61fcf21
1 parent 974295a
commit 61fcf21
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -4252,6 +4252,9 @@ public static function getLatestVersion()
                 );
             } else if (function_exists('curl_init')) {
                 $curl_handle = curl_init($file);
+                if ($curl_hadle === false) {
+                    return array();
+                }
                 $curl_handle = PMA_Util::configureCurl($curl_handle);
                 curl_setopt(
                     $curl_handle,

diff --git a/libraries/error_report.lib.php b/libraries/error_report.lib.php
@@ -210,6 +210,9 @@ function PMA_sendErrorReport($report)
     }
 
     $curl_handle = curl_init(SUBMISSION_URL);
+    if ($curl_hadle === false) {
+        return null;
+    }
     $curl_handle = PMA_Util::configureCurl($curl_handle);
     curl_setopt($curl_handle, CURLOPT_CUSTOMREQUEST, "POST");
     curl_setopt($curl_handle, CURLOPT_HTTPHEADER, array('Expect:'));

diff --git a/version_check.php b/version_check.php
@@ -16,11 +16,15 @@
 
 $version = PMA_Util::getLatestVersion();
 
-echo json_encode(
-    array(
-        'version' => $version->version,
-        'date' => $version->date,
-    )
-);
+if (empty($version_data)) {
+    echo json_encode(array());
+} else {
+    echo json_encode(
+        array(
+            'version' => $version->version,
+            'date' => $version->date,
+        )
+    );
+}
 
 ?>