From c328697e39e56957d66e75de62ce610a90259e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 29 Jul 2016 13:53:08 +0200
Subject: [PATCH] Do not use mb_strlen result for string indexes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The string indexes are in bytes, while mb_strlen counts chars.

Issue #12397

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 examples/openid.php                     | 2 +-
 libraries/server_status_monitor.lib.php | 2 +-
 libraries/transformations.lib.php       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/openid.php b/examples/openid.php
index 8ef34e9ee3..9fe7b90491 100644
--- a/examples/openid.php
+++ b/examples/openid.php
@@ -89,7 +89,7 @@ $base .= '://' . $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'];
 
 $realm = $base . '/';
 $returnTo = $base . dirname($_SERVER['PHP_SELF']);
-if ($returnTo[mb_strlen($returnTo) - 1] != '/') {
+if ($returnTo[strlen($returnTo) - 1] != '/') {
     $returnTo .= '/';
 }
 $returnTo .= 'openid.php';
diff --git a/libraries/server_status_monitor.lib.php b/libraries/server_status_monitor.lib.php
index f0b6d90df9..ea79aee3b0 100644
--- a/libraries/server_status_monitor.lib.php
+++ b/libraries/server_status_monitor.lib.php
@@ -675,7 +675,7 @@ function PMA_getJsonForLogDataTypeGeneral($start, $end)
                     $temp = $return['rows'][$insertTablesFirst]['argument'];
                     $return['rows'][$insertTablesFirst]['argument']
                         .= PMA_getSuspensionPoints(
-                            $temp[mb_strlen($temp) - 1]
+                            $temp[strlen($temp) - 1]
                         );
 
                     // Group this value, thus do not add to the result list
diff --git a/libraries/transformations.lib.php b/libraries/transformations.lib.php
index 2526024bce..812bd13279 100644
--- a/libraries/transformations.lib.php
+++ b/libraries/transformations.lib.php
@@ -51,7 +51,7 @@ function PMA_Transformation_getOptions($option_string)
         $trimmed = trim($option);
         if (mb_strlen($trimmed) > 1
             && $trimmed[0] == "'"
-            && $trimmed[mb_strlen($trimmed) - 1] == "'"
+            && $trimmed[strlen($trimmed) - 1] == "'"
         ) {
             // '...'
             $option = mb_substr($trimmed, 1, -1);
@@ -62,7 +62,7 @@ function PMA_Transformation_getOptions($option_string)
                 // ...,
                 $trimmed .= ',' . $option;
                 $rtrimmed = rtrim($trimmed);
-                if ($rtrimmed[mb_strlen($rtrimmed) - 1] == "'") {
+                if ($rtrimmed[strlen($rtrimmed) - 1] == "'") {
                     // ,...'
                     break;
                 }