From d0d24ce20b5f62b8d30c48ae004e00fecd72ea32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 3 Oct 2017 15:55:11 +0200
Subject: [PATCH] Fixed IPv4/IPv6 To Binary input transformation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We really can't just output binary value, it can not be safely used in
the result utf-8 query string.

Fixes #13552

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                                                       | 1 +
 .../plugins/transformations/input/Text_Plain_Iptobinary.php     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e6864c44d2..ba755bad44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - issue #13515 Fixed rendering of add index dialog
 - issue #13710 Fixed possible error in server advisor
 - issue #13477 Fixed setting input transformations
+- issue #13552 Fixed IPv4/IPv6 To Binary input transformation
 
 4.7.4 (2017-08-23)
 - issue #13415 Remove shadow from the logo
diff --git a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php b/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
index a490350a17..f92101c0d0 100644
--- a/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
+++ b/libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
@@ -45,7 +45,7 @@ class Text_Plain_Iptobinary extends IOTransformationsPlugin
     {
         $val = @inet_pton($buffer);
         if ($val !== false) {
-            return $val;
+            return '0x' . bin2hex($val);
         }
 
         return $buffer;