From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 2 Nov 2016 18:21:29 +0000 (+0100)
Subject: Merge pull request #548 from lonvia/query-ckeck-utf8
X-Git-Tag: v3.0.0~91
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/cfb0f3f94ced30b8b44390367e07bc9b0cec787d?hp=eaee6b700d8589034f314ef11b55b5506fdf4dba

Merge pull request #548 from lonvia/query-ckeck-utf8

check if query is valid unicode string
---

diff --git a/lib/Geocode.php b/lib/Geocode.php
index 7ea39e49..03df6752 100644
--- a/lib/Geocode.php
+++ b/lib/Geocode.php
@@ -908,6 +908,9 @@ class Geocode
         }
 
         $sQuery = $this->sQuery;
+        if (!preg_match('//u', $sQuery)) {
+            userError("Query string is not UTF-8 encoded.");
+        }
 
         // Conflicts between US state abreviations and various words for 'the' in different languages
         if (isset($this->aLangPrefOrder['name:en'])) {