From a6b3a9ce5132af6000d204760b9bfd51cd3e0ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 1 Mar 2016 15:35:46 +0100
Subject: [PATCH] Fix error when we can not generate random string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12056

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                 | 1 +
 libraries/session.inc.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e864303563..6b999d45d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
 - issue #11907 Avoid displaying UPDATE query twice
 - issue #11850 Fixed CSV import
 - issue        Fix SQL syntax highlighting in database search page
+- issue #12056 Fix error when we can not generate random string
 
 4.5.5.1 (not yet released)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.
diff --git a/libraries/session.inc.php b/libraries/session.inc.php
index 7e45ce117f..4b81d3e2e1 100644
--- a/libraries/session.inc.php
+++ b/libraries/session.inc.php
@@ -117,5 +117,13 @@ if (! isset($_SESSION[' PMA_token '])) {
         $_SESSION[' PMA_token '] = bin2hex(openssl_random_pseudo_bytes(16));
     }
 }
+/**
+ * Check if token is properly generated (both above functions can return false).
+ */
+if (empty($_SESSION[' PMA_token '])) {
+    PMA_fatalError(
+        'Failed to generate random CSRF token!'
+    );
+}
 
 require_once 'libraries/session.lib.php';