Add development image Dockerfile. Fix memory leak in Map::load* methods.

Author: garrettrayj

.gitignore

@@ -21,6 +21,7 @@ build
 config.guess
 config.h
 config.h.in
+config.h.in~
 config.log
 config.nice
 config.status

Dockerfile

@@ -0,0 +1,15 @@
+FROM ubuntu:xenial
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get update && apt-get -y install \
+    build-essential \
+    libmapnik-dev \
+    mapnik-utils \
+    php-dev \
+    php-gd \
+    python-software-properties \
+    valgrind
+
+RUN mkdir /opt/php7-mapnik
+WORKDIR /opt/php7-mapnik

README.md

@@ -85,3 +85,11 @@ $image->saveToFile('my_awesome_map.png');
 
 See the [API Documentation](http://garrettrayj.github.io/php7-mapnik/api/) for a complete list of
 available objects and methods.
+
+Dev Container
+-------------
+
+The included Dockerfile builds an image with all the dependencies need for extension development and testing, including testing for memory leaks.
+
+    docker build -t php7-mapnik-dev .
+    docker run -it --mount type=bind,source=$(pwd),target=/opt/php7-mapnik php7-mapnik-dev:latest

mem_test.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
-# Hijack PHP_TEST_SHARED_EXTENSIONS variable to inject run-tests.php valgrind options.
+# Override PHP_TEST_SHARED_EXTENSIONS variable to inject run-tests.php valgrind options.
 make PHP_TEST_SHARED_EXTENSIONS='-m --show-diff ` if test "x$(PHP_MODULES)" != "x"; then for i in $(PHP_MODULES)""; do . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; done; fi; if test "x$(PHP_ZEND_EX)" != "x"; then for i in $(PHP_ZEND_EX)""; do . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; done; fi`' test

src/map.cc

@@ -49,7 +49,8 @@ PHP_METHOD(Map, loadXmlString)
 {
     map_object *obj = Z_PHP_MAPNIK_MAP_P(getThis());
 
-    zend_string *xml, *base_path;
+    zend_string *xml;
+    zend_string *base_path;
     zend_bool strict = false;
 
     ZEND_PARSE_PARAMETERS_START_EX(ZEND_PARSE_PARAMS_THROW, 1, 3)
@@ -59,10 +60,15 @@ PHP_METHOD(Map, loadXmlString)
         Z_PARAM_STR(base_path)
     ZEND_PARSE_PARAMETERS_END();
 
+    std::string xml_str(ZSTR_VAL(xml), ZSTR_LEN(xml));
+
     try {
-        std::string xml_str(ZSTR_VAL(xml), ZSTR_LEN(xml));
-        std::string base_path_str(ZSTR_VAL(base_path), ZSTR_LEN(base_path));
-        mapnik::load_map_string(*obj->map, xml_str, strict, base_path_str);
+        if (ZEND_NUM_ARGS() > 2) {
+            std::string base_path_str(ZSTR_VAL(base_path), ZSTR_LEN(base_path));
+            mapnik::load_map_string(*obj->map, xml_str, strict, base_path_str);
+        } else {
+            mapnik::load_map_string(*obj->map, xml_str, strict);
+        }
     } catch (const mapnik::proj_init_error & ex) {
         throw_mapnik_exception(ex.what());
     } catch (const std::runtime_error & ex) {
@@ -78,7 +84,8 @@ PHP_METHOD(Map, loadXmlFile)
 {
     map_object *obj = Z_PHP_MAPNIK_MAP_P(getThis());
 
-    zend_string *filename, *base_path;
+    zend_string *filename;
+    zend_string *base_path;
     zend_bool strict = false;
 
     ZEND_PARSE_PARAMETERS_START_EX(ZEND_PARSE_PARAMS_THROW, 1, 3)
@@ -88,10 +95,15 @@ PHP_METHOD(Map, loadXmlFile)
         Z_PARAM_STR(base_path)
     ZEND_PARSE_PARAMETERS_END();
 
+    std::string filename_str(ZSTR_VAL(filename), ZSTR_LEN(filename));
+
     try {
-        std::string filename_str(ZSTR_VAL(filename), ZSTR_LEN(filename));
-        std::string base_path_str(ZSTR_VAL(base_path), ZSTR_LEN(base_path));
-        mapnik::load_map(*obj->map, filename_str, strict, base_path_str);
+        if (ZEND_NUM_ARGS() > 2) {
+            std::string base_path_str(ZSTR_VAL(base_path), ZSTR_LEN(base_path));
+            mapnik::load_map(*obj->map, filename_str, false, base_path_str);
+        } else {
+            mapnik::load_map(*obj->map, filename_str, strict);
+        }
     } catch (const mapnik::proj_init_error & ex) {
         throw_mapnik_exception(ex.what());
     } catch (const std::runtime_error & ex) {

tests/data/world.xml

@@ -13,4 +13,4 @@
             <Parameter name="file">ne_110m_admin_0_countries.shp</Parameter>
         </Datasource>
     </Layer>
-</Map>
+</Map>

tests/image.phpt

@@ -3,7 +3,11 @@
 --EXTENSIONS--
 gd
 --SKIPIF--
-<?php if (!extension_loaded("mapnik")) print "skip"; ?>
+<?php
+    if (!extension_loaded("mapnik")) print "skip";
+    // Unsuccessful in attempts to get GD extension to load in dev image... just skip if unavailable.
+    if (!extension_loaded("gd")) print "skip";
+?>
 --FILE--
 <?php