Improved CMakeLists to include address sanitizer for debug mode

Author: rijnb

CMakeLists.txt

@@ -1,7 +1,22 @@
+# Copyright (C) 2014-2015 Stichting Mapcode Foundation (http://www.mapcode.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 cmake_minimum_required(VERSION 3.3)
 project(mapcode_cpp)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -Werror -fsanitize=address")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11")
 
 set(SOURCE_FILES
     mapcodelib/basics.h

mapcodelib/mapcoder.c

@@ -1563,20 +1563,18 @@ static int decoderEngine(decodeRec *dec) {
         }
     }
 
-    {
-        if (codex == 54) {
-            // international mapcodes must be in international context
-            ccode = ccode_earth;
-        } else if (isSubdivision(ccode)) {
-            // int mapcodes must be interpreted in the parent of a subdivision
-            int parent = parentTerritoryOf(ccode);
-            if ((codex == 44) || ((codex == 34 || codex == 43) && (parent == ccode_ind || parent == ccode_mex))) {
-                ccode = parent;
-            }
+    if (codex == 54) {
+        // international mapcodes must be in international context
+        ccode = ccode_earth;
+    } else if (isSubdivision(ccode)) {
+        // int mapcodes must be interpreted in the parent of a subdivision
+        int parent = parentTerritoryOf(ccode);
+        if ((codex == 44) || ((codex == 34 || codex == 43) && (parent == ccode_ind || parent == ccode_mex))) {
+            ccode = parent;
         }
-
     }
 
+
     {
         const int from = firstrec(ccode);
         const int upto = lastrec(ccode);